[jbosscache-commits] JBoss Cache SVN: r4656 - in pojo/tags/2.1.0.BETA1: src/main/release and 1 other directory.

Author: jason.greene(a)jboss.com Date: 2007-10-20 15:58:41 -0400 (Sat, 20 Oct 2007) New Revision: 4656 Modified: pojo/tags/2.1.0.BETA1/assembly/all.xml pojo/tags/2.1.0.BETA1/assembly/bin.xml pojo/tags/2.1.0.BETA1/src/main/release/build.xml Log: merge release build fixes Modified: pojo/tags/2.1.0.BETA1/assembly/all.xml =================================================================== --- pojo/tags/2.1.0.BETA1/assembly/all.xml 2007-10-20 19:57:40 UTC (rev 4655) +++ pojo/tags/2.1.0.BETA1/assembly/all.xml 2007-10-20 19:58:41 UTC (rev 4656) @@ -48,6 +48,7 @@ <outputDirectory/> <includes> <include>*.txt</include> + <include>*.xml</include> </includes> </fileSet> @@ -68,7 +69,22 @@ <outputDirectory>lib</outputDirectory> <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping> <unpack>false</unpack> - <scope>runtime</scope> + <scope>test</scope> + <excludes> + <exclude>apache-xerces:xml-apis</exclude> + <exclude>apache-httpclient:commons-httpclient</exclude> + <exclude>apache-slide:webdavlib</exclude> + <exclude>org.jboss.cache:jbosscache-core:test-jar:tests</exclude> + </excludes> </dependencySet> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>${artifactId}-${classifier}.${extension}</outputFileNameMapping> + <unpack>false</unpack> + <scope>test</scope> + <includes> + <include>org.jboss.cache:jbosscache-core:test-jar:tests</include> + </includes> + </dependencySet> </dependencySets> </assembly> Modified: pojo/tags/2.1.0.BETA1/assembly/bin.xml =================================================================== --- pojo/tags/2.1.0.BETA1/assembly/bin.xml 2007-10-20 19:57:40 UTC (rev 4655) +++ pojo/tags/2.1.0.BETA1/assembly/bin.xml 2007-10-20 19:58:41 UTC (rev 4656) @@ -29,18 +29,32 @@ <outputDirectory/> <includes> <include>*.txt</include> + <include>*.xml</include> </includes> </fileSet> </fileSets> - <dependencySets> <dependencySet> <outputDirectory>lib</outputDirectory> <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping> <unpack>false</unpack> - <scope>runtime</scope> + <scope>test</scope> + <excludes> + <exclude>apache-xerces:xml-apis</exclude> + <exclude>apache-httpclient:commons-httpclient</exclude> + <exclude>org.jboss.cache:jbosscache-core:test-jar:tests</exclude> + <exclude>apache-slide:webdavlib</exclude> + </excludes> </dependencySet> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>${artifactId}-${classifier}.${extension}</outputFileNameMapping> + <unpack>false</unpack> + <scope>test</scope> + <includes> + <include>org.jboss.cache:jbosscache-core:test-jar:tests</include> + </includes> + </dependencySet> </dependencySets> - </assembly> Modified: pojo/tags/2.1.0.BETA1/src/main/release/build.xml =================================================================== --- pojo/tags/2.1.0.BETA1/src/main/release/build.xml 2007-10-20 19:57:40 UTC (rev 4655) +++ pojo/tags/2.1.0.BETA1/src/main/release/build.xml 2007-10-20 19:58:41 UTC (rev 4656) @@ -33,7 +33,7 @@ <path id="cache.classpath"> <fileset dir="${basedir}"> - <include name="jbosscache-core.jar"/> + <include name="jbosscache-pojo.jar"/> </fileset> </path> @@ -132,15 +132,20 @@ <classfileset dir="${build}" includes="**/*Test.class"/> <jvmarg value="${jvm.ipv4}"/> <jvmarg value="${jvm.localhost}"/> + <jvmarg value="-javaagent:lib/jboss-aop.jar"/> + <jvmarg value="-Djboss.aop.path=etc/META-INF/pojocache-aop.xml"/> </testng> </target> <target name="run.demo" depends="compile" description="Run JBoss Cache demo."> <java classname="org.jboss.cache.pojo.demo.PojoCacheView" fork="yes"> <jvmarg value="-Xmx128M"/> + <jvmarg value="-javaagent:lib/jboss-aop.jar"/> + <jvmarg value="-Djboss.aop.path=etc/META-INF/pojocache-aop.xml"/> <classpath refid="test.classpath"/> <jvmarg value="${jvm.ipv4}"/> <jvmarg value="${jvm.localhost}"/> + <arg value="-console"/> </java> </target>