now also deploying the XML router itself in the integration test.

diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml
index 17c242852abe45c63656c538f4cad127942a7ca7..14256d05a3e9cfcc98a8684123821a38c32b86c8 100644 (file)
--- a/integrationtest/pom.xml
+++ b/integrationtest/pom.xml
@@ -16,27 +16,7 @@
     <dependencies>
         <dependency>
             <groupId>org.wamblee.xmlrouter</groupId>
-            <artifactId>xmlrouter-common</artifactId>
-            <version>0.1.0-SNAPSHOT</version>
-        </dependency>
-               <dependency>
-            <groupId>org.wamblee.xmlrouter</groupId>
-            <artifactId>xmlrouter-config</artifactId>
-            <version>0.1.0-SNAPSHOT</version>
-        </dependency>
-               <dependency>
-            <groupId>org.wamblee.xmlrouter</groupId>
-            <artifactId>xmlrouter-listener</artifactId>
-            <version>0.1.0-SNAPSHOT</version>
-        </dependency>
-               <dependency>
-            <groupId>org.wamblee.xmlrouter</groupId>
-            <artifactId>xmlrouter-publish</artifactId>
-            <version>0.1.0-SNAPSHOT</version>
-        </dependency>
-               <dependency>
-            <groupId>org.wamblee.xmlrouter</groupId>
-            <artifactId>xmlrouter-subscribe</artifactId>
+            <artifactId>xmlrouter-router-bundle</artifactId>
             <version>0.1.0-SNAPSHOT</version>
         </dependency>
        

diff --git a/integrationtest/src/test/java/org/wamblee/xmlrouter/integrationtest/XmlRouterIntegrationTest.java b/integrationtest/src/test/java/org/wamblee/xmlrouter/integrationtest/XmlRouterIntegrationTest.java
index 912749929b3c131445859df66c6b41b17068115c..6bef98a6d78c3caa5e79dff8fb97abf89424f61f 100644 (file)
--- a/integrationtest/src/test/java/org/wamblee/xmlrouter/integrationtest/XmlRouterIntegrationTest.java
+++ b/integrationtest/src/test/java/org/wamblee/xmlrouter/integrationtest/XmlRouterIntegrationTest.java
@@ -47,6 +47,8 @@ public class XmlRouterIntegrationTest {
                 .artifactId("xmlrouter-subscribe").versionAsInProject(),//
             mavenBundle().groupId("org.wamblee.xmlrouter")
                 .artifactId("xmlrouter-listener").versionAsInProject(),//
+            mavenBundle().groupId("org.wamblee.xmlrouter")
+                .artifactId("xmlrouter-router-bundle").versionAsInProject(), //
 
             // OSGI runtimes
             felix());

diff --git a/router/bundle/pom.xml b/router/bundle/pom.xml
index 458ceb1739b7a859d56474ccafab2fa2e430e6dd..ff189df3a922a766c355e036605e5405fd720f5d 100644 (file)
--- a/router/bundle/pom.xml
+++ b/router/bundle/pom.xml
@@ -21,6 +21,10 @@
             <artifactId>xmlrouter-router-impl</artifactId>
             <version>0.1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>org.wamblee</groupId>
+            <artifactId>wamblee-support-general</artifactId>
+        </dependency>
        
         <dependency>
             <groupId>junit</groupId>
@@ -43,6 +47,7 @@
                         <Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
                         <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
                         <Embed-Directory>lib</Embed-Directory>
+                        <Import-Package>!javax.persistence, !net.sf.ehcache, *</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>