svn commit: r1577119 - in /axis/axis2/java/core/trunk/modules/osgi-tests: pom.xml src/test/java/OSGiTest.java src/test/java/org/ src/test/resources/

[veithen]

Author: veithen
Date: Thu Mar 13 11:47:42 2014
New Revision: 1577119

URL: http://svn.apache.org/r1577119
Log:
Integrated Saminda's original test service into the OSGi integration test.

Added:
    axis/axis2/java/core/trunk/modules/osgi-tests/src/test/java/org/
      - copied from r1577116, 
axis/axis2/java/core/scratch/java/saminda/osgi_test/version.service/src/main/java/org/
    axis/axis2/java/core/trunk/modules/osgi-tests/src/test/resources/
      - copied from r1577116, 
axis/axis2/java/core/scratch/java/saminda/osgi_test/version.service/src/main/resources/
Modified:
    axis/axis2/java/core/trunk/modules/osgi-tests/pom.xml
    axis/axis2/java/core/trunk/modules/osgi-tests/src/test/java/OSGiTest.java

Modified: axis/axis2/java/core/trunk/modules/osgi-tests/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/osgi-tests/pom.xml?rev=1577119&r1=1577118&r2=1577119&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/osgi-tests/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/osgi-tests/pom.xml Thu Mar 13 11:47:42 
2014
@@ -39,7 +39,7 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>axis2-kernel</artifactId>
+            <artifactId>org.apache.axis2.osgi</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
@@ -126,11 +126,6 @@
                             </dependencySet>
                             <artifacts>
                                 <artifact>
-                                    <groupId>${project.groupId}</groupId>
-                                    
<artifactId>org.apache.axis2.osgi</artifactId>
-                                    <version>${project.version}</version>
-                                </artifact>
-                                <artifact>
                                     
<groupId>org.apache.servicemix.bundles</groupId>
                                     
<artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
                                     <version>1.6.2_6</version>

Modified: 
axis/axis2/java/core/trunk/modules/osgi-tests/src/test/java/OSGiTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/osgi-tests/src/test/java/OSGiTest.java?rev=1577119&r1=1577118&r2=1577119&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/osgi-tests/src/test/java/OSGiTest.java 
(original)
+++ axis/axis2/java/core/trunk/modules/osgi-tests/src/test/java/OSGiTest.java 
Thu Mar 13 11:47:42 2014
@@ -19,10 +19,15 @@
 import static org.junit.Assert.assertTrue;
 import static org.ops4j.pax.exam.CoreOptions.junitBundles;
 import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.CoreOptions.provision;
 import static org.ops4j.pax.exam.CoreOptions.url;
+import static org.ops4j.pax.tinybundles.core.TinyBundles.bundle;
 
 import javax.inject.Inject;
 
+import org.apache.axis2.osgi.service.Activator;
+import org.apache.axis2.osgi.service.Calculator;
+import org.apache.axis2.osgi.service.Version;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -33,6 +38,7 @@ import org.ops4j.pax.exam.spi.reactors.E
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
@@ -63,6 +69,15 @@ public class OSGiTest {
                 url("link:classpath:org.apache.woden.core.link"),
                 url("link:classpath:org.apache.ws.xmlschema.core.link"),
                 url("link:classpath:org.apache.axis2.osgi.link"),
+                provision(bundle()
+                    .add(Activator.class)
+                    .add(Calculator.class)
+                    .add(Version.class)
+                    .add("META-INF/services.xml", 
OSGiTest.class.getResource("/META-INF/services.xml"))
+                    .set(Constants.BUNDLE_SYMBOLICNAME, "version.service")
+                    .set(Constants.BUNDLE_ACTIVATOR, Activator.class.getName())
+                    .set(Constants.DYNAMICIMPORT_PACKAGE, "*")
+                    .build()),
                 junitBundles());
     }