git://wamblee.org / xmlrouter / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: d683404)
Turned the API packages into bundles.
authorErik Brakkee <erik@brakkee.org>
Sun, 14 Aug 2011 18:43:29 +0000 (20:43 +0200)
committerErik Brakkee <erik@brakkee.org>
Sun, 14 Aug 2011 18:43:29 +0000 (20:43 +0200)
common/pom.xml patch | blob | history
config/pom.xml patch | blob | history
impl/pom.xml patch | blob | history
listener/pom.xml patch | blob | history
persistentids.txt [deleted file] patch | blob | history
pom.xml patch | blob | history
publish/pom.xml patch | blob | history
subscribe/pom.xml patch | blob | history

diff --git a/common/pom.xml b/common/pom.xml
index 5b2c35f403b00bc5a2beb2112e9fb9e0cb1ae4a2..e558cd208a1a4bf516817b9f7a0a97017a35f1e0 100644 (file)
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<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-root</artifactId>
-        <version>0.1-SNAPSHOT</version>
+        <version>0.1.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>xmlrouter-common</artifactId>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
     <name>/xmlrouter/common</name>
     <url>http://wamblee.org</url>
-    
+
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
@@ -21,10 +21,26 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
-        </dependency>        
+        </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>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
+
     <distributionManagement>
         <site>
             <id>xmlrouter-site</id>
diff --git a/config/pom.xml b/config/pom.xml
index 26fa8b24af9e6b3d41eab13952d42273447a1b12..7970c808ab65593550c12e7abbc327b4b7b4ab3a 100644 (file)
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<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-root</artifactId>
-        <version>0.1-SNAPSHOT</version>
+        <version>0.1.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>xmlrouter-config</artifactId>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
     <name>/xmlrouter/config</name>
     <url>http://wamblee.org</url>
     
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>org.wamblee.xmlrouter</groupId>
             <artifactId>xmlrouter-common</artifactId>
-            <version>0.1-SNAPSHOT</version>
+            <version>0.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.wamblee</groupId>
@@ -33,6 +33,21 @@
         </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>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
     <distributionManagement>
         <site>
             <id>xmlrouter-site</id>
diff --git a/impl/pom.xml b/impl/pom.xml
index 0947b943ac2a00537135892e33bd0171d44d55e4..8c73ab27707b475ec498015e4aed628658168a34 100644 (file)
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<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-root</artifactId>
-        <version>0.1-SNAPSHOT</version>
+        <version>0.1.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -17,22 +17,22 @@
            <dependency>
                    <groupId>org.wamblee.xmlrouter</groupId>
                        <artifactId>xmlrouter-config</artifactId>
-                       <version>0.1-SNAPSHOT</version>
+                       <version>0.1.0-SNAPSHOT</version>
                </dependency>
                <dependency>
             <groupId>org.wamblee.xmlrouter</groupId>
             <artifactId>xmlrouter-publish</artifactId>
-            <version>0.1-SNAPSHOT</version>
+            <version>0.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.wamblee.xmlrouter</groupId>
             <artifactId>xmlrouter-subscribe</artifactId>
-            <version>0.1-SNAPSHOT</version>
+            <version>0.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.wamblee.xmlrouter</groupId>
             <artifactId>xmlrouter-listener</artifactId>
-            <version>0.1-SNAPSHOT</version>
+            <version>0.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
diff --git a/listener/pom.xml b/listener/pom.xml
index 917d4ec557f65dc3674c895268c54527ba8100a2..c1db80ebe9f7918d4db9a86b3414c9ca30633845 100644 (file)
--- a/listener/pom.xml
+++ b/listener/pom.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<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-root</artifactId>
-        <version>0.1-SNAPSHOT</version>
+        <version>0.1.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>xmlrouter-listener</artifactId>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
     <name>/xmlrouter/listener</name>
     <url>http://wamblee.org</url>
     
@@ -17,12 +17,12 @@
            <dependency>
                    <groupId>org.wamblee.xmlrouter</groupId>
                        <artifactId>xmlrouter-config</artifactId>
-                       <version>0.1-SNAPSHOT</version>
+                       <version>0.1.0-SNAPSHOT</version>
                </dependency>
                <dependency>
             <groupId>org.wamblee.xmlrouter</groupId>
             <artifactId>xmlrouter-publish</artifactId>
-            <version>0.1-SNAPSHOT</version>
+            <version>0.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -34,6 +34,21 @@
         </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>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
     <distributionManagement>
         <site>
             <id>xmlrouter-site</id>
