Author: hfnukal Date: 2011-06-14 00:48:48 -0400 (Tue, 14 Jun 2011) New Revision: 6644 Modified: epp/portal/branches/EPP_5_1_Branch/distribution/pack/examples/pom.xml epp/portal/branches/EPP_5_1_Branch/distribution/pack/portletbridge/pom.xml epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/gatein.ear/pom.xml epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/integration.war/pom.xml epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/pom.xml epp/portal/branches/EPP_5_1_Branch/distribution/pom.xml epp/portal/branches/EPP_5_1_Branch/pom.xml epp/portal/branches/EPP_5_1_Branch/settings.xml Log: Integrate distribbution to build Modified: epp/portal/branches/EPP_5_1_Branch/distribution/pack/examples/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/pack/examples/pom.xml 2011-06-13 10:14:55 UTC (rev 6643) +++ epp/portal/branches/EPP_5_1_Branch/distribution/pack/examples/pom.xml 2011-06-14 04:48:48 UTC (rev 6644) @@ -6,6 +6,7 @@ <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> <version>5.1.1-epp-DEV02</version> + <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.exoplatform.portal.distribution</groupId> Modified: epp/portal/branches/EPP_5_1_Branch/distribution/pack/portletbridge/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/pack/portletbridge/pom.xml 2011-06-13 10:14:55 UTC (rev 6643) +++ epp/portal/branches/EPP_5_1_Branch/distribution/pack/portletbridge/pom.xml 2011-06-14 04:48:48 UTC (rev 6644) @@ -6,6 +6,7 @@ <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> <version>5.1.1-epp-DEV02</version> + <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.exoplatform.portal.distribution.root</groupId> Modified: epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/gatein.ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/gatein.ear/pom.xml 2011-06-13 10:14:55 UTC (rev 6643) +++ epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/gatein.ear/pom.xml 2011-06-14 04:48:48 UTC (rev 6644) @@ -6,6 +6,7 @@ <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> <version>5.1.1-epp-DEV02</version> + <relativePath>../../../pom.xml</relativePath> </parent> <artifactId>gatein</artifactId> <packaging>ear</packaging> Modified: epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/integration.war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/integration.war/pom.xml 2011-06-13 10:14:55 UTC (rev 6643) +++ epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/integration.war/pom.xml 2011-06-14 04:48:48 UTC (rev 6644) @@ -5,6 +5,7 @@ <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> <version>5.1.1-epp-DEV02</version> + <relativePath>../../../pom.xml</relativePath> </parent> <artifactId>integration</artifactId> <packaging>war</packaging> Modified: epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/pom.xml 2011-06-13 10:14:55 UTC (rev 6643) +++ epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/pom.xml 2011-06-14 04:48:48 UTC (rev 6644) @@ -6,6 +6,7 @@ <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> <version>5.1.1-epp-DEV02</version> + <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.exoplatform.portal.distribution.deploy</groupId> Modified: epp/portal/branches/EPP_5_1_Branch/distribution/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/pom.xml 2011-06-13 10:14:55 UTC (rev 6643) +++ epp/portal/branches/EPP_5_1_Branch/distribution/pom.xml 2011-06-14 04:48:48 UTC (rev 6644) @@ -32,8 +32,16 @@ </properties> - <modules> - <module>pack</module> - </modules> - + + <profiles> + <profile> + <id>epp-distribution</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <modules> + <module>pack</module> + </modules> + </profile> + </profiles> </project> \ No newline at end of file Modified: epp/portal/branches/EPP_5_1_Branch/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/pom.xml 2011-06-13 10:14:55 UTC (rev 6643) +++ epp/portal/branches/EPP_5_1_Branch/pom.xml 2011-06-14 04:48:48 UTC (rev 6644) @@ -83,6 +83,7 @@ <module>starter</module> <module>packaging</module> <module>testsuite</module> + <module>distribution</module> </modules> <dependencyManagement> Modified: epp/portal/branches/EPP_5_1_Branch/settings.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/settings.xml 2011-06-13 10:14:55 UTC (rev 6643) +++ epp/portal/branches/EPP_5_1_Branch/settings.xml 2011-06-14 04:48:48 UTC (rev 6644) @@ -1,7 +1,7 @@ <?xml version="1.0"?> <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd"> - <localRepository>${env.HOME}/.m2_EPP</localRepository> + <localRepository>${env.HOME}/.m2_EPPpack</localRepository> <mirrors> <mirror>