Initial version with all API bundles deployed in the integraiton test.

diff --git a/config/pom.xml b/config/pom.xml
index 7970c808ab65593550c12e7abbc327b4b7b4ab3a..b4a27f08d31be4f8704d9c4f35c878ce77f3526c 100644 (file)
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -19,10 +19,6 @@
             <artifactId>xmlrouter-common</artifactId>
             <version>0.1.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>org.wamblee</groupId>
-            <artifactId>wamblee-support-general</artifactId>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml
index 83f9459b8edad8263d9c4763d991cbde07d8420c..17c242852abe45c63656c538f4cad127942a7ca7 100644 (file)
--- a/integrationtest/pom.xml
+++ b/integrationtest/pom.xml
@@ -85,6 +85,10 @@
             <groupId>org.ops4j.pax.url</groupId>
             <artifactId>pax-url-aether</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.url</groupId>
+            <artifactId>pax-url-wrap</artifactId>
+        </dependency>
         
         <!-- only native -->
         <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 cfd362587474ac7365e07dc57be5f3548f64b5cf..5f93ff8d3ee2f766bd452b2f4dcc425ee54af4b9 100644 (file)
--- a/integrationtest/src/test/java/org/wamblee/xmlrouter/integrationtest/XmlRouterIntegrationTest.java
+++ b/integrationtest/src/test/java/org/wamblee/xmlrouter/integrationtest/XmlRouterIntegrationTest.java
@@ -29,16 +29,49 @@ public class XmlRouterIntegrationTest {
 
     @Configuration()
     public Option[] config() {
-        return options(junitBundles(),
-        // mockito 1.7
-        // wrappedBundle(mavenBundle().groupId("org.mockito")
-        // .artifactId("mockito-all").version("1.7")),
-        // mockito 1.8.5
+        return options(
+            // Test dependencies
+            mavenBundle().groupId("junit").artifactId("junit-dep")
+                .version("4.8.2"), //
             mavenBundle().groupId("org.mockito").artifactId("mockito-all")
                 .version("1.8.5"), //
+
+            // Dependencies from wamblee utils (TODO create bundle of
+            // support-general with optional dependencies).
+            mavenBundle().groupId("org.eclipse.persistence")
+                .artifactId("javax.persistence").version("2.0.0"), //
+            wrappedBundle(mavenBundle().groupId("net.sf.ehcache")
+                .artifactId("ehcache-core").version("2.2.0")), //
+
+            // XML Router API packages.
+            mavenBundle().groupId("org.wamblee.xmlrouter")
+                .artifactId("xmlrouter-common").versionAsInProject(),//
+            mavenBundle().groupId("org.wamblee.xmlrouter")
+                .artifactId("xmlrouter-config").versionAsInProject(),//
+            mavenBundle().groupId("org.wamblee.xmlrouter")
+                .artifactId("xmlrouter-publish").versionAsInProject(),//
+            mavenBundle().groupId("org.wamblee.xmlrouter")
+                .artifactId("xmlrouter-subscribe").versionAsInProject(),//
+            mavenBundle().groupId("org.wamblee.xmlrouter")
+                .artifactId("xmlrouter-listener").versionAsInProject(),//
+
+            // OSGI runtimes
             felix());
     }
 
+    /*
+     * @Configuration() public Option[] config() { return
+     * options(mavenBundle().groupId("junit").artifactId("junit-dep")
+     * .version("4.8.2"), // mockito 1.7 //
+     * wrappedBundle(mavenBundle().groupId("org.mockito") //
+     * .artifactId("mockito-all").version("1.7")), // mockito 1.8.5 //
+     * mavenBundle().groupId("org.objenesis").artifactId("objenesis") //
+     * .version("1.0"), // // mavenBundle("org.hamcrest",
+     * "hamcrest-core").version("1.1"),//
+     * mavenBundle().groupId("org.mockito").artifactId("mockito-all")
+     * .version("1.8.5"), // felix()); }
+     */
+
     @Test
     public void test1(BundleContext aContext) {
         System.out.println("=== Got context " + aContext);

diff --git a/listener/pom.xml b/listener/pom.xml
index c1db80ebe9f7918d4db9a86b3414c9ca30633845..0a635e9b7dd4150769b09caec44ea5f3621fa04f 100644 (file)
--- a/listener/pom.xml
+++ b/listener/pom.xml
@@ -14,6 +14,10 @@
     <url>http://wamblee.org</url>
     
     <dependencies>
+        <dependency>
+            <groupId>org.wamblee</groupId>
+            <artifactId>wamblee-support-general</artifactId>
+        </dependency>
            <dependency>
                    <groupId>org.wamblee.xmlrouter</groupId>
                        <artifactId>xmlrouter-config</artifactId>
@@ -43,6 +47,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
+                        <Embed-Dependency>wamblee-support-general;scope=compile|runtime</Embed-Dependency>
+                        <Embed-Directory>lib</Embed-Directory>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/pom.xml b/pom.xml
index 37c993a0fdccfbdb0d660897ddfb4311bb21d2a2..80ce38054f45dd2ca3f4893f4ac0d9e4bc304a66 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
 
 
     <properties>
-        <wamblee.utils.version>0.5</wamblee.utils.version>
+        <wamblee.utils.version>0.8-SNAPSHOT</wamblee.utils.version>
         <pax.exam.version>2.2.0</pax.exam.version>
         <pax.runner.version>1.7.4</pax.runner.version>
         <pax.url.version>1.3.4</pax.url.version>
@@ -100,7 +100,7 @@
             <dependency>
                 <groupId>org.wamblee</groupId>
                 <artifactId>wamblee-support-general</artifactId>
-                <version>0.7-SNAPSHOT</version>
+                <version>${wamblee.utils.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wamblee</groupId>
@@ -192,6 +192,13 @@
                 <version>${pax.url.version}</version>
                 <scope>test</scope>
             </dependency>
+                       
+                       <dependency>
+                <groupId>org.ops4j.pax.url</groupId>
+                <artifactId>pax-url-wrap</artifactId>
+                <version>${pax.url.version}</version>
+                <scope>test</scope>
+            </dependency>
             
             <!-- only native -->
             <dependency>

diff --git a/router/bundle/pom.xml b/router/bundle/pom.xml
new file mode 100644 (file)
index 0000000..458ceb1
--- /dev/null
+++ b/router/bundle/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <parent>
+        <groupId>org.wamblee.xmlrouter</groupId>
+        <artifactId>xmlrouter-router</artifactId>
+        <version>0.1.0-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>xmlrouter-router-bundle</artifactId>
+    <packaging>bundle</packaging>
+    <name>/xmlrouter/router/bundle</name>
+    <url>http://wamblee.org</url>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>org.wamblee.xmlrouter</groupId>
+            <artifactId>xmlrouter-router-impl</artifactId>
+            <version>0.1.0-SNAPSHOT</version>
+        </dependency>
+       
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
+                        <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+                        <Embed-Directory>lib</Embed-Directory>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <distributionManagement>
+        <site>
+            <id>xmlrouter-site</id>
+            <url>file:${distrib}/cache</url>
+        </site>
+    </distributionManagement>
+
+</project>

diff --git a/router/bundle/src/main/java/org/wamblee/xmlrouter/bundle/XmlrouterActivator.java b/router/bundle/src/main/java/org/wamblee/xmlrouter/bundle/XmlrouterActivator.java
new file mode 100644 (file)
index 0000000..03bb4a6
--- /dev/null
+++ b/router/bundle/src/main/java/org/wamblee/xmlrouter/bundle/XmlrouterActivator.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2005-2011 the original author or authors.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.wamblee.xmlrouter.bundle;
+
+public class XmlrouterActivator {
+
+}

diff --git a/router/impl/pom.xml b/router/impl/pom.xml
index afb379770eeda09af01d7b51f9255f908b8901e8..d146361a01f83914d98a951dd59ebb1b809f7803 100644 (file)
--- a/router/impl/pom.xml
+++ b/router/impl/pom.xml
@@ -15,6 +15,10 @@
 
     
     <dependencies>
+        <dependency>
+            <groupId>org.wamblee</groupId>
+            <artifactId>wamblee-support-general</artifactId>
+        </dependency>
            <dependency>
                    <groupId>org.wamblee.xmlrouter</groupId>
                        <artifactId>xmlrouter-config</artifactId>

diff --git a/router/pom.xml b/router/pom.xml
index dd22d40c678a8f9daf5bd0c016ac145e48068608..ae906b62b4cb2784408bc5fcaa8b4523b7088fe3 100644 (file)
--- a/router/pom.xml
+++ b/router/pom.xml
@@ -14,6 +14,7 @@
 
     <modules>
         <module>impl</module>
+        <module>bundle</module>
     </modules>
 
     <distributionManagement>