[jboss-cvs] JBoss Messaging SVN: r7245 - in trunk: examples/common and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: ataylor
Date: 2009-06-08 06:55:04 -0400 (Mon, 08 Jun 2009)
New Revision: 7245

Modified:
   trunk/build-messaging.xml
   trunk/examples/common/build.xml
   trunk/examples/javaee/common/build.xml
Log:
rename netty jar

Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml	2009-06-08 10:53:37 UTC (rev 7244)
+++ trunk/build-messaging.xml	2009-06-08 10:55:04 UTC (rev 7245)
@@ -806,11 +806,9 @@
          </fileset>
          <fileset dir="${jboss.jnpserver.lib}">
             <include name="jnpserver.jar"/>
-         </fileset>         
-         <fileset dir="${netty.netty.lib}">
-            <include name="${netty.jar.name}"/>
-         </fileset>
+         </fileset> 
       </copy>
+      <copy file="${netty.netty.lib}/${netty.jar.name}" tofile="${build.distro.lib.dir}/netty.jar"/>
       <copy todir="${build.distro.client.dir}">
          <fileset dir="${build.jars.dir}">
             <include name="${core.client.jar.name}"/>
@@ -825,10 +823,6 @@
             <include name="logging.properties"/>
             <exclude name="common/version.properties" />
          </fileset>
-         <fileset dir="${test.dir}/config">
-            <include name="messaging.keystore"/>
-            <include name="messaging.truststore"/>
-         </fileset>
       </copy>
    	  <copy todir="${build.distro.native.dir}">
    	     <fileset dir="./native" includes="**/*" excludes="**/bin/**"/>
@@ -871,6 +865,7 @@
             <exclude name="**/logs/**"/>
             <exclude name="**/*.dat"/>
             <exclude name="**/*.svn"/>
+            <exclude name="**/*.iml"/>
             <exclude name="**/*.*~"/>
          </fileset>
       </copy>

Modified: trunk/examples/common/build.xml
===================================================================
--- trunk/examples/common/build.xml	2009-06-08 10:53:37 UTC (rev 7244)
+++ trunk/examples/common/build.xml	2009-06-08 10:55:04 UTC (rev 7245)
@@ -88,7 +88,7 @@
          <include  name="**/jbm-transports.jar"/>
       </fileset>
       <fileset dir="${jars.dir}">
-         <include name="**/netty-3.1.0.BETA3.jar"/>
+         <include name="**/netty*.jar"/>
       </fileset>
    </path>
 
@@ -99,7 +99,7 @@
       <pathelement location="${classes.dir}"/>
       <fileset dir="${jars.dir}">
          <include name="jboss/jnpserver/lib/jnpserver.jar"/>
-         <include name="netty/lib/netty-3.1.0.BETA3.jar"/>
+         <include name="netty/lib/netty*.jar"/>
       </fileset>
    </path>
 

Modified: trunk/examples/javaee/common/build.xml
===================================================================
--- trunk/examples/javaee/common/build.xml	2009-06-08 10:53:37 UTC (rev 7244)
+++ trunk/examples/javaee/common/build.xml	2009-06-08 10:55:04 UTC (rev 7245)
@@ -68,7 +68,7 @@
          <include name="**/*.jar"/>
       </fileset>
       <fileset dir="${jboss.home}/server/default-with-jbm2/lib">
-         <include name="netty-3.1.0.BETA3.jar"/>
+         <include name="netty*.jar"/>
       </fileset>
    </path>