ROO-983: Refactor Maven project structure to allow projects to select…

… if they require OSGi Declarative Services (SCR) or not
spring-attic · Jun 10, 2010 · b4b5cc0 · b4b5cc0
1 parent 14696f6
commit b4b5cc0
Show file tree

Hide file tree

Showing 45 changed files with 135 additions and 116 deletions.
diff --git a/addon-backup/pom.xml b/addon-backup/pom.xml
@@ -3,9 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.roo</groupId>
-		<artifactId>org.springframework.roo.parent</artifactId>
+		<artifactId>org.springframework.roo.osgi.roo.bundle</artifactId>
 		<version>1.1.0.M2</version>
-		<relativePath>../parent</relativePath>
+		<relativePath>../osgi-roo-bundle</relativePath>
 	</parent>
 	<artifactId>org.springframework.roo.addon.backup</artifactId>
 	<packaging>bundle</packaging>

diff --git a/addon-beaninfo/pom.xml b/addon-beaninfo/pom.xml
@@ -3,9 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.roo</groupId>
-		<artifactId>org.springframework.roo.parent</artifactId>
+		<artifactId>org.springframework.roo.osgi.roo.bundle</artifactId>
 		<version>1.1.0.M2</version>
-		<relativePath>../parent</relativePath>
+		<relativePath>../osgi-roo-bundle</relativePath>
 	</parent>
 	<artifactId>org.springframework.roo.addon.beaninfo</artifactId>
 	<packaging>bundle</packaging>

diff --git a/addon-configurable/pom.xml b/addon-configurable/pom.xml
@@ -3,9 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.roo</groupId>
-		<artifactId>org.springframework.roo.parent</artifactId>
+		<artifactId>org.springframework.roo.osgi.roo.bundle</artifactId>
 		<version>1.1.0.M2</version>
-		<relativePath>../parent</relativePath>
+		<relativePath>../osgi-roo-bundle</relativePath>
 	</parent>
 	<artifactId>org.springframework.roo.addon.configurable</artifactId>
 	<packaging>bundle</packaging>

diff --git a/addon-dbre/pom.xml b/addon-dbre/pom.xml
@@ -3,9 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.roo</groupId>
-		<artifactId>org.springframework.roo.parent</artifactId>
+		<artifactId>org.springframework.roo.osgi.roo.bundle</artifactId>
 		<version>1.1.0.M2</version>
-		<relativePath>../parent</relativePath>
+		<relativePath>../osgi-roo-bundle</relativePath>
 	</parent>
 	<artifactId>org.springframework.roo.addon.dbre</artifactId>
 	<packaging>bundle</packaging>

diff --git a/addon-dod/pom.xml b/addon-dod/pom.xml
@@ -4,9 +4,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.roo</groupId>
-		<artifactId>org.springframework.roo.parent</artifactId>
+		<artifactId>org.springframework.roo.osgi.roo.bundle</artifactId>
 		<version>1.1.0.M2</version>
-		<relativePath>../parent</relativePath>
+		<relativePath>../osgi-roo-bundle</relativePath>
 	</parent>
 	<artifactId>org.springframework.roo.addon.dod</artifactId>
 	<packaging>bundle</packaging>

diff --git a/addon-email/pom.xml b/addon-email/pom.xml
@@ -3,9 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.roo</groupId>
-		<artifactId>org.springframework.roo.parent</artifactId>
+		<artifactId>org.springframework.roo.osgi.roo.bundle</artifactId>
 		<version>1.1.0.M2</version>
-		<relativePath>../parent</relativePath>
+		<relativePath>../osgi-roo-bundle</relativePath>
 	</parent>
 	<artifactId>org.springframework.roo.addon.email</artifactId>
 	<packaging>bundle</packaging>

diff --git a/addon-entity/pom.xml b/addon-entity/pom.xml
@@ -3,9 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.roo</groupId>
-		<artifactId>org.springframework.roo.parent</artifactId>
+		<artifactId>org.springframework.roo.osgi.roo.bundle</artifactId>
 		<version>1.1.0.M2</version>
-		<relativePath>../parent</relativePath>
+		<relativePath>../osgi-roo-bundle</relativePath>
 	</parent>
 	<artifactId>org.springframework.roo.addon.entity</artifactId>
 	<packaging>bundle</packaging>

diff --git a/addon-finder/pom.xml b/addon-finder/pom.xml
@@ -3,9 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.roo</groupId>
-		<artifactId>org.springframework.roo.parent</artifactId>
+		<artifactId>org.springframework.roo.osgi.roo.bundle</artifactId>
 		<version>1.1.0.M2</version>
