Author: hfnukal Date: 2011-08-10 04:46:33 -0400 (Wed, 10 Aug 2011) New Revision: 7039 Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/assemble.xml Log: JBEPP-1004 Clustering not working with buddy replication enabled Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-08-10 07:03:33 UTC (rev 7038) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-08-10 08:46:33 UTC (rev 7039) @@ -293,6 +293,14 @@ <artifactId>commons-collections</artifactId> <groupId>commons-collections</groupId> </exclusion> + <exclusion> + <artifactId>infinispan-cachestore-jdbc</artifactId> + <groupId>org.infinispan</groupId> + </exclusion> + <exclusion> + <artifactId>infinispan-core</artifactId> + <groupId>org.infinispan</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -692,6 +700,14 @@ <artifactId>commons-collections</artifactId> <groupId>commons-collections</groupId> </exclusion> + <exclusion> + <artifactId>infinispan-core</artifactId> + <groupId>org.infinispan</groupId> + </exclusion> + <exclusion> + <artifactId>infinispan-cachestore-jdbc</artifactId> + <groupId>org.infinispan</groupId> + </exclusion> </exclusions> </dependency> <dependency> Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/assemble.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/assemble.xml 2011-08-10 07:03:33 UTC (rev 7038) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/assemble.xml 2011-08-10 08:46:33 UTC (rev 7039) @@ -15,49 +15,55 @@ <includes> <include>*.distribution.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> + <unpackOptions> + <excludes> + <exclude>**/hibernate-core*</exclude> + <exclude>**/jaxb-api*</exclude> + <exclude>**/stax-api*</exclude> + </excludes> + </unpackOptions> </dependencySet> <dependencySet> <includes> <include>*.distribution.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> + <unpackOptions> + <excludes> + <exclude>**/hibernate-core*</exclude> + <exclude>**/jaxb-api*</exclude> + <exclude>**/stax-api*</exclude> + + <!-- Exclude cluster --> + <exclude>**/hibernate-jbosscache2*</exclude> + <exclude>**/jbosscache-core*</exclude> + <exclude>**/jgroups*</exclude> + </excludes> + </unpackOptions> </dependencySet> <dependencySet> <includes> <include>*.distribution.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> + <unpackOptions> + <excludes> + <exclude>**/hibernate-core*</exclude> + <exclude>**/jaxb-api*</exclude> + <exclude>**/stax-api*</exclude> + + <!-- Exclude cluster --> + <exclude>**/hibernate-jbosscache2*</exclude> + <exclude>**/jbosscache-core*</exclude> + <exclude>**/jgroups*</exclude> + </excludes> + </unpackOptions> </dependencySet> <!-- END profiles -->