diff --git a/persistentids.txt b/persistentids.txt
deleted file mode 100644 (file)
index dc526d4..0000000
--- a/persistentids.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-
-document types, filters, and transformations should define their own persistent ids. 
-
-Refactoring:
-* Id should become a String type.
-* Document type, filter, and transoformation should extend   Identifiable interface which defines Id<T> getId();
-* Id should be used in the config class to create the actual id. Id should no longer be returned.
-* deal with duplicate ids (runtime exception). 
-* unique ids at the xmlrouter level based on RouterConfig id. 
-
-
-* add new interface  with method updateConfig(RouterConfig) by which a service updates it's own part of the router config.
-* add copying of the RouterConfig. 
-* efficiently check for modifications based on the id. 
-
diff --git a/pom.xml b/pom.xml
index a235e33384cd4b801532dd0e301f57ee91fabfca..8c8c0e1b8d145e49a85489baa34c234356f6c454 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- 
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wamblee.xmlrouter</groupId>
     <artifactId>xmlrouter-root</artifactId>
     <packaging>pom</packaging>
-    <version>0.1-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
     <name>/xmlrouter</name>
     <description>A simple XML Router with OSGI support</description>
     <url>http://wamblee.org</url>
@@ -45,7 +45,7 @@
     </modules>
 
     <!-- need to exclude test at release because test depends on an artifact
-         eclipselink) which is not available at maven central --> 
+         eclipselink) which is not available at maven central -->
     <profiles>
         <profile>
             <id>release</id>
@@ -94,10 +94,10 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                           <groupId>org.wamblee</groupId>
-                               <artifactId>wamblee-support-general</artifactId>
-                               <version>0.7-SNAPSHOT</version>
-                       </dependency>
+                <groupId>org.wamblee</groupId>
+                <artifactId>wamblee-support-general</artifactId>
+                <version>0.7-SNAPSHOT</version>
+            </dependency>
             <dependency>
                 <groupId>org.wamblee</groupId>
                 <artifactId>wamblee-test-eclipselink</artifactId>
@@ -212,8 +212,8 @@
                     </execution>
                 </executions>
             </plugin>
-            
-          
+
+
             <plugin>
                 <artifactId>maven-site-plugin</artifactId>
                 <version>3.0-beta-3</version>
@@ -244,20 +244,32 @@
                                 </formats>
                             </configuration>
                         </plugin>
-                        
+
                     </reportPlugins>
                 </configuration>
             </plugin>
 
         </plugins>
 
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <extensions>true</extensions>
+                    <version>2.3.5</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
+
     </build>
-    
+
     <distributionManagement>
         <site>
             <id>xmlrouter-site</id>
             <url>file:${distrib}/all</url>
         </site>
     </distributionManagement>
- 
+
 </project>
diff --git a/publish/pom.xml b/publish/pom.xml
index 9f96ec87d9fb60d2607c921d7d917aee518b664b..d36fd0ea338f8fadc2112fc84b79519b3961bdda 100644 (file)
--- a/publish/pom.xml
+++ b/publish/pom.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<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-root</artifactId>
-        <version>0.1-SNAPSHOT</version>
+        <version>0.1.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>xmlrouter-publish</artifactId>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
     <name>/xmlrouter/publish</name>
     <url>http://wamblee.org</url>
     
@@ -24,6 +24,21 @@
         </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>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
     <distributionManagement>
         <site>
             <id>xmlrouter-site</id>
diff --git a/subscribe/pom.xml b/subscribe/pom.xml
index a429e9b73e197c403ec7a16754ddabf256cefe03..15d129605d38d1261d6339155b245a098b03ab0d 100644 (file)
--- a/subscribe/pom.xml
+++ b/subscribe/pom.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<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-root</artifactId>
-        <version>0.1-SNAPSHOT</version>
+        <version>0.1.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>xmlrouter-subscribe</artifactId>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
     <name>/xmlrouter/subscribe</name>
     <url>http://wamblee.org</url>
     
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>org.wamblee.xmlrouter</groupId>
             <artifactId>xmlrouter-common</artifactId>
-            <version>0.1-SNAPSHOT</version>
+            <version>0.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -29,6 +29,22 @@
         </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>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
+    
     <distributionManagement>
         <site>
             <id>xmlrouter-site</id>
Unnamed repository; edit this file 'description' to name the repository.