[pkg-java] r4661 - in trunk/jbossas4/debian: . patches

varun-guest at alioth.debian.org varun-guest at alioth.debian.org
Thu Nov 8 05:55:30 UTC 2007


Author: varun-guest
Date: 2007-11-08 05:55:30 +0000 (Thu, 08 Nov 2007)
New Revision: 4661

Added:
   trunk/jbossas4/debian/libjboss-messaging-java.install
   trunk/jbossas4/debian/patches/marshaller.diff
Modified:
   trunk/jbossas4/debian/build.xml
   trunk/jbossas4/debian/control
   trunk/jbossas4/debian/patches/series
   trunk/jbossas4/debian/rules
Log:
* Build *invocation* classes of server and use them to build jboss-messaging
* Add binary package for jboss-messaging


Modified: trunk/jbossas4/debian/build.xml
===================================================================
--- trunk/jbossas4/debian/build.xml	2007-11-08 04:16:54 UTC (rev 4660)
+++ trunk/jbossas4/debian/build.xml	2007-11-08 05:55:30 UTC (rev 4661)
@@ -13,6 +13,9 @@
     <delete dir="${deployment.dir}/${class.dir}" quiet="true"/>
     <delete dir="${transaction.dir}/${class.dir}" quiet="true"/>
     <delete dir="${security.dir}/${class.dir}" quiet="true"/>
+    <delete dir="${server.dir}/${class.dir}" quiet="true"/>
+    <delete dir="${messaging.dir}/${class.dir}" quiet="true"/>
+    <delete dir="${connector.dir}/${class.dir}" quiet="true"/>
     <delete file="${test.jar}" quiet="true"/>
     <delete file="${ejb3x.jar}" quiet="true"/>
     <delete file="${jmx.jar}" quiet="true"/>
@@ -24,6 +27,9 @@
     <delete file="${deployment.jar}" quiet="true"/>
     <delete file="${transaction.jar}" quiet="true"/>
     <delete file="${security.jar}" quiet="true"/>
+    <delete file="${server.jar}" quiet="true"/>
+    <delete file="${messaging.jar}" quiet="true"/>
+    <delete file="${connector.jar}" quiet="true"/>
   </target>
 
   <target name="jar">
@@ -165,5 +171,37 @@
       </fileset>
     </jar>
 
+    <mkdir dir="${server.dir}/${class.dir}"/>
+    <javac srcdir="${server.dir}/${source.dir}" destdir="${server.dir}/${class.dir}"
+	   includes="**/invocation/**" debug="true">
+      <classpath>
+	<fileset dir=".">
+	  <include name='*.jar'/>
+	</fileset>
+      </classpath>
+    </javac>
+
+    <jar jarfile="${server.jar}">
+      <fileset dir="${server.dir}/${class.dir}">
+          <include name="**"/>
+      </fileset>
+    </jar>
+
+    <mkdir dir="${messaging.dir}/${class.dir}"/>
+    <javac srcdir="${messaging.dir}/${source.dir}" destdir="${messaging.dir}/${class.dir}"
+	   debug="true" source="1.5">
+      <classpath>
+	<fileset dir=".">
+	  <include name='*.jar'/>
+	</fileset>
+      </classpath>
+    </javac>
+
+    <jar jarfile="${messaging.jar}">
+      <fileset dir="${messaging.dir}/${class.dir}">
+          <include name="**"/>
+      </fileset>
+    </jar>
+
   </target>
 </project>

Modified: trunk/jbossas4/debian/control
===================================================================
--- trunk/jbossas4/debian/control	2007-11-08 04:16:54 UTC (rev 4660)
+++ trunk/jbossas4/debian/control	2007-11-08 05:55:30 UTC (rev 4661)
@@ -141,3 +141,18 @@
  Java programming model.
  .
  This package ships the jboss-security libraries.
+
+Package: libjboss-messaging-java
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime
+Description: JBoss System
+ A J2EE certified platform for developing and deploying enterprise Java
+ applications, Web applications, and Portals, JBoss Application Server
+ provides the full range of J2EE 1.4 features as well as extended
+ enterprise services including clustering, caching, and persistence.
+ .
+ JBoss Application Server includes support for Enterprise Java Beans
+ (EJB) 3.0 which is designed to dramatically simplify the enterprise
+ Java programming model.
+ .
+ This package ships the jboss-messaging libraries.

Copied: trunk/jbossas4/debian/libjboss-messaging-java.install (from rev 4657, trunk/jbossas4/debian/libjboss-jmx-java.install)
===================================================================
--- trunk/jbossas4/debian/libjboss-messaging-java.install	                        (rev 0)
+++ trunk/jbossas4/debian/libjboss-messaging-java.install	2007-11-08 05:55:30 UTC (rev 4661)
@@ -0,0 +1 @@
+debian/tmp/usr/share/java/jboss-messaging*

