Author: davidb
Date: Fri Apr  3 11:15:51 2009
New Revision: 761619

URL: http://svn.apache.org/viewvc?rev=761619&view=rev
Log:
Changed system tests to use Felix 1.4.1 instead of Equinox 3.5M4

Removed the checked-in Equinox jar.
Currently using Spring-DM 1.2.0-RC2-SNAPSHOT. Spring DM 1.2.0 is due out very 
soon, so we should be able to get rid of the 'SNAPSHOT' over the next couple of 
days. 
Once Equinox 3.5 is released we should consider running the system tests under 
Equinox as well.
Updated the Spring version from 2.5.5 to 2.5.6 (was needed for Spring DM 1.2.0)

Removed:
    cxf/dosgi/trunk/systests/equinox_libs/
Modified:
    
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml
    cxf/dosgi/trunk/parent/pom.xml
    
cxf/dosgi/trunk/systests/common/src/main/java/org/apache/cxf/dosgi/systests/common/AbstractDosgiSystemTest.java
    cxf/dosgi/trunk/systests/multi_bundle_distro/pom.xml
    cxf/dosgi/trunk/systests/pom.xml
    cxf/dosgi/trunk/systests/single_bundle_distro/pom.xml

Modified: 
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml
URL: 
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml?rev=761619&r1=761618&r2=761619&view=diff
==============================================================================
--- 
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml 
(original)
+++ 
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml 
Fri Apr  3 11:15:51 2009
@@ -6,14 +6,14 @@
   
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/geronimo-ws-metadata_2.0_spec-1.1.2.jar</bundle>
   
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/com.springsource.org.apache.commons.logging-1.1.1.jar</bundle>
   
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/com.springsource.org.jdom-1.0.0.jar</bundle>
-  
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/spring-core-2.5.5.jar</bundle>
-  
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/spring-beans-2.5.5.jar</bundle>
-  
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/spring-context-2.5.5.jar</bundle>
+  
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/spring-core-2.5.6.jar</bundle>
+  
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/spring-beans-2.5.6.jar</bundle>
+  
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/spring-context-2.5.6.jar</bundle>
   
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/com.springsource.org.aopalliance-1.0.0.jar</bundle>
-  
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/spring-aop-2.5.5.jar</bundle>
-  
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/spring-osgi-io-1.1.2.jar</bundle>
-  
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/spring-osgi-core-1.1.2.jar</bundle>
-  
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/spring-osgi-extender-1.1.2.jar</bundle>
+  
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/spring-aop-2.5.6.jar</bundle>
+  
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/spring-osgi-io-1.2.0-rc2-SNAPSHOT.jar</bundle>
+  
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/spring-osgi-core-1.2.0-rc2-SNAPSHOT.jar</bundle>
+  
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/spring-osgi-extender-1.2.0-rc2-SNAPSHOT.jar</bundle>
   
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/pax-web-service-0.5.1.jar</bundle>
   
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.bundles.jaxb-impl-2.1.6_1.jar</bundle>
   
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.bundles.wsdl4j-1.6.1_1.jar</bundle>

Modified: cxf/dosgi/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/dosgi/trunk/parent/pom.xml?rev=761619&r1=761618&r2=761619&view=diff
==============================================================================
--- cxf/dosgi/trunk/parent/pom.xml (original)
+++ cxf/dosgi/trunk/parent/pom.xml Fri Apr  3 11:15:51 2009
@@ -17,8 +17,8 @@
     <properties>
         <cxf.version>2.2</cxf.version>
         <felix.version>1.4.1</felix.version>
-        <spring.version>2.5.5</spring.version>
-        <spring.osgi.version>1.1.2</spring.osgi.version>
+        <spring.version>2.5.6</spring.version>
+        <spring.osgi.version>1.2.0-rc2-SNAPSHOT</spring.osgi.version>
 
         <servicemix.specs.version>1.1.1</servicemix.specs.version>
 