-		<relativePath>../parent</relativePath>
+		<relativePath>../osgi-roo-bundle</relativePath>
 	</parent>
 	<artifactId>org.springframework.roo.addon.finder</artifactId>
 	<packaging>bundle</packaging>

diff --git a/addon-gwt/pom.xml b/addon-gwt/pom.xml
@@ -3,9 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.roo</groupId>
-		<artifactId>org.springframework.roo.parent</artifactId>
+		<artifactId>org.springframework.roo.osgi.roo.bundle</artifactId>
 		<version>1.1.0.M2</version>
-		<relativePath>../parent</relativePath>
+		<relativePath>../osgi-roo-bundle</relativePath>
 	</parent>
 	<artifactId>org.springframework.roo.addon.gwt</artifactId>
 	<packaging>bundle</packaging>

diff --git a/addon-javabean/pom.xml b/addon-javabean/pom.xml
@@ -3,9 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.roo</groupId>
-		<artifactId>org.springframework.roo.parent</artifactId>
+		<artifactId>org.springframework.roo.osgi.roo.bundle</artifactId>
 		<version>1.1.0.M2</version>
-		<relativePath>../parent</relativePath>
+		<relativePath>../osgi-roo-bundle</relativePath>
 	</parent>
 	<artifactId>org.springframework.roo.addon.javabean</artifactId>
 	<packaging>bundle</packaging>

diff --git a/addon-jms/pom.xml b/addon-jms/pom.xml
@@ -3,9 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.roo</groupId>
-		<artifactId>org.springframework.roo.parent</artifactId>
+		<artifactId>org.springframework.roo.osgi.roo.bundle</artifactId>
 		<version>1.1.0.M2</version>
-		<relativePath>../parent</relativePath>
+		<relativePath>../osgi-roo-bundle</relativePath>
 	</parent>
 	<artifactId>org.springframework.roo.addon.jms</artifactId>
 	<packaging>bundle</packaging>

diff --git a/addon-jpa/pom.xml b/addon-jpa/pom.xml
@@ -3,9 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.roo</groupId>
-		<artifactId>org.springframework.roo.parent</artifactId>
+		<artifactId>org.springframework.roo.osgi.roo.bundle</artifactId>
 		<version>1.1.0.M2</version>
-		<relativePath>../parent</relativePath>
+		<relativePath>../osgi-roo-bundle</relativePath>
 	</parent>
 	<artifactId>org.springframework.roo.addon.jpa</artifactId>
 	<packaging>bundle</packaging>

diff --git a/addon-logging/pom.xml b/addon-logging/pom.xml
@@ -3,9 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.roo</groupId>
-		<artifactId>org.springframework.roo.parent</artifactId>
+		<artifactId>org.springframework.roo.osgi.roo.bundle</artifactId>
 		<version>1.1.0.M2</version>
-		<relativePath>../parent</relativePath>
+		<relativePath>../osgi-roo-bundle</relativePath>
 	</parent>
 	<artifactId>org.springframework.roo.addon.logging</artifactId>
 	<packaging>bundle</packaging>

diff --git a/addon-maven/pom.xml b/addon-maven/pom.xml
@@ -3,9 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.roo</groupId>
-		<artifactId>org.springframework.roo.parent</artifactId>
+		<artifactId>org.springframework.roo.osgi.roo.bundle</artifactId>
 		<version>1.1.0.M2</version>
-		<relativePath>../parent</relativePath>
+		<relativePath>../osgi-roo-bundle</relativePath>
 	</parent>
 	<artifactId>org.springframework.roo.addon.maven</artifactId>
 	<packaging>bundle</packaging>

diff --git a/addon-plural/pom.xml b/addon-plural/pom.xml
@@ -3,9 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.roo</groupId>
-		<artifactId>org.springframework.roo.parent</artifactId>
+		<artifactId>org.springframework.roo.osgi.roo.bundle</artifactId>
 		<version>1.1.0.M2</version>
-		<relativePath>../parent</relativePath>
+		<relativePath>../osgi-roo-bundle</relativePath>
 	</parent>
 	<artifactId>org.springframework.roo.addon.plural</artifactId>
 	<packaging>bundle</packaging>

diff --git a/addon-property-editor/pom.xml b/addon-property-editor/pom.xml
@@ -3,9 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.roo</groupId>
-		<artifactId>org.springframework.roo.parent</artifactId>
+		<artifactId>org.springframework.roo.osgi.roo.bundle</artifactId>
 		<version>1.1.0.M2</version>
-		<relativePath>../parent</relativePath>
+		<relativePath>../osgi-roo-bundle</relativePath>
 	</parent>
 	<artifactId>org.springframework.roo.addon.property.editor</artifactId>
 	<packaging>bundle</packaging>

