Author: hfnukal Date: 2011-06-24 02:46:24 -0400 (Fri, 24 Jun 2011) New Revision: 6729 Modified: epp/portal/branches/EPP_5_2_Branch/distribution/pack/examples/pom.xml epp/portal/branches/EPP_5_2_Branch/distribution/pack/pom.xml epp/portal/branches/EPP_5_2_Branch/distribution/pack/serverAddon/gatein.ear/pom.xml epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml Log: JBEPP-942 Packaging Modified: epp/portal/branches/EPP_5_2_Branch/distribution/pack/examples/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/pack/examples/pom.xml 2011-06-23 21:24:54 UTC (rev 6728) +++ epp/portal/branches/EPP_5_2_Branch/distribution/pack/examples/pom.xml 2011-06-24 06:46:24 UTC (rev 6729) @@ -12,7 +12,7 @@ <groupId>org.exoplatform.portal.distribution</groupId> <artifactId>examples</artifactId> <packaging>pom</packaging> - <name>Distribution portletbridge</name> + <name>Distribution examples</name> <dependencies> Modified: epp/portal/branches/EPP_5_2_Branch/distribution/pack/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/pack/pom.xml 2011-06-23 21:24:54 UTC (rev 6728) +++ epp/portal/branches/EPP_5_2_Branch/distribution/pack/pom.xml 2011-06-24 06:46:24 UTC (rev 6729) @@ -51,7 +51,7 @@ <!-- EAP overlay --> <dependency> - <groupId>org.jboss</groupId> + <groupId>${eap.groupId}</groupId> <artifactId>jboss-eap</artifactId> <version>${eap.version}</version> <type>zip</type> @@ -62,90 +62,120 @@ <build> <finalName>jboss-epp-${project.version}</finalName> - <plugins> + </plugins> + </build> + + <profiles> + <profile> + <id>epp-distribution-assembly</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <build> + <plugins> + <!-- Put to gether all components --> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>distro-assembly</id> + <phase>compile</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>src/assemble.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> - <!-- Put to gether all components --> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>distro-assembly</id> - <phase>compile</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <appendAssemblyId>false</appendAssemblyId> - <descriptors> - <descriptor>src/assemble.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - + <profile> + <id>epp-distribution-patch</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <build> + <plugins> <!-- Apply patches and rename folders --> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.6</version> - <executions> - <execution> - <id>ant-final</id> - <phase>compile</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target> - <property name="epp.path">${project.build.directory}/${project.build.finalName}/${epp.dir}</property> - <property name="eap.path">${project.build.directory}/${project.build.finalName}/${eap.dir}</property> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.6</version> + <executions> + <execution> + <id>ant-final</id> + <phase>compile</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <property name="epp.path">${project.build.directory}/${project.build.finalName}/${epp.dir}</property> + <property name="eap.path">${project.build.directory}/${project.build.finalName}/${eap.dir}</property> - <move file="${eap.path}" toFile="${epp.path}"/> - <move file="${epp.path}/gatein-sso-${sso.version}" toFile="${epp.path}/${sso.directory}"/> + <move file="${eap.path}" toFile="${epp.path}"/> + <move file="${epp.path}/gatein-sso-${sso.version}" toFile="${epp.path}/${sso.directory}"/> - <ant antfile="src/build.xml" inheritRefs="true"> - <target name="patch"/> - <property name="toConfiguration" value="default"/> - </ant> + <ant antfile="src/build.xml" inheritRefs="true"> + <target name="patch"/> + <property name="toConfiguration" value="default"/> + </ant> - <ant antfile="src/build.xml" inheritRefs="true"> - <target name="patch"/> - <property name="toConfiguration" value="production"/> - </ant> + <ant antfile="src/build.xml" inheritRefs="true"> + <target name="patch"/> + <property name="toConfiguration" value="production"/> + </ant> - <ant antfile="src/build.xml" inheritRefs="true"> - <target name="patch"/> - <property name="toConfiguration" value="all"/> - </ant> + <ant antfile="src/build.xml" inheritRefs="true"> + <target name="patch"/> + <property name="toConfiguration" value="all"/> + </ant> - </target> - </configuration> - </execution> - </executions> - </plugin> - + </target> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>epp-distribution-zip</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <build> + <plugins> <!-- Package to zip --> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>distro-assembly-zip</id> - <phase>compile</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <appendAssemblyId>false</appendAssemblyId> - <descriptors> - <descriptor>src/zip.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - - </plugins> - </build> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>distro-assembly-zip</id> + <phase>compile</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>src/zip.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> \ No newline at end of file Modified: epp/portal/branches/EPP_5_2_Branch/distribution/pack/serverAddon/gatein.ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/pack/serverAddon/gatein.ear/pom.xml 2011-06-23 21:24:54 UTC (rev 6728) +++ epp/portal/branches/EPP_5_2_Branch/distribution/pack/serverAddon/gatein.ear/pom.xml 2011-06-24 06:46:24 UTC (rev 6729) @@ -238,10 +238,10 @@ <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets-core</artifactId> </dependency> - <dependency> +<!-- <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>gatein.portal.component.wsrp</artifactId> - </dependency> + </dependency>--> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss.plugin</artifactId> @@ -354,7 +354,7 @@ </exclusions> </dependency> - <dependency> +<!-- <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.component.remote</artifactId> <exclusions> @@ -363,7 +363,7 @@ <groupId>org.exoplatform.tool</groupId> </exclusion> </exclusions> - </dependency> + </dependency>--> <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.container</artifactId> @@ -877,7 +877,7 @@ <groupId>org.gatein.wci</groupId> <artifactId>wci-exo</artifactId> </dependency> - <dependency> +<!-- <dependency> <groupId>org.gatein.wci</groupId> <artifactId>wci-tomcat</artifactId> <exclusions> @@ -890,7 +890,7 @@ <groupId>org.apache.tomcat</groupId> </exclusion> </exclusions> - </dependency> + </dependency>--> <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-bridge</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2011-06-23 21:24:54 UTC (rev 6728) +++ epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2011-06-24 06:46:24 UTC (rev 6729) @@ -15,7 +15,8 @@ <name>Distribution</name> <properties> - <eap.version>5.1.1.ER02</eap.version> + <eap.version>5.1.1.ER2</eap.version> + <eap.groupId>org.jboss.jbossas</eap.groupId> <eap.dir>jboss-eap-5.1</eap.dir> <epp.dir>jboss-epp-5.2</epp.dir>