@@ -255,6 +255,15 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository> 
+
+        <repository>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <id>springframework.org</id>
+            <name>Springframework Maven SNAPSHOT Repository</name>
+            
<url>http://s3.amazonaws.com/maven.springframework.org/snapshot</url>
+        </repository>
     </repositories>
 
     <pluginRepositories>

Modified: 
cxf/dosgi/trunk/systests/common/src/main/java/org/apache/cxf/dosgi/systests/common/AbstractDosgiSystemTest.java
URL: 
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests/common/src/main/java/org/apache/cxf/dosgi/systests/common/AbstractDosgiSystemTest.java?rev=761619&r1=761618&r2=761619&view=diff
==============================================================================
--- 
cxf/dosgi/trunk/systests/common/src/main/java/org/apache/cxf/dosgi/systests/common/AbstractDosgiSystemTest.java
 (original)
+++ 
cxf/dosgi/trunk/systests/common/src/main/java/org/apache/cxf/dosgi/systests/common/AbstractDosgiSystemTest.java
 Fri Apr  3 11:15:51 2009
@@ -19,17 +19,97 @@
 package org.apache.cxf.dosgi.systests.common;
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Properties;
 import java.util.jar.Manifest;
 
-import org.apache.servicemix.kernel.testing.support.AbstractIntegrationTest;
+import org.osgi.framework.Bundle;
 import org.osgi.framework.Constants;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