Added: trunk/jbossas4/debian/patches/marshaller.diff
===================================================================
--- trunk/jbossas4/debian/patches/marshaller.diff	                        (rev 0)
+++ trunk/jbossas4/debian/patches/marshaller.diff	2007-11-08 05:55:30 UTC (rev 4661)
@@ -0,0 +1,80 @@
+Index: jbossas4-4.2.2.GA/server/src/main/org/jboss/invocation/unified/marshall/HTTPInvocationMarshaller.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/server/src/main/org/jboss/invocation/unified/marshall/HTTPInvocationMarshaller.java	2007-11-08 10:55:01.000000000 +0530
++++ jbossas4-4.2.2.GA/server/src/main/org/jboss/invocation/unified/marshall/HTTPInvocationMarshaller.java	2007-11-08 10:55:35.000000000 +0530
+@@ -103,7 +103,7 @@
+ 
+          }
+ 
+-         super.write(dataObject, output, version);
++         super.write(dataObject, output);
+ 
+       }
+       else  // assume this is going to be the response
+@@ -124,4 +124,4 @@
+       return new HTTPInvocationMarshaller();
+    }
+ 
+-}
+\ No newline at end of file
++}
+Index: jbossas4-4.2.2.GA/server/src/main/org/jboss/invocation/unified/marshall/HTTPInvocationUnMarshaller.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/server/src/main/org/jboss/invocation/unified/marshall/HTTPInvocationUnMarshaller.java	2007-11-08 10:55:44.000000000 +0530
++++ jbossas4-4.2.2.GA/server/src/main/org/jboss/invocation/unified/marshall/HTTPInvocationUnMarshaller.java	2007-11-08 10:55:52.000000000 +0530
+@@ -48,7 +48,7 @@
+ 
+    public Object read(InputStream inputStream, Map metadata, int version) throws IOException, ClassNotFoundException
+    {
+-      Object ret = super.read(inputStream, metadata, version);
++      Object ret = super.read(inputStream, metadata);
+ 
+       if(ret instanceof InvocationRequest)
+       {
+@@ -76,4 +76,4 @@
+       unmarshaller.setClassLoader(this.customClassLoader);
+       return unmarshaller;
+    }
+-}
+\ No newline at end of file
++}
+Index: jbossas4-4.2.2.GA/server/src/main/org/jboss/invocation/unified/marshall/InvocationMarshaller.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/server/src/main/org/jboss/invocation/unified/marshall/InvocationMarshaller.java	2007-11-08 10:56:22.000000000 +0530
++++ jbossas4-4.2.2.GA/server/src/main/org/jboss/invocation/unified/marshall/InvocationMarshaller.java	2007-11-08 10:56:32.000000000 +0530
+@@ -72,7 +72,7 @@
+    public void write(Object dataObject, OutputStream output, int version) throws IOException
+    {
+ 
+-       super.write(addDecoration(dataObject), output, version);
++       super.write(addDecoration(dataObject), output);
+    }
+ 
+     public Object addDecoration(Object dataObject) throws IOException {
+@@ -129,4 +129,4 @@
+       return new InvocationMarshaller();
+    }
+ 
+-}
+\ No newline at end of file
++}
+Index: jbossas4-4.2.2.GA/server/src/main/org/jboss/invocation/unified/marshall/InvocationUnMarshaller.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/server/src/main/org/jboss/invocation/unified/marshall/InvocationUnMarshaller.java	2007-11-08 10:56:46.000000000 +0530
++++ jbossas4-4.2.2.GA/server/src/main/org/jboss/invocation/unified/marshall/InvocationUnMarshaller.java	2007-11-08 10:56:55.000000000 +0530
+@@ -56,7 +56,7 @@
+    
+    public Object read(InputStream inputStream, Map metadata, int version) throws IOException, ClassNotFoundException
+    {
+-      Object ret = super.read(inputStream, metadata, version);
++      Object ret = super.read(inputStream, metadata);
+ 
+ 
+       return removeDecoration(ret);
+@@ -90,4 +90,4 @@
+         return obj;
+     }
+ 
+-}
+\ No newline at end of file
++}

Modified: trunk/jbossas4/debian/patches/series
===================================================================
--- trunk/jbossas4/debian/patches/series	2007-11-08 04:16:54 UTC (rev 4660)
+++ trunk/jbossas4/debian/patches/series	2007-11-08 05:55:30 UTC (rev 4661)
@@ -2,3 +2,4 @@
 dom4j.diff
 collection.diff
 concurrent.diff
+marshaller.diff

Modified: trunk/jbossas4/debian/rules
===================================================================
--- trunk/jbossas4/debian/rules	2007-11-08 04:16:54 UTC (rev 4660)
+++ trunk/jbossas4/debian/rules	2007-11-08 05:55:30 UTC (rev 4661)
@@ -9,7 +9,8 @@
 DEB_ANT_BUILDFILE	:= debian/build.xml
 DEB_JARS		:= jboss-common junit log4j-1.2 jboss-profiler ant-junit commons-httpclient \
 			   bcel	concurrent dom4j jboss-xml-binding servlet-api gnu-getopt glassfish-javaee \
-			   glassfish-activation glassfish-ejb-api jaxrpc javassist
+			   glassfish-activation glassfish-ejb-api jaxrpc javassist jboss-remoting \
+			   jboss-serialization jboss-microcontainer quartz
 
 clean::
 	$(RM) debian/build-javacc




More information about the pkg-java-commits mailing list