servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r605833 - in /servicemix/smx4/nmr/trunk/jbi/itests: pom.xml src/test/java/org/apache/servicemix/jbi/IntegrationTest.java src/test/resources/org/apache/servicemix/MANIFEST.MF
Date Thu, 20 Dec 2007 08:28:24 GMT
Author: gnodet
Date: Thu Dec 20 00:28:23 2007
New Revision: 605833

URL: http://svn.apache.org/viewvc?rev=605833&view=rev
Log:
Add (commented) test using wsdl-first example from smx3

Modified:
    servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
    servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java
    servicemix/smx4/nmr/trunk/jbi/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF

Modified: servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/pom.xml?rev=605833&r1=605832&r2=605833&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/pom.xml Thu Dec 20 00:28:23 2007
@@ -39,6 +39,11 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <version>${felix.osgi.version}</version>
+        </dependency>
+        <dependency>
             <groupId>org.apache.servicemix.runtime.testing</groupId>
             <artifactId>org.apache.servicemix.runtime.testing.support</artifactId>
 		    <version>0.1-SNAPSHOT</version>
@@ -112,6 +117,32 @@
             <classifier>installer</classifier>
             <type>zip</type>
         </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-jsr181</artifactId>
+            <version>${smx3.version}</version>
+            <classifier>installer</classifier>
+            <type>zip</type>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-http</artifactId>
+            <version>${smx3.version}</version>
+            <classifier>installer</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.samples.wsdl-first</groupId>
+            <artifactId>wsdl-first-sa</artifactId>
+            <version>${smx3.version}</version>
+            <type>zip</type>
+        </dependency>
     </dependencies>
 
     <build>
@@ -156,6 +187,26 @@
                                     <artifactId>servicemix-eip</artifactId>
                                     <version>${smx3.version}</version>
                                     <classifier>installer</classifier>
+                                    <type>zip</type>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.servicemix</groupId>
+                                    <artifactId>servicemix-jsr181</artifactId>
+                                    <version>${smx3.version}</version>
+                                    <classifier>installer</classifier>
+                                    <type>zip</type>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.servicemix</groupId>
+                                    <artifactId>servicemix-http</artifactId>
+                                    <version>${smx3.version}</version>
+                                    <classifier>installer</classifier>
+                                    <type>zip</type>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.servicemix.samples.wsdl-first</groupId>
+                                    <artifactId>wsdl-first-sa</artifactId>
+                                    <version>${smx3.version}</version>
                                     <type>zip</type>
                                 </artifactItem>
                             </artifactItems>

Modified: servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java?rev=605833&r1=605832&r2=605833&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java
(original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java
Thu Dec 20 00:28:23 2007
@@ -16,25 +16,13 @@
  */
 package org.apache.servicemix.jbi;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Properties;
 
 import javax.jbi.component.Component;
 
-import org.apache.servicemix.jbi.offline.Main;
+import org.apache.servicemix.jbi.deployer.ServiceAssembly;
 import org.apache.servicemix.nmr.api.NMR;
 import org.apache.servicemix.runtime.testing.support.AbstractIntegrationTest;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.ServiceEvent;
-import org.osgi.framework.ServiceListener;
-import org.springframework.osgi.internal.util.concurrent.Counter;
-import org.springframework.osgi.util.OsgiFilterUtils;
-import org.springframework.osgi.util.OsgiListenerUtils;
 
 public class IntegrationTest extends AbstractIntegrationTest {
 
@@ -92,5 +80,20 @@
         Component cmp = (Component) getOsgiService(Component.class);
         assertNotNull(cmp);
     }
+
+    /*
+    public void testServiceAssembly() throws Exception {
+        System.out.println("Waiting for NMR");
+        NMR nmr = getOsgiService(NMR.class);
+        assertNotNull(nmr);
+        installBundle("org.apache.servicemix", "servicemix-shared-compat", "installer", "zip");
+        installBundle("org.apache.servicemix", "servicemix-jsr181", "installer", "zip");
+        installBundle("org.apache.servicemix", "servicemix-http", "installer", "zip");
+        installBundle("org.apache.servicemix.samples.wsdl-first", "wsdl-first-sa", null,
"zip");
+        System.out.println("Waiting for JBI Service Assembly");
+        ServiceAssembly sa = (ServiceAssembly) getOsgiService(ServiceAssembly.class);
+        assertNotNull(sa);
+    }
+    */
 
 }

Modified: servicemix/smx4/nmr/trunk/jbi/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF?rev=605833&r1=605832&r2=605833&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF
(original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF
Thu Dec 20 00:28:23 2007
@@ -28,6 +28,7 @@
  org.apache.servicemix.nmr.api,
  org.apache.servicemix.nmr.core,
  org.apache.servicemix.jbi.offline,
+ org.apache.servicemix.jbi.deployer,
  org.apache.servicemix.runtime.testing.support,
  org.springframework.osgi.util,
  javax.jbi.component



Mime
View raw message