+import org.springframework.osgi.test.AbstractConfigurableBundleCreatorTests;
+
+public abstract class AbstractDosgiSystemTest extends 
AbstractConfigurableBundleCreatorTests {
+    private Properties dependencies;
+
+    // -------------------------------------------------------------------
+    // These methods are copied from the SMX Kernel Testing component. They
+    // are copied from the 
+    // org.apache.servicemix.kernel.testing.support.AbstractIntegrationTest 
+    // class. SMX Kernel 1.0 doesn't seem to work with Spring-DM 1.2, so 
+    // thats why these methods are duplicated here for the moment...
+    // -------------------------------------------------------------------
+    protected String getBundle(String groupId, String artifactId) {
+        return groupId + "," + artifactId + "," + getBundleVersion(groupId, 
artifactId);
+    }
+
+    protected String getBundleVersion(String groupId, String artifactId) {
+        if (dependencies == null) {
+            try {
+                File f = new File(System.getProperty("basedir"), 
"target/classes/META-INF/maven/dependencies.properties");
+                Properties prop = new Properties();
+                prop.load(new FileInputStream(f));
+                dependencies = prop;
+            } catch (IOException e) {
+                throw new IllegalStateException("Unable to load dependencies 
informations", e);
+            }
+        }
+        String version = dependencies.getProperty(groupId + "/" + artifactId + 
"/version");
+        if (version == null) {
+            throw new IllegalStateException("Unable to find dependency 
information for: " + groupId + "/" + artifactId + "/version");
+        }
+        return version;
+    }
+
+    protected File localMavenBundle(String groupId, String artifact, String 
version, String classifier, String type) {
+        String defaultHome = new File(new 
File(System.getProperty("user.home")), ".m2/repository").getAbsolutePath();
+        File repositoryHome = new File(System.getProperty("localRepository", 
defaultHome));
+
+        StringBuffer location = new StringBuffer(groupId.replace('.', '/'));
+        location.append('/');
+        location.append(artifact);
+        location.append('/');
+        location.append(getSnapshot(version));
+        location.append('/');
+        location.append(artifact);
+        location.append('-');
+        location.append(version);
+        if (classifier != null) {
+            location.append('-');
+            location.append(classifier);
+        }
+        location.append(".");
+        location.append(type);
+
+        return new File(repositoryHome, location.toString());
+    }
+
+    protected static boolean isTimestamped(String version) {
+        return 
version.matches(".+-\\d\\d\\d\\d\\d\\d\\d\\d\\.\\d\\d\\d\\d\\d\\d-\\d+");
+    }
+
+    protected static String getSnapshot(String version) {
+        if (isTimestamped(version)) {
+            return version.substring(0, version.lastIndexOf('-', 
version.lastIndexOf('-') - 1)) + "-SNAPSHOT";
+        }
+        return version;
+    }
+
+    protected void installBundle(String groupId, String artifactId, String 
classifier, String type) throws Exception {
+        String version = getBundleVersion(groupId, artifactId);
+        File loc = localMavenBundle(groupId, artifactId, version, classifier, 
type);
+        Bundle bundle = bundleContext.installBundle(loc.toURI().toString());
+        bundle.start();
+    }    
+    // -------------------------------------------------------------------
+    // End of SMX Kernel methods.
+    // -------------------------------------------------------------------
+    
 
-public abstract class AbstractDosgiSystemTest extends AbstractIntegrationTest {
     protected Manifest getManifest() {
         // let the testing framework create/load the manifest
         Manifest mf = super.getManifest();
@@ -39,7 +119,14 @@
 
         return mf;
     }       
-        
+
+    @Override
+    protected String[] getTestFrameworkBundlesNames() {
+        List<String> names = new 
ArrayList<String>(Arrays.asList(super.getTestFrameworkBundlesNames()));
+        names.add(getBundle("org.apache.felix", "org.osgi.compendium"));
+        return names.toArray(new String [names.size()]);
+    }
+
     @Override
     protected Resource[] getTestBundles() {
         // Return the bundles for the current distribution, filtering out the 

Modified: cxf/dosgi/trunk/systests/multi_bundle_distro/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests/multi_bundle_distro/pom.xml?rev=761619&r1=761618&r2=761619&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests/multi_bundle_distro/pom.xml (original)
+++ cxf/dosgi/trunk/systests/multi_bundle_distro/pom.xml Fri Apr  3 11:15:51 
2009
@@ -54,26 +54,6 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.servicemix.kernel.testing</groupId>
-      <artifactId>org.apache.servicemix.kernel.testing.support</artifactId>
-      <version>1.0.0</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>org.apache.felix.framework</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>org.apache.felix.main</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>org.osgi.core</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
       <groupId>org.apache.cxf.dosgi</groupId>
       <artifactId>cxf-dosgi-ri-dsw-cxf</artifactId>
       <version>${project.version}</version>
@@ -84,17 +64,7 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.apache.cxf</groupId>
-      <artifactId>cxf-bundle-minimal</artifactId>
-      <version>${cxf.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>xalan</groupId>
-          <artifactId>xalan</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
+    
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
@@ -114,6 +84,12 @@
       <scope>test</scope>
     </dependency> 
     <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>${spring.version}</version>
+      <scope>test</scope>
+    </dependency> 
+    <dependency>
       <groupId>org.springframework.osgi</groupId>
       <artifactId>spring-osgi-test</artifactId>
       <version>${spring.osgi.version}</version>
@@ -143,130 +119,6 @@
       <version>${spring.osgi.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>  
-      <groupId>org.apache.commons</groupId>             
-      <artifactId>com.springsource.org.apache.commons.logging</artifactId>
-      <version>1.1.1</version> 
-    </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
-      <version>${jetty.version}</version>
-    </dependency> 
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty-util</artifactId>
-      <version>${jetty.version}</version>
-    </dependency>      
-
-    <dependency> 
-      <groupId>org.apache.servicemix.specs</groupId> 
-      <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId> 
-      <version>${servicemix.specs.version}</version> 
-    </dependency>
-    <dependency> 
-      <groupId>org.apache.servicemix.specs</groupId> 
-      <artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId> 
-      <version>${servicemix.specs.version}</version> 
-    </dependency>
-    <dependency> 
-      <groupId>org.apache.servicemix.specs</groupId> 
-      <artifactId>org.apache.servicemix.specs.jaxws-api-2.1</artifactId> 
-      <version>${servicemix.specs.version}</version> 
-    </dependency>
-    <dependency> 
-      <groupId>org.apache.servicemix.specs</groupId> 
-      <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId> 
-      <version>${servicemix.specs.version}</version> 
-    </dependency> 
-
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-javamail_1.4_spec</artifactId>
-      <version>1.2</version>
-    </dependency> 
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-activation_1.1_spec</artifactId>
-      <version>1.0.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-      <version>1.1.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-servlet_2.5_spec</artifactId>
-      <version>1.1.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.0_spec</artifactId>
-      <version>1.1.1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.servicemix.bundles</groupId> 
-      <artifactId>org.apache.servicemix.bundles.xmlschema</artifactId> 
-      <version>${xmlschema.bundle.version}</version> 
-    </dependency>
-    <dependency>
-      <groupId>org.apache.servicemix.bundles</groupId> 
-      <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId> 
-      <version>${xmlresolver.bundle.version}</version> 
-    </dependency>
-    <dependency>
-      <groupId>org.apache.servicemix.bundles</groupId> 
-      <artifactId>org.apache.servicemix.bundles.neethi</artifactId> 
-      <version>${neethi.bundle.version}</version> 
-    </dependency>
-    <dependency>
-      <groupId>org.apache.servicemix.bundles</groupId> 
-      <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId> 
-      <version>${wsdl4j.bundle.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.servicemix.bundles</groupId> 
-      <artifactId>org.apache.servicemix.bundles.xmlsec</artifactId> 
-      <version>${xmlsec.bundle.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.servicemix.bundles</groupId> 
-      <artifactId>org.apache.servicemix.bundles.wss4j</artifactId> 
-      <version>${wss4j.bundle.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>xalan</groupId>
-          <artifactId>xalan</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>xerces</groupId>
-          <artifactId>xercesImpl</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.servicemix.bundles</groupId> 
-      <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId> 
-      <version>${jaxbimpl.bundle.version}</version> 
-    </dependency> 
-
-    <dependency>
-      <groupId>org.apache.servicemix.bundles</groupId> 
-      <artifactId>org.apache.servicemix.bundles.asm</artifactId> 
-      <version>${asm.bundle.version}</version> 
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.servicemix.bundles</groupId> 
-      <artifactId>org.apache.servicemix.bundles.woodstox</artifactId> 
-      <version>${woodstox.bundle.version}</version> 
-    </dependency> 
 
     <dependency>
       <groupId>junit</groupId>

Modified: cxf/dosgi/trunk/systests/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests/pom.xml?rev=761619&r1=761618&r2=761619&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests/pom.xml (original)
+++ cxf/dosgi/trunk/systests/pom.xml Fri Apr  3 11:15:51 2009
@@ -35,25 +35,16 @@
 
     <properties>
         <topDirectoryLocation>..</topDirectoryLocation>
-        
<osgi.test.platform>org.springframework.osgi.test.platform.EquinoxPlatform</osgi.test.platform>
+        
<osgi.test.platform>org.springframework.osgi.test.platform.FelixPlatform</osgi.test.platform>
         <servicemix.kernel.version>1.0.0</servicemix.kernel.version>
         
<servicemix.depends.plugin.version>1.0.0-rc1</servicemix.depends.plugin.version>
     </properties>
     
     <dependencies>
         <dependency>
-            <groupId>org.eclipse.osgi</groupId>
-            <artifactId>org.eclipse.osgi</artifactId>
-            <version>3.5m4</version>
-            <scope>system</scope>
-            
<systemPath>${basedir}/${topDirectoryLocation}/systests/equinox_libs/3.5m4/org.eclipse.osgi_3.5.0.v20081201-1815.jar</systemPath>
-        </dependency>
-
-        <!--
-        <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.main</artifactId>
-            <version>1.1.0-cxf_dosgi-SNAPSHOT</version>
+            <version>1.4.1</version>
             <scope>test</scope>
             <exclusions>
                <exclusion>
@@ -69,7 +60,7 @@
                  <artifactId>org.apache.felix.bundlerepository</artifactId>
                </exclusion>
              </exclusions>
-           </dependency> -->
+           </dependency>
 
 
      </dependencies> 
@@ -107,32 +98,22 @@
                         </property>
 
                         <property>
-                                
<name>org.apache.cxf.spring.validation.mode</name>
-                                <value>VALIDATION_NONE</value>
+                            <name>felix.fragment.validation</name>
+                            <value>warning</value>
+                        </property>
+
+                        <property>
+                            <name>org.apache.cxf.spring.validation.mode</name>
+                            <value>VALIDATION_NONE</value>
                         </property>
                         
                         <property>
                              <name>org.apache.cxf.nofastinfoset</name>
                              <value>true</value>
                         </property>
-<!--
-                        <property>
-                            <name>felix.config.properties</name>
-                            
<value>file:${basedir}/../etc/felix.config.properties</value>
-                        </property>
--->
-<!--
-                        <property>
-                            
<name>-Dcom.sun.xml.bind.v2.bytecode.ClassTailor.noOptimize</name>
-                            <value></value>
-                        </property>
--->
                     </systemProperties>
                 </configuration>
             </plugin>
-
         </plugins>
     </build> 
-   
-
 </project>

Modified: cxf/dosgi/trunk/systests/single_bundle_distro/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests/single_bundle_distro/pom.xml?rev=761619&r1=761618&r2=761619&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests/single_bundle_distro/pom.xml (original)
+++ cxf/dosgi/trunk/systests/single_bundle_distro/pom.xml Fri Apr  3 11:15:51 
2009
@@ -54,48 +54,60 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.servicemix.kernel.testing</groupId>
-      <artifactId>org.apache.servicemix.kernel.testing.support</artifactId>
-      <version>1.0.0</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>org.apache.felix.framework</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>org.apache.felix.main</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>org.osgi.core</artifactId>
-        </exclusion>
-      </exclusions>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>${spring.version}</version>
+      <scope>test</scope>
     </dependency>
-
     <dependency>
-      <groupId>org.apache.cxf.dosgi</groupId>
-      <artifactId>cxf-dosgi-ri-singlebundle-distribution</artifactId>
-      <version>${project.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>org.apache.felix.framework</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>xalan</groupId>
-          <artifactId>xalan</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>xml-apis</groupId>
-          <artifactId>xml-apis</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>xerces</groupId>
-          <artifactId>xercesImpl</artifactId>
-        </exclusion>
-      </exclusions>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>${spring.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>${spring.version}</version>
+      <scope>test</scope>
+    </dependency> 
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>${spring.version}</version>
+      <scope>test</scope>
+    </dependency> 
+    <dependency>
+      <groupId>org.springframework.osgi</groupId>
+      <artifactId>spring-osgi-test</artifactId>
+      <version>${spring.osgi.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.osgi</groupId>
+      <artifactId>spring-osgi-core</artifactId>
+      <version>${spring.osgi.version}</version>
+      <scope>test</scope>
+    </dependency> 
+    <dependency>
+      <groupId>org.springframework.osgi</groupId>
+      <artifactId>spring-osgi-io</artifactId>
+      <version>${spring.osgi.version}</version>
+      <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.osgi</groupId>
+      <artifactId>spring-osgi-extender</artifactId>
+      <version>${spring.osgi.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.osgi</groupId>
+      <artifactId>spring-osgi-annotation</artifactId>
+      <version>${spring.osgi.version}</version>
+      <scope>test</scope>
+    </dependency>
+
     
     <dependency>
       <groupId>junit</groupId>


Reply via email to