[pkg-java] r4976 - in trunk/jbossas4/debian: . patches
twerner at alioth.debian.org
twerner at alioth.debian.org
Sat Dec 8 21:17:52 UTC 2007
Author: twerner
Date: 2007-12-08 21:17:52 +0000 (Sat, 08 Dec 2007)
New Revision: 4976
Added:
trunk/jbossas4/debian/libjboss-management-java.install
trunk/jbossas4/debian/libjboss-runner-java.install
trunk/jbossas4/debian/patches/missing_ejb3.diff
Modified:
trunk/jbossas4/debian/ant.properties
trunk/jbossas4/debian/build.xml
trunk/jbossas4/debian/changelog
trunk/jbossas4/debian/control
trunk/jbossas4/debian/patches/series
Log:
* Add more packages thanks to Rafal Lewczuk.
* Fix Vcs header in debian/control.
Modified: trunk/jbossas4/debian/ant.properties
===================================================================
--- trunk/jbossas4/debian/ant.properties 2007-12-06 12:45:06 UTC (rev 4975)
+++ trunk/jbossas4/debian/ant.properties 2007-12-08 21:17:52 UTC (rev 4976)
@@ -50,6 +50,8 @@
jnpserver.jar=jnpserver.jar
jnpclient.jar=jnp-client.jar
remoting-int.jar=jboss-remoting-int.jar
+run.jar=jboss-run.jar
+shutdown.jar=jboss-shutdown.jar
security.jar=jbosssx.jar
server.jar=jboss.jar
system.jar=jboss-system.jar
Modified: trunk/jbossas4/debian/build.xml
===================================================================
--- trunk/jbossas4/debian/build.xml 2007-12-06 12:45:06 UTC (rev 4975)
+++ trunk/jbossas4/debian/build.xml 2007-12-08 21:17:52 UTC (rev 4976)
@@ -16,6 +16,7 @@
<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 dir="${management.dir}/${class.dir}" quiet="true"/>
<delete file="${test.jar}" quiet="true"/>
<delete file="${ejb3x.jar}" quiet="true"/>
<delete file="${jmx.jar}" quiet="true"/>
@@ -30,6 +31,9 @@
<delete file="${server.jar}" quiet="true"/>
<delete file="${messaging.jar}" quiet="true"/>
<delete file="${connector.jar}" quiet="true"/>
+ <delete file="${run.jar}" quiet="true"/>
+ <delete file="${shutdown.jar}" quiet="true"/>
+ <delete file="${management.jar}" quiet="true"/>
</target>
<target name="jar">
@@ -174,15 +178,17 @@
</fileset>
</jar>
+ <!-- FIXME: compile jboss.ejb stuff and unpatch modified files in jboss-management jar -->
<mkdir dir="${server.dir}/${class.dir}"/>
<javac srcdir="${server.dir}/${source.dir}" destdir="${server.dir}/${class.dir}"
- includes="**/invocation/**" debug="true">
+ includes="**/invocation/**,**/Shutdown.java,**/logging/**,**/naming/NamingService*.java"
+ debug="true">
<classpath>
<fileset dir=".">
<include name='*.jar'/>
</fileset>
</classpath>
- </javac>
+ </javac>
<jar jarfile="${server.jar}">
<fileset dir="${server.dir}/${class.dir}">
@@ -209,5 +215,59 @@
</fileset>
</jar>
+ <mkdir dir="${management.dir}/${class.dir}"/>
+ <javac srcdir="${management.dir}/${source.dir}" destdir="${management.dir}/${class.dir}"
+ includes="org/jboss/management/j2ee/**" excludes="**/cluster/**,**/factory/EJB*.java,**/factory/RAR*.java"
+ debug="true">
+ <classpath>
+ <fileset dir=".">
+ <include name='*.jar'/>
+ </fileset>
+ </classpath>
+ </javac>
+
+ <jar jarfile="${management.jar}"
+ manifest="${management.dir}/src/etc/default.mf">
+ <fileset dir="${management.dir}/${class.dir}">
+ <include name="org/jboss/management/j2ee/**"/>
+ </fileset>
+ </jar>
+
+ <jar jarfile="${run.jar}" manifest="${system.dir}/src/etc/run.mf">
+ <manifest>
+ <attribute name="Class-Path" value="/usr/share/java/gnu-getopt.jar"/>
+ </manifest>
+ <fileset dir="${system.dir}/${class.dir}">
+ <include name="org/jboss/Version*.class"/>
+ <include name="org/jboss/Main*.class"/>
+ <include name="org/jboss/system/JBossRMIClassLoader.class"/>
+ <include name="org/jboss/system/logging/*"/>
+ <include name="org/jboss/system/server/NoAnnotationURLClassLoader.class"/>
+ <include name="org/jboss/system/server/ServerLoader*.class"/>
+ <include name="org/jboss/system/server/Server.class"/>
+ <include name="org/jboss/system/server/ServerConfig.class"/>
+ <include name="org/jboss/system/server/ServerConfigUtil.class"/>
+ <include name="org/jboss/system/server/jmx/*"/>
+ <include name="org/jboss/system/ORBSingleton.class"/>
+ </fileset>
+ <fileset dir="${system.dir}/src/resources">
+ <include name="log4j*.properties"/>
+ <include name="jdklogger.properties"/>
+ <include name="org/jboss/version.properties"/>
+ </fileset>
+ <!-- getopt classes have been removed; we'll be using original getopt jar instead -->
+ </jar>
+
+ <jar jarfile="${shutdown.jar}" manifest="${server.dir}/src/etc/manifest/shutdown.mf">
+ <fileset dir="${server.dir}/${class.dir}">
+ <include name="org/jboss/Shutdown*.class"/>
+ </fileset>
+ <fileset dir="${server.dir}/src/resources">
+ <include name="log4j.properties"/>
+ <include name="jndi.properties"/>
+ </fileset>
+ <!-- getopt classes have been removed; we'll be using original getopt jar instead -->
+ </jar>
+
</target>
</project>
Modified: trunk/jbossas4/debian/changelog
===================================================================
--- trunk/jbossas4/debian/changelog 2007-12-06 12:45:06 UTC (rev 4975)
+++ trunk/jbossas4/debian/changelog 2007-12-08 21:17:52 UTC (rev 4976)
@@ -2,8 +2,10 @@
UNRELEASED
* Add README.Debian explaining the state of the package. (Closes: #451976)
+ * Add more packages thanks to Rafal Lewczuk.
+ * Fix Vcs header in debian/control.
- -- Torsten Werner <twerner at debian.org> Mon, 19 Nov 2007 16:53:36 +0100
+ -- Torsten Werner <twerner at debian.org> Sat, 08 Dec 2007 22:16:37 +0100
jbossas4 (4.2.2.GA-1) unstable; urgency=low
Modified: trunk/jbossas4/debian/control
===================================================================
--- trunk/jbossas4/debian/control 2007-12-06 12:45:06 UTC (rev 4975)
+++ trunk/jbossas4/debian/control 2007-12-08 21:17:52 UTC (rev 4976)
@@ -12,7 +12,7 @@
libjboss-serialization-java
Standards-Version: 3.7.2
Homepage: http://labs.jboss.com/jbossas/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jbossas4
+Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/jbossas4
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jbossas4
Package: libjboss-test-java
@@ -53,6 +53,21 @@
.
This package ships the jboss-system libraries.
+Package: libjboss-runner-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 contains jars used to run, shutdown or alter JBoss instance.
+
Package: libjboss-j2ee-java
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime
@@ -172,3 +187,18 @@
Java programming model.
.
This package ships the jboss-messaging libraries.
+
+Package: libjboss-management-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-management libraries.
Added: trunk/jbossas4/debian/libjboss-management-java.install
===================================================================
--- trunk/jbossas4/debian/libjboss-management-java.install (rev 0)
+++ trunk/jbossas4/debian/libjboss-management-java.install 2007-12-08 21:17:52 UTC (rev 4976)
@@ -0,0 +1 @@
+debian/tmp/usr/share/java/jboss-management*
Added: trunk/jbossas4/debian/libjboss-runner-java.install
===================================================================
--- trunk/jbossas4/debian/libjboss-runner-java.install (rev 0)
+++ trunk/jbossas4/debian/libjboss-runner-java.install 2007-12-08 21:17:52 UTC (rev 4976)
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/java/jboss-run*
+debian/tmp/usr/share/java/jboss-shutdown*
Added: trunk/jbossas4/debian/patches/missing_ejb3.diff
===================================================================
--- trunk/jbossas4/debian/patches/missing_ejb3.diff (rev 0)
+++ trunk/jbossas4/debian/patches/missing_ejb3.diff 2007-12-08 21:17:52 UTC (rev 4976)
@@ -0,0 +1,34 @@
+This patch should be removed as soon as we can build the ejb3 library.
+
+Index: jbossas4-4.2.2.GA/management/src/main/org/jboss/management/j2ee/factory/DefaultManagedObjectFactoryMap.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/management/src/main/org/jboss/management/j2ee/factory/DefaultManagedObjectFactoryMap.java 2007-12-01 11:35:17.000000000 +0100
++++ jbossas4-4.2.2.GA/management/src/main/org/jboss/management/j2ee/factory/DefaultManagedObjectFactoryMap.java 2007-12-01 11:35:49.000000000 +0100
+@@ -95,12 +95,12 @@
+
+ public void setEJBDeployer(ObjectName name)
+ {
+- factoryMap.put(name, new EJBModuleFactory());
++ //factoryMap.put(name, new EJBModuleFactory());
+ }
+
+ public void setRARDeployer(ObjectName name)
+ {
+- factoryMap.put(name, new RARModuleFactory());
++ //factoryMap.put(name, new RARModuleFactory());
+ }
+
+ public void setCMDeployer(ObjectName name)
+Index: jbossas4-4.2.2.GA/management/src/main/org/jboss/management/j2ee/factory/JCAResourceFactory.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/management/src/main/org/jboss/management/j2ee/factory/JCAResourceFactory.java 2007-12-01 11:35:59.000000000 +0100
++++ jbossas4-4.2.2.GA/management/src/main/org/jboss/management/j2ee/factory/JCAResourceFactory.java 2007-12-01 11:36:42.000000000 +0100
+@@ -88,7 +88,7 @@
+ ObjectName rarService = (ObjectName) mbeanServer.getAttribute(rarDeployService,
+ "OldRarDeployment");
+ // Get the ResourceAdapter JSR77 name
+- ObjectName jsr77RAName = RARModuleFactory.getResourceAdapterName(rarService);
++ ObjectName jsr77RAName = null; //RARModuleFactory.getResourceAdapterName(rarService);
+ // Now build the JCAResource
+ String resName = rarDeployService.getKeyProperty("name");
+ jsr77Name = JCAResource.create(mbeanServer, resName, jsr77RAName,
Modified: trunk/jbossas4/debian/patches/series
===================================================================
--- trunk/jbossas4/debian/patches/series 2007-12-06 12:45:06 UTC (rev 4975)
+++ trunk/jbossas4/debian/patches/series 2007-12-08 21:17:52 UTC (rev 4976)
@@ -1,3 +1,4 @@
+missing_ejb3.diff
SunConfigParser.diff
dom4j.diff
collection.diff
More information about the pkg-java-commits
mailing list