Author: hfnukal Date: 2011-06-08 05:09:21 -0400 (Wed, 08 Jun 2011) New Revision: 6611 Modified: epp/portal/branches/EPP-5-1-tmp/distribution/ear/pom.xml epp/portal/branches/EPP-5-1-tmp/distribution/pom.xml epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/pom.xml epp/portal/branches/EPP-5-1-tmp/distribution/src/assemble.xml epp/portal/branches/EPP-5-1-tmp/distribution/sso/ epp/portal/branches/EPP-5-1-tmp/distribution/sso/pom.xml Log: Tuning dependencies Modified: epp/portal/branches/EPP-5-1-tmp/distribution/ear/pom.xml =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/ear/pom.xml 2011-06-08 07:17:56 UTC (rev 6610) +++ epp/portal/branches/EPP-5-1-tmp/distribution/ear/pom.xml 2011-06-08 09:09:21 UTC (rev 6611) @@ -78,6 +78,10 @@ <artifactId>jaxws-api</artifactId> <groupId>javax.xml.ws</groupId> </exclusion> + <exclusion> + <artifactId>jbossxb</artifactId> + <groupId>org.jboss</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -637,6 +641,10 @@ <artifactId>stax-api</artifactId> <groupId>stax</groupId> </exclusion> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -839,6 +847,28 @@ </exclusions> </dependency> <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>1.8.1</version> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.1</version> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>org.gatein.wci</groupId> <artifactId>wci-wci</artifactId> </dependency> @@ -956,6 +986,8 @@ </exclusion> </exclusions> </dependency> + + <!-- wsrp libs --> <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-producer-lib</artifactId> @@ -1000,6 +1032,10 @@ <artifactId>jaxb-api</artifactId> <groupId>sun-jaxb</groupId> </exclusion> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>apache-xerces</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -1026,6 +1062,14 @@ <artifactId>jbossxb</artifactId> <groupId>org.jboss</groupId> </exclusion> + <exclusion> + <artifactId>slf4j-jdk14</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>slf4j-api</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -1057,20 +1101,7 @@ </exclusions> </dependency> - <!-- wsrp libs --> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-producer-lib</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-consumer</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-integration-api</artifactId> - </dependency> - + <!-- Chromattic --> <dependency> <groupId>org.chromattic</groupId> @@ -1285,6 +1316,20 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-jbosscache2</artifactId> <version>3.3.2.GA</version> + <exclusions> + <exclusion> + <artifactId>slf4j-api</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>jta</artifactId> + <groupId>javax.transaction</groupId> + </exclusion> + <exclusion> + <artifactId>hibernate-core</artifactId> + <groupId>org.hibernate</groupId> + </exclusion> + </exclusions> </dependency> <!-- needed so that GTN can be run on the IBM jdk, to be removed when the IBM jdk no longer needs this hack --> <dependency> @@ -1304,7 +1349,42 @@ <groupId>org.jboss.cache</groupId> <artifactId>jbosscache-core</artifactId> <version>3.2.7.GA</version> + <exclusions> + <exclusion> + <artifactId>jboss-transaction-api</artifactId> + <groupId>org.jboss.javaee</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-common-core</artifactId> + <groupId>org.jboss</groupId> + </exclusion> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + </exclusions> </dependency> + + <dependency> + <artifactId>slf4j-jdk14</artifactId> + <groupId>org.slf4j</groupId> + <type>jar</type> + <version>1.5.6</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <artifactId>slf4j-api</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <artifactId>asm</artifactId> + <groupId>asm</groupId> + <type>jar</type> + <version>1.5.3</version> + </dependency> </dependencies> <build> Modified: epp/portal/branches/EPP-5-1-tmp/distribution/pom.xml =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/pom.xml 2011-06-08 07:17:56 UTC (rev 6610) +++ epp/portal/branches/EPP-5-1-tmp/distribution/pom.xml 2011-06-08 09:09:21 UTC (rev 6611) @@ -18,11 +18,16 @@ <eap.version>5.1.0</eap.version> <eap.dir>jboss-eap-5.1</eap.dir> <epp.dir>jboss-epp-5.1.1</epp.dir> + + <sso.version>1.0.2-epp-DEV01</sso.version> </properties> <modules> - <module>integration.war</module> - <module>ear</module> +<!-- <module>integration.war</module> + <module>ear</module>--> + <module>serverAddon</module> + <module>portletbridge</module> +<!-- <module>sso</module>--> </modules> <!-- NOTE: These dependency declarations are only required to sort this project to the @@ -45,18 +50,21 @@ <type>ear</type> </dependency> - <dependency> +<!-- <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet.web</artifactId> <version>5.1.1-epp-CR01-SNAPSHOT</version> <type>war</type> </dependency> +--> +<!-- <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet.dashboard</artifactId> <version>5.1.1-epp-CR01-SNAPSHOT</version> <type>war</type> </dependency> +--> <dependency> <groupId>org.exoplatform.portal.distribution</groupId> <artifactId>portletbridge</artifactId> @@ -64,7 +72,20 @@ <classifier>bin</classifier> <type>zip</type> </dependency> - + <dependency> + <groupId>org.gatein.sso</groupId> + <artifactId>sso-packaging</artifactId> + <version>${sso.version}</version> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal.deploy</groupId> + <artifactId>serverAddon</artifactId> + <version>${project.version}</version> + <classifier>bin</classifier> + <type>zip</type> + </dependency> + <!-- EAP overlay --> <dependency> <groupId>org.jboss</groupId> @@ -131,7 +152,8 @@ </execution> </executions> </plugin> -<!-- <plugin> + + <plugin> <artifactId>maven-antrun-plugin</artifactId> <version>1.6</version> <executions> @@ -143,12 +165,52 @@ </goals> <configuration> <target> - <move file="${project.build.directory}/${project.build.finalName}-bin/${eap.dir}" toFile="${project.build.directory}/${project.build.finalName}-bin/${epp.dir}"/> + <property name="epp.path">${project.build.directory}/${project.build.finalName}-bin/${epp.dir}</property> + <property name="eap.path">${project.build.directory}/${project.build.finalName}-bin/${eap.dir}</property> + + <move file="${eap.path}" toFile="${epp.path}"/> + <move file="${epp.path}/gatein-sso-${sso.version}" toFile="${epp.path}/gatein-sso"/> + + <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="all"/> + </ant> + </target> </configuration> </execution> </executions> + </plugin> + + +<!-- <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>distro-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/zip.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> </plugin>--> + </plugins> </build> </project> \ No newline at end of file Modified: epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/pom.xml =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/pom.xml 2011-06-08 07:17:56 UTC (rev 6610) +++ epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/pom.xml 2011-06-08 09:09:21 UTC (rev 6611) @@ -13,7 +13,7 @@ </parent>--> <artifactId>serverAddon</artifactId> <packaging>pom</packaging> - <name>Distribution portletbridge</name> + <name>Deploy serverAddon</name> <groupId>org.exoplatform.portal.deploy</groupId> <version>5.1.1-epp-CR01-SNAPSHOT</version> Modified: epp/portal/branches/EPP-5-1-tmp/distribution/src/assemble.xml =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/src/assemble.xml 2011-06-08 07:17:56 UTC (rev 6610) +++ epp/portal/branches/EPP-5-1-tmp/distribution/src/assemble.xml 2011-06-08 09:09:21 UTC (rev 6611) @@ -48,24 +48,56 @@ </dependencySet>--> <!-- Resources - gateinds.xml, gatein-sample-portal-ds.xml --> + <!-- +removeEverywhere = ["hibernate-core-3.3.2.GA.jar", "jaxb-api-2.1.jar","stax-api-1.0.jar"] +removeFromCluster = ["hibernate-jbosscache2-3.3.2.GA.jar", "jbosscache-core-3.2.6.GA.jar", "jgroups-2.6.13.GA.jar"] + + --> <dependencySet> <includes> <include>*.deploy:*:zip</include> </includes> + <excludes> + <exclude>*:hibernate-core:3.3.2.GA:jar</exclude> + <exclude>*:jaxb-api:2.1:jar</exclude> + <exclude>*:stax-api:1.0:jar</exclude> + </excludes> <outputDirectory>${eap.dir}/jboss-as/server/default</outputDirectory> <unpack>true</unpack> </dependencySet> + <dependencySet> <includes> <include>*.deploy:*:zip</include> </includes> + <excludes> + <exclude>*:hibernate-core:3.3.2.GA:jar</exclude> + <exclude>*:jaxb-api:2.1:jar</exclude> + <exclude>*:stax-api:1.0:jar</exclude> + + <!-- Exclude cluster --> + <exclude>*:hibernate-jbosscache2:3.3.2.GA:jar</exclude> + <exclude>*:jbosscache-core:3.2.6.GA:jar</exclude> + <exclude>*:jgroups:2.6.13.GA:jar</exclude> + </excludes> <outputDirectory>${eap.dir}/jboss-as/server/all</outputDirectory> <unpack>true</unpack> </dependencySet> + <dependencySet> <includes> <include>*.deploy:*:zip</include> </includes> + <excludes> + <exclude>*:hibernate-core:3.3.2.GA:jar</exclude> + <exclude>*:jaxb-api:2.1:jar</exclude> + <exclude>*:stax-api:1.0:jar</exclude> + + <!-- Exclude cluster --> + <exclude>*:hibernate-jbosscache2:3.3.2.GA:jar</exclude> + <exclude>*:jbosscache-core:3.2.6.GA:jar</exclude> + <exclude>*:jgroups:2.6.13.GA:jar</exclude> + </excludes> <outputDirectory>${eap.dir}/jboss-as/server/production</outputDirectory> <unpack>true</unpack> </dependencySet> Property changes on: epp/portal/branches/EPP-5-1-tmp/distribution/sso ___________________________________________________________________ Added: svn:ignore + target Modified: epp/portal/branches/EPP-5-1-tmp/distribution/sso/pom.xml =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/sso/pom.xml 2011-06-08 07:17:56 UTC (rev 6610) +++ epp/portal/branches/EPP-5-1-tmp/distribution/sso/pom.xml 2011-06-08 09:09:21 UTC (rev 6611) @@ -13,14 +13,14 @@ </parent>--> <artifactId>sso</artifactId> <packaging>pom</packaging> - <name>Distribution portletbridge</name> + <name>Distribution sso</name> <groupId>org.exoplatform.portal.distribution</groupId> <version>5.1.1-epp-CR01-SNAPSHOT</version> <dependencies> <dependency> - <groupId>org.jboss.portletbridge</groupId> + <groupId>org.gatein.sso</groupId> <artifactId>sso-packaging</artifactId> <version>1.0.2-epp-DEV01</version> <type>zip</type> @@ -71,7 +71,7 @@ <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> - <id>distro-portalbridge-assembly</id> + <id>bin</id> <phase>package</phase> <goals> <goal>single</goal>