[pkg-java] r4609 - trunk/jbossas4/debian

[twerner at alioth.debian.org]

Author: twerner
Date: 2007-11-04 08:40:17 +0000 (Sun, 04 Nov 2007)
New Revision: 4609

Modified:
   trunk/jbossas4/debian/ant.properties
   trunk/jbossas4/debian/build.xml
   trunk/jbossas4/debian/libjboss-naming-java.install
Log:
rename some jars


Modified: trunk/jbossas4/debian/ant.properties
===================================================================
--- trunk/jbossas4/debian/ant.properties	2007-11-04 06:17:47 UTC (rev 4608)
+++ trunk/jbossas4/debian/ant.properties	2007-11-04 08:40:17 UTC (rev 4609)
@@ -47,7 +47,8 @@
 jmx.jar=jboss-jmx.jar
 management.jar=jboss-management.jar
 messaging.jar=jboss-messaging.jar
-naming.jar=jboss-naming.jar
+jnpserver.jar=jnpserver.jar
+jnpclient.jar=jnp-client.jar
 remoting-int.jar=jboss-remoting-int.jar
 security.jar=jboss-security.jar
 server.jar=jboss-server.jar

Modified: trunk/jbossas4/debian/build.xml
===================================================================
--- trunk/jbossas4/debian/build.xml	2007-11-04 06:17:47 UTC (rev 4608)
+++ trunk/jbossas4/debian/build.xml	2007-11-04 08:40:17 UTC (rev 4609)
@@ -45,9 +45,12 @@
     <javac srcdir="${jmx.dir}/${source.dir}" destdir="${jmx.dir}/${class.dir}"
 	   debug="true"/>
 
+    <!-- The upstream build.xml builds some more jars with partial
+         content only. Do we need to build them? -->
     <jar jarfile="${jmx.jar}">
       <fileset dir="${jmx.dir}/${class.dir}">
           <include name="**"/>
+	  <exclude name="test/**"/>
       </fileset>
     </jar>
 
@@ -55,6 +58,8 @@
     <javac srcdir="${system.dir}/${source.dir}" destdir="${system.dir}/${class.dir}"
 	   debug="true" classpath="jboss-jmx.jar"/>
 
+    <!-- The upstream build.xml builds some more jars with partial
+         content only. Do we need to build them? -->
     <jar jarfile="${system.jar}">
       <fileset dir="${system.dir}/${class.dir}">
           <include name="**"/>
@@ -65,6 +70,10 @@
     <javac srcdir="${j2ee.dir}/${source.dir}" destdir="${j2ee.dir}/${class.dir}"
 	   debug="true" source="1.5"/>
 
+    <!-- The upstream build.xml builds some more jars with partial
+         content only. Do we need to build them? Additionally it builds
+	 jboss-jaxrpc.jar and jboss-saaj.jar but their classes are not
+	 available in source form??? -->
     <jar jarfile="${j2ee.jar}">
       <fileset dir="${j2ee.dir}/${class.dir}">
           <include name="**"/>
@@ -85,11 +94,22 @@
     <javac srcdir="${naming.dir}/${source.dir}" destdir="${naming.dir}/${class.dir}"
 	   debug="true"/>
 
-    <jar jarfile="${naming.jar}">
+    <jar jarfile="${jnpserver.jar}">
       <fileset dir="${naming.dir}/${class.dir}">
-          <include name="**"/>
+        <!-- include server classes & interfaces -->
+        <include name="org/jboss/naming/**"/>
+        <include name="org/jnp/server/**"/>
+        <include name="org/jnp/interfaces/**"/>
       </fileset>
     </jar>
+    <jar jarfile="${jnpclient.jar}">
+      <fileset dir="${naming.dir}/${class.dir}">
+        <!-- include client classes & server stubs -->
+        <include name="org/jboss/naming/**"/>        
+        <include name="org/jnp/interfaces/**"/>
+        <include name="org/jnp/server/*Stub.class"/>
+      </fileset>
+    </jar>
 
   </target>
 

Modified: trunk/jbossas4/debian/libjboss-naming-java.install
===================================================================
--- trunk/jbossas4/debian/libjboss-naming-java.install	2007-11-04 06:17:47 UTC (rev 4608)
+++ trunk/jbossas4/debian/libjboss-naming-java.install	2007-11-04 08:40:17 UTC (rev 4609)
@@ -1 +1 @@
-debian/tmp/usr/share/java/jboss-naming*
+debian/tmp/usr/share/java/jnp*