diff --git a/addon-propfiles/pom.xml b/addon-propfiles/pom.xml
@@ -3,9 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.roo</groupId>
-		<artifactId>org.springframework.roo.parent</artifactId>
+		<artifactId>org.springframework.roo.osgi.roo.bundle</artifactId>
 		<version>1.1.0.M2</version>
-		<relativePath>../parent</relativePath>
+		<relativePath>../osgi-roo-bundle</relativePath>
 	</parent>
 	<artifactId>org.springframework.roo.addon.propfiles</artifactId>
 	<packaging>bundle</packaging>

diff --git a/addon-security/pom.xml b/addon-security/pom.xml
@@ -3,9 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.roo</groupId>
-		<artifactId>org.springframework.roo.parent</artifactId>
+		<artifactId>org.springframework.roo.osgi.roo.bundle</artifactId>
 		<version>1.1.0.M2</version>
-		<relativePath>../parent</relativePath>
+		<relativePath>../osgi-roo-bundle</relativePath>
 	</parent>
 	<artifactId>org.springframework.roo.addon.security</artifactId>
 	<packaging>bundle</packaging>

diff --git a/addon-serializable/pom.xml b/addon-serializable/pom.xml
@@ -3,9 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.roo</groupId>
-		<artifactId>org.springframework.roo.parent</artifactId>
+		<artifactId>org.springframework.roo.osgi.roo.bundle</artifactId>
 		<version>1.1.0.M2</version>
-		<relativePath>../parent</relativePath>
+		<relativePath>../osgi-roo-bundle</relativePath>
 	</parent>
 	<artifactId>org.springframework.roo.addon.serializable</artifactId>
 	<packaging>bundle</packaging>

diff --git a/addon-solr/pom.xml b/addon-solr/pom.xml
@@ -4,9 +4,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.roo</groupId>
-		<artifactId>org.springframework.roo.parent</artifactId>
+		<artifactId>org.springframework.roo.osgi.roo.bundle</artifactId>
 		<version>1.1.0.M2</version>
-		<relativePath>../parent</relativePath>
+		<relativePath>../osgi-roo-bundle</relativePath>
 	</parent>
 	<artifactId>org.springframework.roo.addon.solr</artifactId>
 	<packaging>bundle</packaging>

diff --git a/addon-test/pom.xml b/addon-test/pom.xml
@@ -4,9 +4,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.roo</groupId>
-		<artifactId>org.springframework.roo.parent</artifactId>
+		<artifactId>org.springframework.roo.osgi.roo.bundle</artifactId>
 		<version>1.1.0.M2</version>
-		<relativePath>../parent</relativePath>
+		<relativePath>../osgi-roo-bundle</relativePath>
 	</parent>
 	<artifactId>org.springframework.roo.addon.test</artifactId>
 	<packaging>bundle</packaging>

diff --git a/addon-tostring/pom.xml b/addon-tostring/pom.xml
@@ -3,9 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.roo</groupId>
-		<artifactId>org.springframework.roo.parent</artifactId>
+		<artifactId>org.springframework.roo.osgi.roo.bundle</artifactId>
 		<version>1.1.0.M2</version>
-		<relativePath>../parent</relativePath>
+		<relativePath>../osgi-roo-bundle</relativePath>
 	</parent>
 	<artifactId>org.springframework.roo.addon.tostring</artifactId>
 	<packaging>bundle</packaging>

diff --git a/addon-web-flow/pom.xml b/addon-web-flow/pom.xml
@@ -3,9 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.roo</groupId>
-		<artifactId>org.springframework.roo.parent</artifactId>
+		<artifactId>org.springframework.roo.osgi.roo.bundle</artifactId>
 		<version>1.1.0.M2</version>
-		<relativePath>../parent</relativePath>
+		<relativePath>../osgi-roo-bundle</relativePath>
 	</parent>
 	<artifactId>org.springframework.roo.addon.web.flow</artifactId>
 	<packaging>bundle</packaging>

diff --git a/addon-web-mvc-controller/pom.xml b/addon-web-mvc-controller/pom.xml
@@ -4,9 +4,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.roo</groupId>
-		<artifactId>org.springframework.roo.parent</artifactId>
+		<artifactId>org.springframework.roo.osgi.roo.bundle</artifactId>
 		<version>1.1.0.M2</version>
-		<relativePath>../parent</relativePath>
+		<relativePath>../osgi-roo-bundle</relativePath>
 	</parent>
 	<artifactId>org.springframework.roo.addon.web.mvc.controller</artifactId>
 	<packaging>bundle</packaging>

