[gatein-commits] gatein SVN: r5801 - in portal/trunk/packaging: jboss-as6 and 1 other directories.

Author: mstruk Date: 2011-01-20 12:17:34 -0500 (Thu, 20 Jan 2011) New Revision: 5801 Modified: portal/trunk/packaging/jboss-as5/pkg/pom.xml portal/trunk/packaging/jboss-as6/README.txt portal/trunk/packaging/jboss-as6/pkg/pom.xml Log: GTNMAVEN-16 Packaging that supports JBossAS6 and does away with javascript packager - fixed wsrp version override issue - version must be inherited from parent Modified: portal/trunk/packaging/jboss-as5/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-01-20 16:38:06 UTC (rev 5800) +++ portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-01-20 17:17:34 UTC (rev 5801) @@ -24,7 +24,6 @@ <jbossas.name>jboss-${jbossas.version}</jbossas.name> <jbossas.dir>${jbossas.path}/${jbossas.name}</jbossas.dir> <jbossas.target.dir>${project.build.directory}/jboss</jbossas.target.dir> - <wsrp.version>2.0.0-GA</wsrp.version> </properties> <dependencies> @@ -778,29 +777,32 @@ <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-producer-lib</artifactId> + <version>${org.gatein.wsrp.version}</version> </dependency> <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-common</artifactId> - <version>${wsrp.version}</version> + <version>${org.gatein.wsrp.version}</version> </dependency> <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-wsrp1-ws</artifactId> - <version>${wsrp.version}</version> + <version>${org.gatein.wsrp.version}</version> </dependency> <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-wsrp2-ws</artifactId> - <version>${wsrp.version}</version> + <version>${org.gatein.wsrp.version}</version> </dependency> <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-consumer</artifactId> + <version>${org.gatein.wsrp.version}</version> </dependency> <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-integration-api</artifactId> + <version>${org.gatein.wsrp.version}</version> </dependency> <dependency> @@ -895,14 +897,14 @@ <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-producer</artifactId> <type>war</type> - <version>${wsrp.version}</version> + <version>${org.gatein.wsrp.version}</version> </dependency> <dependency> <?move gatein.ear/wsrp-admin-gui.war?> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-admin-gui</artifactId> <type>war</type> - <version>${wsrp.version}</version> + <version>${org.gatein.wsrp.version}</version> </dependency> </dependencies> Modified: portal/trunk/packaging/jboss-as6/README.txt =================================================================== --- portal/trunk/packaging/jboss-as6/README.txt 2011-01-20 16:38:06 UTC (rev 5800) +++ portal/trunk/packaging/jboss-as6/README.txt 2011-01-20 17:17:34 UTC (rev 5801) @@ -10,7 +10,7 @@ - hibernate-core-3.3.2.GA is not included as it already comes with JBossAS-6.0.0.Final - gatein-sample-portal.ear, gatein-sample-extension.ear, and gatein-sample-skin.war are not included (they will be once the deployment descriptors are fixed) - wsrp-* modules are commented out in gatein.ear/META-INF/application.xml - - Resource file for patching JBoss AS are based on JBossAS-6.0.0.Final + - Resource files for patching JBoss AS are based on JBossAS-6.0.0.Final Modified: portal/trunk/packaging/jboss-as6/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-01-20 16:38:06 UTC (rev 5800) +++ portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-01-20 17:17:34 UTC (rev 5801) @@ -24,7 +24,6 @@ <jbossas.name>jboss-${jbossas.version}</jbossas.name> <jbossas.dir>${jbossas.path}/${jbossas.name}</jbossas.dir> <jbossas.target.dir>${project.build.directory}/jboss</jbossas.target.dir> - <wsrp.version>2.0.0-GA</wsrp.version> </properties> <dependencies> @@ -771,29 +770,32 @@ <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-producer-lib</artifactId> + <version>${org.gatein.wsrp.version}</version> </dependency> <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-common</artifactId> - <version>${wsrp.version}</version> + <version>${org.gatein.wsrp.version}</version> </dependency> <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-wsrp1-ws</artifactId> - <version>${wsrp.version}</version> + <version>${org.gatein.wsrp.version}</version> </dependency> <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-wsrp2-ws</artifactId> - <version>${wsrp.version}</version> + <version>${org.gatein.wsrp.version}</version> </dependency> <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-consumer</artifactId> + <version>${org.gatein.wsrp.version}</version> </dependency> <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-integration-api</artifactId> + <version>${org.gatein.wsrp.version}</version> </dependency> <dependency> @@ -888,14 +890,14 @@ <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-producer</artifactId> <type>war</type> - <version>${wsrp.version}</version> + <version>${org.gatein.wsrp.version}</version> </dependency> <dependency> <?move gatein.ear/wsrp-admin-gui.war?> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-admin-gui</artifactId> <type>war</type> - <version>${wsrp.version}</version> + <version>${org.gatein.wsrp.version}</version> </dependency> </dependencies>