diff --git a/addon-web-mvc-jsp/pom.xml b/addon-web-mvc-jsp/pom.xml
@@ -4,9 +4,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.roo</groupId>
-		<artifactId>org.springframework.roo.parent</artifactId>
+		<artifactId>org.springframework.roo.osgi.roo.bundle</artifactId>
 		<version>1.1.0.M2</version>
-		<relativePath>../parent</relativePath>
+		<relativePath>../osgi-roo-bundle</relativePath>
 	</parent>
 	<artifactId>org.springframework.roo.addon.web.mvc.jsp</artifactId>
 	<packaging>bundle</packaging>

diff --git a/addon-web-selenium/pom.xml b/addon-web-selenium/pom.xml
@@ -3,9 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.roo</groupId>
-		<artifactId>org.springframework.roo.parent</artifactId>
+		<artifactId>org.springframework.roo.osgi.roo.bundle</artifactId>
 		<version>1.1.0.M2</version>
-		<relativePath>../parent</relativePath>
+		<relativePath>../osgi-roo-bundle</relativePath>
 	</parent>
 	<artifactId>org.springframework.roo.addon.web.selenium</artifactId>
 	<packaging>bundle</packaging>

diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
@@ -4,9 +4,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.roo</groupId>
-		<artifactId>org.springframework.roo.parent</artifactId>
+		<artifactId>org.springframework.roo.osgi.roo.bundle</artifactId>
 		<version>1.1.0.M2</version>
-		<relativePath>../parent</relativePath>
+		<relativePath>../osgi-roo-bundle</relativePath>
 	</parent>
 	<artifactId>org.springframework.roo.bootstrap</artifactId>
     <!-- JAR packaging is correct; this is not an OSGi bundle 0-->

diff --git a/bootstrap/src/main/assembly/assembly.xml b/bootstrap/src/main/assembly/assembly.xml
@@ -134,30 +134,24 @@
         </fileSet>
         <fileSet>
             <outputDirectory>/bin</outputDirectory>
-            <directory>bootstrap/target</directory>
+            <directory>${project.build.directory}/all</directory>
             <useDefaultExcludes>true</useDefaultExcludes>
             <includes>
                 <include>org.springframework.roo.bootstrap-*.jar</include>
-            </includes>
-            <excludes>
-                <exclude>*-sources.jar</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <outputDirectory>/bin</outputDirectory>
-            <directory>bootstrap/target/dependency</directory>
-            <useDefaultExcludes>true</useDefaultExcludes>
-            <includes>
                 <include>org.apache.felix.framework-*.jar</include>
             </includes>
         </fileSet>
         <fileSet>
             <outputDirectory>/bundle</outputDirectory>
-            <directory>${project.build.directory}/bundle</directory>
+            <directory>${project.build.directory}/all</directory>
             <useDefaultExcludes>true</useDefaultExcludes>
             <includes>
                 <include>*.jar</include>
             </includes>
+            <excludes>
+                <exclude>org.springframework.roo.bootstrap-*.jar</exclude>
+                <exclude>org.apache.felix.framework-*.jar</exclude>
+            </excludes>
         </fileSet>
 	</fileSets>
 

diff --git a/classpath-javaparser/pom.xml b/classpath-javaparser/pom.xml
@@ -3,9 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.roo</groupId>
-		<artifactId>org.springframework.roo.parent</artifactId>
+		<artifactId>org.springframework.roo.osgi.roo.bundle</artifactId>
 		<version>1.1.0.M2</version>
-		<relativePath>../parent</relativePath>
+		<relativePath>../osgi-roo-bundle</relativePath>
 	</parent>
 	<artifactId>org.springframework.roo.classpath.javaparser</artifactId>
 	<packaging>bundle</packaging>

diff --git a/classpath/pom.xml b/classpath/pom.xml
@@ -3,9 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.roo</groupId>
-		<artifactId>org.springframework.roo.parent</artifactId>
+		<artifactId>org.springframework.roo.osgi.roo.bundle</artifactId>
 		<version>1.1.0.M2</version>
-		<relativePath>../parent</relativePath>
+		<relativePath>../osgi-roo-bundle</relativePath>
 	</parent>
 	<artifactId>org.springframework.roo.classpath</artifactId>
 	<packaging>bundle</packaging>

diff --git a/felix/pom.xml b/felix/pom.xml
@@ -3,9 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.springframework.roo</groupId>
-        <artifactId>org.springframework.roo.parent</artifactId>
+        <artifactId>org.springframework.roo.osgi.roo.bundle</artifactId>
         <version>1.1.0.M2</version>
-		<relativePath>../parent</relativePath>
+		<relativePath>../osgi-roo-bundle</relativePath>
     </parent>
     <artifactId>org.springframework.roo.felix</artifactId>
     <packaging>bundle</packaging>