[pkg-java] r5703 - in trunk/jbossas4/debian: . patches
varun at alioth.debian.org
varun at alioth.debian.org
Fri Feb 15 06:24:22 UTC 2008
Author: varun
Date: 2008-02-15 06:24:22 +0000 (Fri, 15 Feb 2008)
New Revision: 5703
Added:
trunk/jbossas4/debian/libjboss-aspects-java.install
trunk/jbossas4/debian/libjboss-cluster-java.install
trunk/jbossas4/debian/libjboss-connector-java.install
trunk/jbossas4/debian/libjboss-ejb3-java.install
trunk/jbossas4/debian/libjboss-jms-java.install
trunk/jbossas4/debian/libjboss-webservices-java.install
trunk/jbossas4/debian/patches/DummyServiceRef.diff
trunk/jbossas4/debian/patches/catch_exception.diff
trunk/jbossas4/debian/patches/cluster_debugger.diff
trunk/jbossas4/debian/patches/deployers.diff
trunk/jbossas4/debian/patches/webservice.diff
Modified:
trunk/jbossas4/debian/ant.properties
trunk/jbossas4/debian/build.xml
trunk/jbossas4/debian/changelog
trunk/jbossas4/debian/control
trunk/jbossas4/debian/patches/concurrent.diff
trunk/jbossas4/debian/patches/series
trunk/jbossas4/debian/rules
Log:
* Add some more packages: ejb3, cluster, aspects, connector, jms and
webservices
Modified: trunk/jbossas4/debian/ant.properties
===================================================================
--- trunk/jbossas4/debian/ant.properties 2008-02-14 20:29:05 UTC (rev 5702)
+++ trunk/jbossas4/debian/ant.properties 2008-02-15 06:24:22 UTC (rev 5703)
@@ -19,7 +19,7 @@
management.dir=management
messaging.dir=messaging
naming.dir=naming
-remoting-int.dir=remoting-int
+remoting.dir=remoting-int
security.dir=security
server.dir=server
system.dir=system
@@ -49,7 +49,7 @@
messaging.jar=jboss-messaging.jar
jnpserver.jar=jnpserver.jar
jnpclient.jar=jnp-client.jar
-remoting-int.jar=jboss-remoting-int.jar
+remoting.jar=jboss-remoting.jar
run.jar=jboss-run.jar
shutdown.jar=jboss-shutdown.jar
security.jar=jbosssx.jar
Modified: trunk/jbossas4/debian/build.xml
===================================================================
--- trunk/jbossas4/debian/build.xml 2008-02-14 20:29:05 UTC (rev 5702)
+++ trunk/jbossas4/debian/build.xml 2008-02-15 06:24:22 UTC (rev 5703)
@@ -5,8 +5,11 @@
<target name="clean">
<delete dir="${test.dir}/${class.dir}" quiet="true"/>
<delete dir="${jmx.dir}/${class.dir}" quiet="true"/>
+ <delete dir="${jms.dir}/${class.dir}" quiet="true"/>
<delete dir="${j2ee.dir}/${class.dir}" quiet="true"/>
+ <delete dir="${cluster.dir}/${class.dir}" quiet="true"/>
<delete dir="${system.dir}/${class.dir}" quiet="true"/>
+ <delete dir="${ejb3.dir}/${class.dir}" quiet="true"/>
<delete dir="${ejb3x.dir}/${class.dir}" quiet="true"/>
<delete dir="${jaxrpc.dir}/${class.dir}" quiet="true"/>
<delete dir="${naming.dir}/${class.dir}" quiet="true"/>
@@ -17,9 +20,17 @@
<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 dir="${remoting.dir}/${class.dir}" quiet="true"/>
+ <delete dir="${connector.dir}/${class.dir}" quiet="true"/>
+ <delete dir="${aspects.dir}/${class.dir}" quiet="true"/>
+ <delete dir="${iiop.dir}/${class.dir}" quiet="true"/>
+ <delete dir="${varia.dir}/${class.dir}" quiet="true"/>
+ <delete dir="${webservices.dir}/${class.dir}" quiet="true"/>
<delete file="${test.jar}" quiet="true"/>
+ <delete file="${ejb3.jar}" quiet="true"/>
<delete file="${ejb3x.jar}" quiet="true"/>
<delete file="${jmx.jar}" quiet="true"/>
+ <delete file="${jms.jar}" quiet="true"/>
<delete file="${system.jar}" quiet="true"/>
<delete file="${j2ee.jar}" quiet="true"/>
<delete file="${jaxrpc.jar}" quiet="true"/>
@@ -34,6 +45,13 @@
<delete file="${run.jar}" quiet="true"/>
<delete file="${shutdown.jar}" quiet="true"/>
<delete file="${management.jar}" quiet="true"/>
+ <delete file="${remoting.jar}" quiet="true"/>
+ <delete file="${varia.jar}" quiet="true"/>
+ <delete file="${connector.jar}" quiet="true"/>
+ <delete file="${aspects.jar}" quiet="true"/>
+ <delete file="${iiop.jar}" quiet="true"/>
+ <delete file="${cluster.jar}" quiet="true"/>
+ <delete file="${webservices.jar}" quiet="true"/>
</target>
<target name="jar">
@@ -178,11 +196,12 @@
</fileset>
</jar>
- <!-- FIXME: compile jboss.ejb stuff and unpatch modified files in jboss-management 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/**,**/Shutdown.java,**/logging/**,**/naming/NamingService*.java"
- debug="true">
+ includes="**/invocation/**,**/Shutdown.java,**/logging/**,**/naming/NamingService*.java,**/jms/**,**/jmx/**,**/metadata/**,**/proxy/**,**/deployment/**"
+ debug="true" target="1.5" source="1.5">
<classpath>
<fileset dir=".">
<include name='*.jar'/>
@@ -233,6 +252,120 @@
</fileset>
</jar>
+ <mkdir dir="${remoting.dir}/${class.dir}"/>
+ <javac srcdir="${remoting.dir}/${source.dir}" destdir="${remoting.dir}/${class.dir}"
+ debug="true">
+ <classpath>
+ <fileset dir=".">
+ <include name='*.jar'/>
+ </fileset>
+ </classpath>
+ </javac>
+
+ <jar jarfile="${remoting.jar}">
+ <fileset dir="${remoting.dir}/${class.dir}">
+ <include name="**"/>
+ </fileset>
+ </jar>
+
+ <mkdir dir="${jms.dir}/${class.dir}"/>
+ <javac srcdir="${jms.dir}/${source.dir}" destdir="${jms.dir}/${class.dir}"
+ debug="true">
+ <classpath>
+ <fileset dir=".">
+ <include name='*.jar'/>
+ </fileset>
+ </classpath>
+ </javac>
+
+ <jar jarfile="${jms.jar}">
+ <fileset dir="${jms.dir}/${class.dir}">
+ <include name="**"/>
+ </fileset>
+ </jar>
+
+ <mkdir dir="${connector.dir}/${class.dir}"/>
+ <javac srcdir="${connector.dir}/${source.dir}" destdir="${connector.dir}/${class.dir}"
+ debug="true">
+ <classpath>
+ <fileset dir=".">
+ <include name='*.jar'/>
+ </fileset>
+ </classpath>
+ </javac>
+
+ <jar jarfile="${connector.jar}">
+ <fileset dir="${connector.dir}/${class.dir}">
+ <include name="**"/>
+ </fileset>
+ </jar>
+
+ <mkdir dir="${cluster.dir}/${class.dir}"/>
+ <javac srcdir="${cluster.dir}/${source.dir}" destdir="${cluster.dir}/${class.dir}"
+ includes="**/framework/**" debug="true" source="1.5">
+ <classpath>
+ <fileset dir=".">
+ <include name='*.jar'/>
+ </fileset>
+ </classpath>
+ </javac>
+
+ <jar jarfile="${cluster.jar}">
+ <fileset dir="${cluster.dir}/${class.dir}">
+ <include name="**"/>
+ </fileset>
+ </jar>
+
+
+ <mkdir dir="${aspects.dir}/${class.dir}"/>
+ <javac srcdir="${aspects.dir}/${source.dir}" destdir="${aspects.dir}/${class.dir}"
+ excludes="**/deployment/**" debug="true" source="1.5">
+ <classpath>
+ <fileset dir=".">
+ <include name='*.jar'/>
+ </fileset>
+ </classpath>
+ </javac>
+
+ <jar jarfile="${aspects.jar}">
+ <fileset dir="${aspects.dir}/${class.dir}">
+ <include name="**"/>
+ </fileset>
+ </jar>
+
+ <mkdir dir="${ejb3.dir}/${class.dir}"/>
+ <javac srcdir="${ejb3.dir}/${source.dir}" destdir="${ejb3.dir}/${class.dir}"
+ excludes="**/deployers/**,**/embedded/**,**/iiop/**,**/naming/**,**/clientmodule/**,**/webservice/**"
+ debug="true" source="1.5">
+ <classpath>
+ <fileset dir=".">
+ <include name='*.jar'/>
+ </fileset>
+ </classpath>
+ </javac>
+
+ <jar jarfile="${ejb3.jar}">
+ <fileset dir="${ejb3.dir}/${class.dir}">
+ <include name="**"/>
+ </fileset>
+ </jar>
+
+ <mkdir dir="${webservices.dir}/${class.dir}"/>
+ <javac srcdir="${webservices.dir}/${source.dir}" destdir="${webservices.dir}/${class.dir}"
+ debug="true" source="1.5">
+ <classpath>
+ <fileset dir=".">
+ <include name='*.jar'/>
+ </fileset>
+ </classpath>
+ </javac>
+
+ <jar jarfile="${webservices.jar}">
+ <fileset dir="${webservices.dir}/${class.dir}">
+ <include name="**"/>
+ </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"/>
Modified: trunk/jbossas4/debian/changelog
===================================================================
--- trunk/jbossas4/debian/changelog 2008-02-14 20:29:05 UTC (rev 5702)
+++ trunk/jbossas4/debian/changelog 2008-02-15 06:24:22 UTC (rev 5703)
@@ -1,3 +1,10 @@
+jbossas4 (4.2.2.GA-3) UNRELEASED; urgency=low
+
+ * Add some more packages: ejb3, cluster, aspects, connector, jms and
+ webservices
+
+ -- Varun Hiremath <varun at debian.org> Fri, 15 Feb 2008 12:09:52 +0530
+
jbossas4 (4.2.2.GA-2) unstable; urgency=low
[ Torsten Werner ]
Modified: trunk/jbossas4/debian/control
===================================================================
--- trunk/jbossas4/debian/control 2008-02-14 20:29:05 UTC (rev 5702)
+++ trunk/jbossas4/debian/control 2008-02-15 06:24:22 UTC (rev 5703)
@@ -4,12 +4,16 @@
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>
Build-Depends: cdbs, debhelper (>= 5), quilt
-Build-Depends-Indep: ant, java-gcj-compat-dev, javacc, junit, libgetopt-java,
- libbcel-java, libdom4j-java, libjboss-common-java, libjboss-profiler-java,
- libjboss-xml-binding-java, liblog4j1.2-java, libservlet2.4-java,
- glassfish-javaee, libconcurrent-java, libcommons-httpclient-java,
- libaxis-java, ant-optional, libjavassist-java, libjboss-remoting-java,
- libjboss-serialization-java
+Build-Depends-Indep: ant, java-gcj-compat-dev, javacc, junit,
+ libgetopt-java, libbcel-java, libdom4j-java, libjboss-common-java,
+ libjboss-profiler-java, libjboss-xml-binding-java, liblog4j1.2-java,
+ libservlet2.4-java, glassfish-javaee, libconcurrent-java,
+ libcommons-httpclient-java, libaxis-java, ant-optional, bsh,
+ libjavassist-java, libjboss-remoting-java, libjboss-aop-java,
+ libjboss-serialization-java, libtrove-java, libjgroups-java,
+ libjboss-web-services-java, libjboss-cache1-java, libhibernate3-java,
+ libhibernate-entitymanager-java, libhibernate-annotations-java,
+ libcommons-logging-java, libjboss-vfs-java
Standards-Version: 3.7.3
Homepage: http://labs.jboss.com/jbossas/
Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/jbossas4
@@ -83,6 +87,21 @@
.
This package ships the jboss-j2ee libraries.
+Package: libjboss-ejb3-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-ecj3 libraries.
+
Package: libjboss-ejb3x-java
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime
@@ -202,3 +221,78 @@
Java programming model.
.
This package ships the jboss-management libraries.
+
+Package: libjboss-cluster-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-cluster libraries.
+
+Package: libjboss-aspects-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-aspects libraries.
+
+Package: libjboss-connector-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-connector libraries.
+
+Package: libjboss-jms-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-jms libraries.
+
+Package: libjboss-webservices-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-webservices libraries.
Added: trunk/jbossas4/debian/libjboss-aspects-java.install
===================================================================
--- trunk/jbossas4/debian/libjboss-aspects-java.install (rev 0)
+++ trunk/jbossas4/debian/libjboss-aspects-java.install 2008-02-15 06:24:22 UTC (rev 5703)
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/java/jboss-aspects*
+
Added: trunk/jbossas4/debian/libjboss-cluster-java.install
===================================================================
--- trunk/jbossas4/debian/libjboss-cluster-java.install (rev 0)
+++ trunk/jbossas4/debian/libjboss-cluster-java.install 2008-02-15 06:24:22 UTC (rev 5703)
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/java/jboss-cluster*
+
Added: trunk/jbossas4/debian/libjboss-connector-java.install
===================================================================
--- trunk/jbossas4/debian/libjboss-connector-java.install (rev 0)
+++ trunk/jbossas4/debian/libjboss-connector-java.install 2008-02-15 06:24:22 UTC (rev 5703)
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/java/jboss-connector*
+
Added: trunk/jbossas4/debian/libjboss-ejb3-java.install
===================================================================
--- trunk/jbossas4/debian/libjboss-ejb3-java.install (rev 0)
+++ trunk/jbossas4/debian/libjboss-ejb3-java.install 2008-02-15 06:24:22 UTC (rev 5703)
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/java/jboss-ejb3.jar
+debian/tmp/usr/share/java/jboss-ejb3-[0-9]*
Added: trunk/jbossas4/debian/libjboss-jms-java.install
===================================================================
--- trunk/jbossas4/debian/libjboss-jms-java.install (rev 0)
+++ trunk/jbossas4/debian/libjboss-jms-java.install 2008-02-15 06:24:22 UTC (rev 5703)
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/java/jboss-jms*
+
Added: trunk/jbossas4/debian/libjboss-webservices-java.install
===================================================================
--- trunk/jbossas4/debian/libjboss-webservices-java.install (rev 0)
+++ trunk/jbossas4/debian/libjboss-webservices-java.install 2008-02-15 06:24:22 UTC (rev 5703)
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/java/jboss-webservices*
+
Added: trunk/jbossas4/debian/patches/DummyServiceRef.diff
===================================================================
--- trunk/jbossas4/debian/patches/DummyServiceRef.diff (rev 0)
+++ trunk/jbossas4/debian/patches/DummyServiceRef.diff 2008-02-15 06:24:22 UTC (rev 5703)
@@ -0,0 +1,26 @@
+Index: jbossas4-4.2.2.GA/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java 2008-02-14 15:56:43.000000000 +0530
++++ jbossas4-4.2.2.GA/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java 2008-02-14 16:05:30.000000000 +0530
+@@ -42,6 +42,9 @@
+ import org.w3c.dom.Element;
+ import org.xml.sax.Attributes;
+
++import java.util.List;
++import java.util.ArrayList;
++
+ /**
+ * Factory for ServiceRefHandler
+ *
+@@ -149,5 +152,11 @@
+ public void merge(ServiceRefMetaData serviceRef)
+ {
+ }
++
++ @Override
++ public List<String[]> getInjectionTargets()
++ {
++ return new ArrayList<String[]>();
++ }
+ }
+ }
Added: trunk/jbossas4/debian/patches/catch_exception.diff
===================================================================
--- trunk/jbossas4/debian/patches/catch_exception.diff (rev 0)
+++ trunk/jbossas4/debian/patches/catch_exception.diff 2008-02-15 06:24:22 UTC (rev 5703)
@@ -0,0 +1,15 @@
+Index: jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/dbc/condition/Condition.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aspects/dbc/condition/Condition.java 2008-02-14 18:07:42.000000000 +0530
++++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aspects/dbc/condition/Condition.java 2008-02-14 18:10:28.000000000 +0530
+@@ -44,7 +44,9 @@
+ static
+ {
+ //Make sure that the beanshell can access private fields and variables
+- Capabilities.setAccessibility(true);
++ try{
++ Capabilities.setAccessibility(true);
++ }catch (Exception e){}
+ }
+
+ //Map of valid java identifiers to the original $tgt, $ret, $0, $1, $2 etc.
Added: trunk/jbossas4/debian/patches/cluster_debugger.diff
===================================================================
--- trunk/jbossas4/debian/patches/cluster_debugger.diff (rev 0)
+++ trunk/jbossas4/debian/patches/cluster_debugger.diff 2008-02-15 06:24:22 UTC (rev 5703)
@@ -0,0 +1,82 @@
+Index: jbossas4-4.2.2.GA/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java 2008-02-14 16:38:07.000000000 +0530
++++ jbossas4-4.2.2.GA/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java 2008-02-14 16:39:42.000000000 +0530
+@@ -46,7 +46,6 @@
+ import org.jgroups.Channel;
+ import org.jgroups.JChannel;
+ import org.jgroups.Version;
+-import org.jgroups.debug.Debugger;
+ import org.jgroups.jmx.JChannelFactoryMBean;
+ import org.jgroups.jmx.JmxConfigurator;
+ import org.w3c.dom.Attr;
+@@ -97,7 +96,6 @@
+ protected JChannelFactoryMBean multiplexer = null;
+ protected String stackName = null;
+ protected org.jgroups.JChannel channel;
+- protected Debugger debugger=null;
+ protected boolean use_debugger=false;
+
+ protected String nodeName = null;
+@@ -341,11 +339,6 @@
+ registerChannelInJmx();
+ }
+
+- if(use_debugger && debugger == null)
+- {
+- debugger=new Debugger(channel);
+- debugger.start();
+- }
+ channel.setOpt(Channel.AUTO_RECONNECT, Boolean.TRUE);
+ channel.setOpt(Channel.AUTO_GETSTATE, Boolean.TRUE);
+
+@@ -411,7 +404,6 @@
+
+ protected void stopService() throws Exception
+ {
+- stopChannelDebugger();
+ log.debug("Stopping ClusterPartition: " + partitionName);
+ partition.closePartition();
+ log.debug("Stopped ClusterPartition: " + partitionName);
+@@ -520,29 +512,6 @@
+ return buff.toString();
+ }
+
+- public void startChannelDebugger()
+- {
+- startChannelDebugger(false);
+- }
+-
+- public void startChannelDebugger(boolean accumulative)
+- {
+- if(debugger == null)
+- {
+- debugger=new Debugger(this.channel, accumulative);
+- debugger.start();
+- }
+- }
+-
+- public void stopChannelDebugger()
+- {
+- if(debugger != null)
+- {
+- // debugger.stop(); // uncomment when new JGroups version is available
+- debugger=null;
+- }
+- }
+-
+ protected void registerChannelInJmx()
+ {
+ if (server != null)
+Index: jbossas4-4.2.2.GA/cluster/src/main/org/jboss/ha/framework/server/ClusterPartitionMBean.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/cluster/src/main/org/jboss/ha/framework/server/ClusterPartitionMBean.java 2008-02-14 17:10:56.000000000 +0530
++++ jbossas4-4.2.2.GA/cluster/src/main/org/jboss/ha/framework/server/ClusterPartitionMBean.java 2008-02-14 17:11:02.000000000 +0530
+@@ -207,7 +207,4 @@
+
+ String showHistoryAsXML ();
+
+- void startChannelDebugger();
+- void startChannelDebugger(boolean accumulative);
+- void stopChannelDebugger();
+ }
Modified: trunk/jbossas4/debian/patches/concurrent.diff
===================================================================
--- trunk/jbossas4/debian/patches/concurrent.diff 2008-02-14 20:29:05 UTC (rev 5702)
+++ trunk/jbossas4/debian/patches/concurrent.diff 2008-02-15 06:24:22 UTC (rev 5703)
@@ -1,7 +1,7 @@
Index: jbossas4-4.2.2.GA/jmx/src/main/javax/management/monitor/Monitor.java
===================================================================
---- jbossas4-4.2.2.GA.orig/jmx/src/main/javax/management/monitor/Monitor.java 2007-10-22 16:57:26.000000000 +0200
-+++ jbossas4-4.2.2.GA/jmx/src/main/javax/management/monitor/Monitor.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/jmx/src/main/javax/management/monitor/Monitor.java 2008-02-14 17:42:31.000000000 +0530
++++ jbossas4-4.2.2.GA/jmx/src/main/javax/management/monitor/Monitor.java 2008-02-14 17:42:38.000000000 +0530
@@ -33,7 +33,7 @@
import org.jboss.mx.util.ObservedObject;
@@ -13,8 +13,8 @@
* The monitor service.
Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/oil2/OIL2SocketHandler.java
===================================================================
---- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/il/oil2/OIL2SocketHandler.java 2007-10-22 17:00:41.000000000 +0200
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/oil2/OIL2SocketHandler.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/il/oil2/OIL2SocketHandler.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/oil2/OIL2SocketHandler.java 2008-02-14 17:42:38.000000000 +0530
@@ -29,7 +29,7 @@
import org.jboss.logging.Logger;
@@ -26,8 +26,8 @@
import EDU.oswego.cs.dl.util.concurrent.Slot;
Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/uil2/SocketManager.java
===================================================================
---- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/il/uil2/SocketManager.java 2007-10-22 17:00:45.000000000 +0200
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/uil2/SocketManager.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/il/uil2/SocketManager.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/uil2/SocketManager.java 2008-02-14 17:42:38.000000000 +0530
@@ -35,7 +35,7 @@
import org.jboss.util.stream.NotifyingBufferedInputStream;
import org.jboss.util.stream.NotifyingBufferedOutputStream;
@@ -39,8 +39,8 @@
import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean;
Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/pm/TxManager.java
===================================================================
---- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/pm/TxManager.java 2007-10-22 17:00:36.000000000 +0200
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/pm/TxManager.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/pm/TxManager.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/pm/TxManager.java 2008-02-14 17:42:38.000000000 +0530
@@ -33,8 +33,8 @@
import org.jboss.mq.Recoverable;
import org.jboss.mq.SpyJMSException;
@@ -61,8 +61,8 @@
+}
Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/pm/none/PersistenceManager.java
===================================================================
---- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/pm/none/PersistenceManager.java 2007-10-22 17:00:35.000000000 +0200
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/pm/none/PersistenceManager.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/pm/none/PersistenceManager.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/pm/none/PersistenceManager.java 2008-02-14 17:42:38.000000000 +0530
@@ -33,7 +33,7 @@
import org.jboss.mq.server.MessageReference;
import org.jboss.system.ServiceMBeanSupport;
@@ -74,8 +74,8 @@
/**
Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/BasicQueue.java
===================================================================
---- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/BasicQueue.java 2007-10-22 17:00:35.000000000 +0200
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/BasicQueue.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/BasicQueue.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/BasicQueue.java 2008-02-14 17:42:38.000000000 +0530
@@ -50,8 +50,8 @@
import org.jboss.util.timeout.Timeout;
import org.jboss.util.timeout.TimeoutTarget;
@@ -89,8 +89,8 @@
* This class represents a queue which provides it's messages exclusively to one
Index: jbossas4-4.2.2.GA/server/src/main/org/jboss/invocation/pooled/interfaces/OptimizedObjectInputStream.java
===================================================================
---- jbossas4-4.2.2.GA.orig/server/src/main/org/jboss/invocation/pooled/interfaces/OptimizedObjectInputStream.java 2007-10-22 16:59:41.000000000 +0200
-+++ jbossas4-4.2.2.GA/server/src/main/org/jboss/invocation/pooled/interfaces/OptimizedObjectInputStream.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/server/src/main/org/jboss/invocation/pooled/interfaces/OptimizedObjectInputStream.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/server/src/main/org/jboss/invocation/pooled/interfaces/OptimizedObjectInputStream.java 2008-02-14 17:42:38.000000000 +0530
@@ -32,8 +32,8 @@
import java.util.Map;
import java.util.WeakHashMap;
@@ -122,8 +122,8 @@
{
Index: jbossas4-4.2.2.GA/tomcat/src/main/org/jboss/web/tomcat/service/sso/ClusteredSingleSignOn.java
===================================================================
---- jbossas4-4.2.2.GA.orig/tomcat/src/main/org/jboss/web/tomcat/service/sso/ClusteredSingleSignOn.java 2007-10-22 16:49:37.000000000 +0200
-+++ jbossas4-4.2.2.GA/tomcat/src/main/org/jboss/web/tomcat/service/sso/ClusteredSingleSignOn.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/tomcat/src/main/org/jboss/web/tomcat/service/sso/ClusteredSingleSignOn.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/tomcat/src/main/org/jboss/web/tomcat/service/sso/ClusteredSingleSignOn.java 2008-02-14 17:42:38.000000000 +0530
@@ -43,7 +43,7 @@
import org.jboss.web.tomcat.service.JBossWeb;
import org.jboss.web.tomcat.service.session.JBossManager;
@@ -142,8 +142,8 @@
+}
Index: jbossas4-4.2.2.GA/transaction/src/main/org/jboss/tm/TransactionLocalDelegateImpl.java
===================================================================
---- jbossas4-4.2.2.GA.orig/transaction/src/main/org/jboss/tm/TransactionLocalDelegateImpl.java 2007-10-22 16:49:29.000000000 +0200
-+++ jbossas4-4.2.2.GA/transaction/src/main/org/jboss/tm/TransactionLocalDelegateImpl.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/transaction/src/main/org/jboss/tm/TransactionLocalDelegateImpl.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/transaction/src/main/org/jboss/tm/TransactionLocalDelegateImpl.java 2008-02-14 17:42:38.000000000 +0530
@@ -33,7 +33,7 @@
import org.jboss.util.NestedRuntimeException;
@@ -155,8 +155,8 @@
/**
Index: jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java
===================================================================
---- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java 2007-10-22 16:58:12.000000000 +0200
-+++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java 2008-02-14 17:42:57.000000000 +0530
@@ -30,7 +30,7 @@
import org.jboss.mx.loading.LoaderRepository;
import org.jboss.mx.loading.RepositoryClassLoader;
@@ -172,15 +172,15 @@
boolean parentDelegation;
- ConcurrentReaderHashMap myPerVMAspects = new ConcurrentReaderHashMap();
- ConcurrentReaderHashMap notMyPerVMAspects = new ConcurrentReaderHashMap();
-+ ConcurrentHashMap myPerVMAspects = new ConcurrentReaderHashMap();
-+ ConcurrentHashMap notMyPerVMAspects = new ConcurrentReaderHashMap();
++ ConcurrentHashMap myPerVMAspects = new ConcurrentHashMap();
++ ConcurrentHashMap notMyPerVMAspects = new ConcurrentHashMap();
public ScopedClassLoaderDomain(ClassLoader loader, String name, boolean parentDelegation, AspectManager manager, boolean parentFirst)
{
Index: jbossas4-4.2.2.GA/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java
===================================================================
---- jbossas4-4.2.2.GA.orig/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java 2007-10-22 16:43:12.000000000 +0200
-+++ jbossas4-4.2.2.GA/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java 2008-02-14 17:42:38.000000000 +0530
@@ -37,7 +37,7 @@
import javax.management.ObjectName;
@@ -197,16 +197,16 @@
- protected ConcurrentReaderHashMap localReplicants = new ConcurrentReaderHashMap();
- protected ConcurrentReaderHashMap replicants = new ConcurrentReaderHashMap();
- protected ConcurrentReaderHashMap keyListeners = new ConcurrentReaderHashMap();
-+ protected ConcurrentHashMap localReplicants = new ConcurrentReaderHashMap();
-+ protected ConcurrentHashMap replicants = new ConcurrentReaderHashMap();
-+ protected ConcurrentHashMap keyListeners = new ConcurrentReaderHashMap();
++ protected ConcurrentHashMap localReplicants = new ConcurrentHashMap();
++ protected ConcurrentHashMap replicants = new ConcurrentHashMap();
++ protected ConcurrentHashMap keyListeners = new ConcurrentHashMap();
protected HashMap intraviewIdCache = new HashMap();
protected HAPartition partition;
/** The handler used to send replicant change notifications asynchronously */
Index: jbossas4-4.2.2.GA/connector/src/main/org/jboss/resource/adapter/jms/JmsResourceAdapter.java
===================================================================
---- jbossas4-4.2.2.GA.orig/connector/src/main/org/jboss/resource/adapter/jms/JmsResourceAdapter.java 2007-10-22 16:56:40.000000000 +0200
-+++ jbossas4-4.2.2.GA/connector/src/main/org/jboss/resource/adapter/jms/JmsResourceAdapter.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/connector/src/main/org/jboss/resource/adapter/jms/JmsResourceAdapter.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/connector/src/main/org/jboss/resource/adapter/jms/JmsResourceAdapter.java 2008-02-14 17:42:38.000000000 +0530
@@ -37,7 +37,7 @@
import org.jboss.resource.adapter.jms.inflow.JmsActivation;
import org.jboss.resource.adapter.jms.inflow.JmsActivationSpec;
@@ -227,8 +227,8 @@
* Get the work manager
Index: jbossas4-4.2.2.GA/connector/src/main/org/jboss/resource/adapter/mail/MailResourceAdapter.java
===================================================================
---- jbossas4-4.2.2.GA.orig/connector/src/main/org/jboss/resource/adapter/mail/MailResourceAdapter.java 2007-10-22 16:56:38.000000000 +0200
-+++ jbossas4-4.2.2.GA/connector/src/main/org/jboss/resource/adapter/mail/MailResourceAdapter.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/connector/src/main/org/jboss/resource/adapter/mail/MailResourceAdapter.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/connector/src/main/org/jboss/resource/adapter/mail/MailResourceAdapter.java 2008-02-14 17:42:38.000000000 +0530
@@ -35,7 +35,7 @@
import org.jboss.resource.adapter.mail.inflow.MailActivationSpec;
import org.jboss.resource.adapter.mail.inflow.NewMsgsWorker;
@@ -249,8 +249,8 @@
Index: jbossas4-4.2.2.GA/connector/src/main/org/jboss/resource/connectionmanager/JBossManagedConnectionPool.java
===================================================================
---- jbossas4-4.2.2.GA.orig/connector/src/main/org/jboss/resource/connectionmanager/JBossManagedConnectionPool.java 2007-10-22 16:56:44.000000000 +0200
-+++ jbossas4-4.2.2.GA/connector/src/main/org/jboss/resource/connectionmanager/JBossManagedConnectionPool.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/connector/src/main/org/jboss/resource/connectionmanager/JBossManagedConnectionPool.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/connector/src/main/org/jboss/resource/connectionmanager/JBossManagedConnectionPool.java 2008-02-14 17:42:38.000000000 +0530
@@ -45,7 +45,7 @@
import org.jboss.system.ServiceMBeanSupport;
import org.jboss.tm.TransactionLocal;
@@ -271,8 +271,8 @@
private final ManagedConnectionFactory mcf;
Index: jbossas4-4.2.2.GA/connector/src/main/org/jboss/resource/metadata/ConnectorMetaData.java
===================================================================
---- jbossas4-4.2.2.GA.orig/connector/src/main/org/jboss/resource/metadata/ConnectorMetaData.java 2007-10-22 16:56:42.000000000 +0200
-+++ jbossas4-4.2.2.GA/connector/src/main/org/jboss/resource/metadata/ConnectorMetaData.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/connector/src/main/org/jboss/resource/metadata/ConnectorMetaData.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/connector/src/main/org/jboss/resource/metadata/ConnectorMetaData.java 2008-02-14 17:42:38.000000000 +0530
@@ -25,7 +25,7 @@
import java.util.Iterator;
import java.util.Locale;
@@ -293,8 +293,8 @@
private HashSet connectionDefinitions = new HashSet();
Index: jbossas4-4.2.2.GA/connector/src/main/org/jboss/resource/metadata/DescriptionMetaDataContainer.java
===================================================================
---- jbossas4-4.2.2.GA.orig/connector/src/main/org/jboss/resource/metadata/DescriptionMetaDataContainer.java 2007-10-22 16:56:42.000000000 +0200
-+++ jbossas4-4.2.2.GA/connector/src/main/org/jboss/resource/metadata/DescriptionMetaDataContainer.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/connector/src/main/org/jboss/resource/metadata/DescriptionMetaDataContainer.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/connector/src/main/org/jboss/resource/metadata/DescriptionMetaDataContainer.java 2008-02-14 17:42:38.000000000 +0530
@@ -26,7 +26,7 @@
import java.util.Iterator;
import java.util.Locale;
@@ -315,8 +315,8 @@
{
Index: jbossas4-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/statistics/InvocationStatistics.java
===================================================================
---- jbossas4-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/statistics/InvocationStatistics.java 2007-10-22 16:45:20.000000000 +0200
-+++ jbossas4-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/statistics/InvocationStatistics.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/statistics/InvocationStatistics.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/statistics/InvocationStatistics.java 2008-02-14 17:42:38.000000000 +0530
@@ -27,7 +27,7 @@
import java.util.Iterator;
import java.util.Map;
@@ -337,8 +337,8 @@
/** Update the TimeStatistic for the given method. This synchronizes on
Index: jbossas4-4.2.2.GA/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapter.java
===================================================================
---- jbossas4-4.2.2.GA.orig/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapter.java 2007-10-22 16:43:43.000000000 +0200
-+++ jbossas4-4.2.2.GA/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapter.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapter.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapter.java 2008-02-14 17:42:38.000000000 +0530
@@ -38,7 +38,7 @@
import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.mx.util.ObjectNameFactory;
@@ -359,8 +359,8 @@
{
Index: jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/LoaderRepository.java
===================================================================
---- jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/loading/LoaderRepository.java 2007-10-22 16:57:18.000000000 +0200
-+++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/LoaderRepository.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/loading/LoaderRepository.java 2008-02-14 17:42:31.000000000 +0530
++++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/LoaderRepository.java 2008-02-14 17:42:38.000000000 +0530
@@ -21,7 +21,7 @@
*/
package org.jboss.mx.loading;
@@ -381,8 +381,8 @@
/**
Index: jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/RepositoryClassLoader.java
===================================================================
---- jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/loading/RepositoryClassLoader.java 2007-10-22 16:57:18.000000000 +0200
-+++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/RepositoryClassLoader.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/loading/RepositoryClassLoader.java 2008-02-14 17:42:31.000000000 +0530
++++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/RepositoryClassLoader.java 2008-02-14 17:42:38.000000000 +0530
@@ -46,7 +46,7 @@
import org.jboss.util.collection.SoftSet;
@@ -403,8 +403,8 @@
protected ReentrantLock loadLock = new ReentrantLock();
Index: jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepository3.java
===================================================================
---- jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepository3.java 2007-10-22 16:57:18.000000000 +0200
-+++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepository3.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepository3.java 2008-02-14 17:42:31.000000000 +0530
++++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepository3.java 2008-02-14 17:42:38.000000000 +0530
@@ -49,8 +49,8 @@
import org.jboss.logging.Logger;
import org.jboss.mx.util.JBossNotificationBroadcasterSupport;
@@ -436,8 +436,8 @@
* they serve
Index: jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java
===================================================================
---- jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java 2007-10-22 16:57:16.000000000 +0200
-+++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java 2008-02-14 17:42:38.000000000 +0530
@@ -49,7 +49,7 @@
import javax.management.modelmbean.ModelMBeanInfo;
import javax.management.modelmbean.RequiredModelMBean;
@@ -471,8 +471,8 @@
+}
Index: jbossas4-4.2.2.GA/management/src/main/org/jboss/management/j2ee/factory/EJBModuleFactory.java
===================================================================
---- jbossas4-4.2.2.GA.orig/management/src/main/org/jboss/management/j2ee/factory/EJBModuleFactory.java 2007-10-22 17:00:18.000000000 +0200
-+++ jbossas4-4.2.2.GA/management/src/main/org/jboss/management/j2ee/factory/EJBModuleFactory.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/management/src/main/org/jboss/management/j2ee/factory/EJBModuleFactory.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/management/src/main/org/jboss/management/j2ee/factory/EJBModuleFactory.java 2008-02-14 17:42:38.000000000 +0530
@@ -35,7 +35,7 @@
import org.jboss.metadata.BeanMetaData;
import org.jboss.metadata.SessionMetaData;
@@ -497,8 +497,8 @@
{
Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyXAResourceManager.java
===================================================================
---- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/SpyXAResourceManager.java 2007-10-22 17:00:47.000000000 +0200
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyXAResourceManager.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/SpyXAResourceManager.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyXAResourceManager.java 2008-02-14 17:42:38.000000000 +0530
@@ -25,7 +25,7 @@
import java.util.Map;
import java.util.ArrayList;
@@ -519,8 +519,8 @@
Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/ClientMonitorInterceptor.java
===================================================================
---- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/ClientMonitorInterceptor.java 2007-10-22 17:00:34.000000000 +0200
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/ClientMonitorInterceptor.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/ClientMonitorInterceptor.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/ClientMonitorInterceptor.java 2008-02-14 17:42:38.000000000 +0530
@@ -39,7 +39,7 @@
import org.jboss.mq.TransactionRequest;
import org.jboss.mq.il.jvm.JVMClientIL;
@@ -541,8 +541,8 @@
{
Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/JMSDestinationManager.java
===================================================================
---- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/JMSDestinationManager.java 2007-10-22 17:00:35.000000000 +0200
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/JMSDestinationManager.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/JMSDestinationManager.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/JMSDestinationManager.java 2008-02-14 17:42:38.000000000 +0530
@@ -56,7 +56,7 @@
import org.jboss.util.threadpool.ThreadPool;
import org.jboss.util.timeout.TimeoutFactory;
@@ -576,8 +576,8 @@
private int lastID = 1;
Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/JMSTopic.java
===================================================================
---- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/JMSTopic.java 2007-10-22 17:00:35.000000000 +0200
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/JMSTopic.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/server/JMSTopic.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/JMSTopic.java 2008-02-14 17:42:38.000000000 +0530
@@ -39,7 +39,7 @@
import org.jboss.mq.pm.PersistenceManager;
import org.jboss.mq.pm.Tx;
@@ -600,8 +600,8 @@
{
Index: jbossas4-4.2.2.GA/security/src/main/org/jboss/security/jacc/DelegatingPolicy.java
===================================================================
---- jbossas4-4.2.2.GA.orig/security/src/main/org/jboss/security/jacc/DelegatingPolicy.java 2007-10-22 17:00:06.000000000 +0200
-+++ jbossas4-4.2.2.GA/security/src/main/org/jboss/security/jacc/DelegatingPolicy.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/security/src/main/org/jboss/security/jacc/DelegatingPolicy.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/security/src/main/org/jboss/security/jacc/DelegatingPolicy.java 2008-02-14 17:42:38.000000000 +0530
@@ -40,7 +40,7 @@
import javax.security.auth.Subject;
@@ -628,8 +628,8 @@
*/
Index: jbossas4-4.2.2.GA/security/src/main/org/jboss/security/jacc/JBossPolicyConfigurationFactory.java
===================================================================
---- jbossas4-4.2.2.GA.orig/security/src/main/org/jboss/security/jacc/JBossPolicyConfigurationFactory.java 2007-10-22 17:00:06.000000000 +0200
-+++ jbossas4-4.2.2.GA/security/src/main/org/jboss/security/jacc/JBossPolicyConfigurationFactory.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/security/src/main/org/jboss/security/jacc/JBossPolicyConfigurationFactory.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/security/src/main/org/jboss/security/jacc/JBossPolicyConfigurationFactory.java 2008-02-14 17:42:38.000000000 +0530
@@ -27,7 +27,7 @@
import javax.security.jacc.PolicyConfiguration;
import javax.security.jacc.PolicyContextException;
@@ -650,8 +650,8 @@
/** Build the JACC policy configuration state machine from the
Index: jbossas4-4.2.2.GA/security/src/main/org/jboss/security/plugins/JaasSecurityManagerService.java
===================================================================
---- jbossas4-4.2.2.GA.orig/security/src/main/org/jboss/security/plugins/JaasSecurityManagerService.java 2007-10-22 17:00:05.000000000 +0200
-+++ jbossas4-4.2.2.GA/security/src/main/org/jboss/security/plugins/JaasSecurityManagerService.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/security/src/main/org/jboss/security/plugins/JaasSecurityManagerService.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/security/src/main/org/jboss/security/plugins/JaasSecurityManagerService.java 2008-02-14 17:42:38.000000000 +0530
@@ -63,7 +63,7 @@
import org.jboss.system.ServiceMBeanSupport;
import org.jboss.util.CachePolicy;
@@ -672,8 +672,8 @@
private boolean serverMode = true;
Index: jbossas4-4.2.2.GA/server/src/main/org/jboss/deployment/EARDeployment.java
===================================================================
---- jbossas4-4.2.2.GA.orig/server/src/main/org/jboss/deployment/EARDeployment.java 2007-10-22 16:59:06.000000000 +0200
-+++ jbossas4-4.2.2.GA/server/src/main/org/jboss/deployment/EARDeployment.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/server/src/main/org/jboss/deployment/EARDeployment.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/server/src/main/org/jboss/deployment/EARDeployment.java 2008-02-14 17:42:38.000000000 +0530
@@ -28,7 +28,7 @@
import org.jboss.mx.util.ObjectNameFactory;
import org.jboss.system.ServiceMBeanSupport;
@@ -694,8 +694,8 @@
Index: jbossas4-4.2.2.GA/server/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceCache.java
===================================================================
---- jbossas4-4.2.2.GA.orig/server/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceCache.java 2007-10-22 16:59:33.000000000 +0200
-+++ jbossas4-4.2.2.GA/server/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceCache.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/server/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceCache.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/server/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceCache.java 2008-02-14 17:42:38.000000000 +0530
@@ -33,7 +33,7 @@
import org.jboss.ejb.EnterpriseContext;
import org.jboss.ejb.StatefulSessionEnterpriseContext;
@@ -723,8 +723,8 @@
+}
Index: jbossas4-4.2.2.GA/server/src/main/org/jboss/invocation/InvocationStatistics.java
===================================================================
---- jbossas4-4.2.2.GA.orig/server/src/main/org/jboss/invocation/InvocationStatistics.java 2007-10-22 16:59:44.000000000 +0200
-+++ jbossas4-4.2.2.GA/server/src/main/org/jboss/invocation/InvocationStatistics.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/server/src/main/org/jboss/invocation/InvocationStatistics.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/server/src/main/org/jboss/invocation/InvocationStatistics.java 2008-02-14 17:42:38.000000000 +0530
@@ -27,7 +27,7 @@
import java.util.Iterator;
import java.util.Map;
@@ -745,8 +745,8 @@
/** Update the TimeStatistic for the given method. This synchronizes on
Index: jbossas4-4.2.2.GA/server/src/main/org/jboss/invocation/pooled/interfaces/PooledInvokerProxy.java
===================================================================
---- jbossas4-4.2.2.GA.orig/server/src/main/org/jboss/invocation/pooled/interfaces/PooledInvokerProxy.java 2007-10-22 16:59:41.000000000 +0200
-+++ jbossas4-4.2.2.GA/server/src/main/org/jboss/invocation/pooled/interfaces/PooledInvokerProxy.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/server/src/main/org/jboss/invocation/pooled/interfaces/PooledInvokerProxy.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/server/src/main/org/jboss/invocation/pooled/interfaces/PooledInvokerProxy.java 2008-02-14 17:42:39.000000000 +0530
@@ -55,7 +55,7 @@
import org.jboss.invocation.Invoker;
import org.jboss.tm.TransactionPropagationContextFactory;
@@ -767,8 +767,8 @@
* connection information
Index: jbossas4-4.2.2.GA/server/src/main/org/jboss/metadata/BeanMetaData.java
===================================================================
---- jbossas4-4.2.2.GA.orig/server/src/main/org/jboss/metadata/BeanMetaData.java 2007-10-22 16:59:05.000000000 +0200
-+++ jbossas4-4.2.2.GA/server/src/main/org/jboss/metadata/BeanMetaData.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/server/src/main/org/jboss/metadata/BeanMetaData.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/server/src/main/org/jboss/metadata/BeanMetaData.java 2008-02-14 17:42:39.000000000 +0530
@@ -40,7 +40,7 @@
import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
import org.w3c.dom.Element;
@@ -796,8 +796,8 @@
/** The invoker names to JNDI name mapping */
Index: jbossas4-4.2.2.GA/server/src/main/org/jboss/web/WebServer.java
===================================================================
---- jbossas4-4.2.2.GA.orig/server/src/main/org/jboss/web/WebServer.java 2007-10-22 16:59:46.000000000 +0200
-+++ jbossas4-4.2.2.GA/server/src/main/org/jboss/web/WebServer.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/server/src/main/org/jboss/web/WebServer.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/server/src/main/org/jboss/web/WebServer.java 2008-02-14 17:42:39.000000000 +0530
@@ -39,7 +39,7 @@
import org.jboss.util.threadpool.BasicThreadPool;
import org.jboss.util.threadpool.BasicThreadPoolMBean;
@@ -818,8 +818,8 @@
* The web server http listening socket
Index: jbossas4-4.2.2.GA/system/src/main/org/jboss/deployment/SARDeployer.java
===================================================================
---- jbossas4-4.2.2.GA.orig/system/src/main/org/jboss/deployment/SARDeployer.java 2007-10-22 16:48:52.000000000 +0200
-+++ jbossas4-4.2.2.GA/system/src/main/org/jboss/deployment/SARDeployer.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/system/src/main/org/jboss/deployment/SARDeployer.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/system/src/main/org/jboss/deployment/SARDeployer.java 2008-02-14 17:42:39.000000000 +0530
@@ -60,7 +60,7 @@
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
@@ -840,8 +840,8 @@
private boolean useNamespaceAwareParser;
Index: jbossas4-4.2.2.GA/system/src/main/org/jboss/system/Registry.java
===================================================================
---- jbossas4-4.2.2.GA.orig/system/src/main/org/jboss/system/Registry.java 2007-10-22 16:48:55.000000000 +0200
-+++ jbossas4-4.2.2.GA/system/src/main/org/jboss/system/Registry.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/system/src/main/org/jboss/system/Registry.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/system/src/main/org/jboss/system/Registry.java 2008-02-14 17:42:39.000000000 +0530
@@ -25,7 +25,7 @@
import org.jboss.logging.Logger;
@@ -862,8 +862,8 @@
{
Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/fs/FSDirContextAdaptor.java
===================================================================
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jca/fs/FSDirContextAdaptor.java 2007-10-22 16:50:37.000000000 +0200
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/fs/FSDirContextAdaptor.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jca/fs/FSDirContextAdaptor.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/fs/FSDirContextAdaptor.java 2008-02-14 17:42:39.000000000 +0530
@@ -31,7 +31,7 @@
import javax.transaction.xa.XAResource;
@@ -884,8 +884,8 @@
* Get the work manager
Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/inflow/TestResourceAdapter.java
===================================================================
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jca/inflow/TestResourceAdapter.java 2007-10-22 16:50:40.000000000 +0200
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/inflow/TestResourceAdapter.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jca/inflow/TestResourceAdapter.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/inflow/TestResourceAdapter.java 2008-02-14 17:42:39.000000000 +0530
@@ -38,7 +38,7 @@
import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.mx.util.ObjectNameFactory;
@@ -906,8 +906,8 @@
{
Index: jbossas4-4.2.2.GA/tomcat/src/main/org/jboss/web/tomcat/statistics/ReplicationStatistics.java
===================================================================
---- jbossas4-4.2.2.GA.orig/tomcat/src/main/org/jboss/web/tomcat/statistics/ReplicationStatistics.java 2007-10-22 16:49:40.000000000 +0200
-+++ jbossas4-4.2.2.GA/tomcat/src/main/org/jboss/web/tomcat/statistics/ReplicationStatistics.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/tomcat/src/main/org/jboss/web/tomcat/statistics/ReplicationStatistics.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/tomcat/src/main/org/jboss/web/tomcat/statistics/ReplicationStatistics.java 2008-02-14 17:42:39.000000000 +0530
@@ -25,7 +25,7 @@
import java.util.HashMap;
import java.util.Iterator;
@@ -937,8 +937,8 @@
public void updatePassivationStats(String ctx, long elapsed)
Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/deployers/rar/mcf1/MCF1ManagedConnection.java
===================================================================
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/deployers/rar/mcf1/MCF1ManagedConnection.java 2007-10-22 16:50:48.000000000 +0200
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/deployers/rar/mcf1/MCF1ManagedConnection.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/deployers/rar/mcf1/MCF1ManagedConnection.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/deployers/rar/mcf1/MCF1ManagedConnection.java 2008-02-14 17:42:39.000000000 +0530
@@ -34,7 +34,7 @@
import javax.security.auth.Subject;
import javax.transaction.xa.XAResource;
@@ -950,8 +950,8 @@
public class MCF1ManagedConnection implements ManagedConnection, LocalTransaction
Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jcaprops/support/PropertyTestManagedConnection.java
===================================================================
---- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jcaprops/support/PropertyTestManagedConnection.java 2007-10-22 16:50:12.000000000 +0200
-+++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jcaprops/support/PropertyTestManagedConnection.java 2007-11-11 12:26:18.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/testsuite/src/main/org/jboss/test/jcaprops/support/PropertyTestManagedConnection.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jcaprops/support/PropertyTestManagedConnection.java 2008-02-14 17:42:39.000000000 +0530
@@ -34,7 +34,7 @@
import javax.security.auth.Subject;
import javax.transaction.xa.XAResource;
@@ -963,8 +963,8 @@
/**
Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/uil2/UILServerILService.java
===================================================================
---- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/il/uil2/UILServerILService.java 2007-11-11 12:29:09.000000000 +0100
-+++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/uil2/UILServerILService.java 2007-11-11 12:29:49.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/messaging/src/main/org/jboss/mq/il/uil2/UILServerILService.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/uil2/UILServerILService.java 2008-02-14 17:42:39.000000000 +0530
@@ -41,7 +41,7 @@
import org.jboss.security.SecurityDomain;
import org.jboss.system.server.ServerConfigUtil;
@@ -976,8 +976,8 @@
/** This is the server side MBean for the UIL2 transport layer.
Index: jbossas4-4.2.2.GA/system/src/tests/org/jboss/test/system/controller/SimpleSARDeployer.java
===================================================================
---- jbossas4-4.2.2.GA.orig/system/src/tests/org/jboss/test/system/controller/SimpleSARDeployer.java 2007-11-11 12:29:09.000000000 +0100
-+++ jbossas4-4.2.2.GA/system/src/tests/org/jboss/test/system/controller/SimpleSARDeployer.java 2007-11-11 12:29:51.000000000 +0100
+--- jbossas4-4.2.2.GA.orig/system/src/tests/org/jboss/test/system/controller/SimpleSARDeployer.java 2008-02-14 17:42:32.000000000 +0530
++++ jbossas4-4.2.2.GA/system/src/tests/org/jboss/test/system/controller/SimpleSARDeployer.java 2008-02-14 17:42:39.000000000 +0530
@@ -41,7 +41,7 @@
import org.w3c.dom.Element;
import org.xml.sax.InputSource;
Added: trunk/jbossas4/debian/patches/deployers.diff
===================================================================
--- trunk/jbossas4/debian/patches/deployers.diff (rev 0)
+++ trunk/jbossas4/debian/patches/deployers.diff 2008-02-15 06:24:22 UTC (rev 5703)
@@ -0,0 +1,160 @@
+diff -urN jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java
+--- jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java 2007-10-22 20:15:20.000000000 +0530
++++ jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java 2008-02-15 10:49:20.000000000 +0530
+@@ -92,7 +92,7 @@
+ private ObjectName objectName;
+ private DependencyPolicy dependencyPolicy = new JBoss5DependencyPolicy();
+
+- public ClientENCInjectionContainer(org.jboss.deployers.spi.deployer.DeploymentUnit unit, ApplicationClientDD xml, Class<?> mainClass, String applicationClientName, ClassLoader classLoader, Context encCtx) throws NamingException
++ public ClientENCInjectionContainer(org.jboss.deployers.structure.spi.DeploymentUnit unit, ApplicationClientDD xml, Class<?> mainClass, String applicationClientName, ClassLoader classLoader, Context encCtx) throws NamingException
+ {
+ if(mainClass == null)
+ throw new NullPointerException("mainClass is mandatory");
+@@ -151,7 +151,7 @@
+ processMetaData();
+ }
+
+- private String createScopeKernelName(org.jboss.deployers.spi.deployer.DeploymentUnit unit, DeploymentScope ear)
++ private String createScopeKernelName(org.jboss.deployers.structure.spi.DeploymentUnit unit, DeploymentScope ear)
+ {
+ String scopedKernelName = "";
+ if (ear != null) scopedKernelName += ",ear=" + ear.getShortName();
+diff -urN jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/AppClientParsingDeployer.java jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/AppClientParsingDeployer.java
+--- jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/AppClientParsingDeployer.java 2007-10-22 20:15:12.000000000 +0530
++++ jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/AppClientParsingDeployer.java 2008-02-15 10:49:20.000000000 +0530
+@@ -25,7 +25,7 @@
+
+ import org.jboss.deployers.plugins.deployers.helpers.ObjectModelFactoryDeployer;
+ import org.jboss.deployers.spi.DeploymentException;
+-import org.jboss.deployers.spi.deployer.DeploymentUnit;
++import org.jboss.deployers.structure.spi.DeploymentUnit;
+ import org.jboss.ejb3.metamodel.ApplicationClientDD;
+ import org.jboss.ejb3.metamodel.ApplicationClientDDObjectFactory;
+ import org.jboss.util.xml.DOMUtils;
+diff -urN jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/AppClientScanningDeployer.java jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/AppClientScanningDeployer.java
+--- jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/AppClientScanningDeployer.java 2007-10-22 20:15:12.000000000 +0530
++++ jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/AppClientScanningDeployer.java 2008-02-15 10:49:20.000000000 +0530
+@@ -23,7 +23,7 @@
+
+ import org.jboss.deployers.plugins.deployers.helpers.AbstractTypedDeployer;
+ import org.jboss.deployers.spi.DeploymentException;
+-import org.jboss.deployers.spi.deployer.DeploymentUnit;
++import org.jboss.deployers.structure.spi.DeploymentUnit;
+ import org.jboss.ejb3.metamodel.ApplicationClientDD;
+ import org.jboss.virtual.VirtualFile;
+
+@@ -50,7 +50,7 @@
+ }
+
+ /* (non-Javadoc)
+- * @see org.jboss.deployers.plugins.deployer.AbstractSimpleDeployer#deploy(org.jboss.deployers.spi.deployer.DeploymentUnit)
++ * @see org.jboss.deployers.plugins.deployer.AbstractSimpleDeployer#deploy(org.jboss.deployers.structure.spi.DeploymentUnit)
+ */
+ @Override
+ public void deploy(DeploymentUnit unit) throws DeploymentException
+diff -urN jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java
+--- jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java 2007-10-22 20:15:12.000000000 +0530
++++ jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java 2008-02-15 10:49:20.000000000 +0530
+@@ -23,7 +23,7 @@
+
+ import org.jboss.deployers.plugins.deployers.helpers.AbstractSimpleRealDeployer;
+ import org.jboss.deployers.spi.DeploymentException;
+-import org.jboss.deployers.spi.deployer.DeploymentUnit;
++import org.jboss.deployers.structure.spi.DeploymentUnit;
+ import org.jboss.ejb3.InitialContextFactory;
+ import org.jboss.ejb3.KernelAbstraction;
+ import org.jboss.ejb3.MCKernelAbstraction;
+diff -urN jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java
+--- jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java 2007-10-22 20:15:12.000000000 +0530
++++ jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java 2008-02-15 10:49:20.000000000 +0530
+@@ -43,11 +43,11 @@
+ */
+ public class Ejb3JBoss5Deployment extends Ejb3Deployment
+ {
+- private org.jboss.deployers.spi.deployer.DeploymentUnit deploymentInfo;
++ private org.jboss.deployers.structure.spi.DeploymentUnit deploymentInfo;
+
+ private static final Logger log = Logger.getLogger(Ejb3JBoss5Deployment.class);
+
+- public Ejb3JBoss5Deployment(DeploymentUnit du, Kernel kernel, MBeanServer mbeanServer, org.jboss.deployers.spi.deployer.DeploymentUnit di, DeploymentScope deploymentScope)
++ public Ejb3JBoss5Deployment(DeploymentUnit du, Kernel kernel, MBeanServer mbeanServer, org.jboss.deployers.structure.spi.DeploymentUnit di, DeploymentScope deploymentScope)
+ {
+ super(du, deploymentScope);
+ this.deploymentInfo = di;
+diff -urN jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java
+--- jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java 2007-10-22 20:15:12.000000000 +0530
++++ jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java 2008-02-15 10:49:20.000000000 +0530
+@@ -22,9 +22,9 @@
+ package org.jboss.ejb3.deployers;
+
+ import org.jboss.deployers.plugins.deployer.AbstractSimpleDeployer;
+-import org.jboss.deployers.spi.deployer.DeploymentUnit;
++import org.jboss.deployers.structure.spi.DeploymentUnit;
+ import org.jboss.deployers.spi.DeploymentException;
+-import org.jboss.deployers.spi.structure.DeploymentContext;
++import org.jboss.deployers.structure.spi.DeploymentContext;
+ import org.jboss.ejb3.DeploymentScope;
+ import org.jboss.ejb3.Ejb3Deployment;
+ import org.jboss.ejb3.EJB3Deployer;
+diff -urN jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/EJBStage2Deployer.java jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/EJBStage2Deployer.java
+--- jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/EJBStage2Deployer.java 2007-10-22 20:15:12.000000000 +0530
++++ jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/EJBStage2Deployer.java 2008-02-15 10:49:20.000000000 +0530
+@@ -23,7 +23,7 @@
+
+ import org.jboss.deployers.plugins.deployer.AbstractSimpleDeployer;
+ import org.jboss.deployers.spi.DeploymentException;
+-import org.jboss.deployers.spi.deployer.DeploymentUnit;
++import org.jboss.deployers.structure.spi.DeploymentUnit;
+ import org.jboss.ejb3.Ejb3Deployment;
+ import org.jboss.logging.Logger;
+
+diff -urN jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java
+--- jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java 2007-10-22 20:15:12.000000000 +0530
++++ jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java 2008-02-15 10:49:20.000000000 +0530
+@@ -23,8 +23,8 @@
+
+ import org.jboss.ejb3.DeploymentScope;
+ import org.jboss.ejb3.Ejb3Deployment;
+-import org.jboss.deployers.spi.structure.DeploymentContext;
+-import org.jboss.deployers.spi.deployer.DeploymentUnit;
++import org.jboss.deployers.structure.spi.DeploymentContext;
++import org.jboss.deployers.structure.spi.DeploymentUnit;
+
+ import java.util.ArrayList;
+ import java.util.Collection;
+diff -urN jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java
+--- jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java 2007-10-22 20:15:12.000000000 +0530
++++ jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java 2008-02-15 10:49:20.000000000 +0530
+@@ -29,7 +29,7 @@
+ import java.util.List;
+ import java.util.Map;
+
+-import org.jboss.deployers.spi.deployer.DeploymentUnit;
++import org.jboss.deployers.structure.spi.DeploymentUnit;
+ import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
+ import org.jboss.virtual.VirtualFile;
+ import org.jboss.virtual.VirtualFileFilter;
+diff -urN jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/JBossClientParsingDeployer.java jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/JBossClientParsingDeployer.java
+--- jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/JBossClientParsingDeployer.java 2007-10-22 20:15:12.000000000 +0530
++++ jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/JBossClientParsingDeployer.java 2008-02-15 10:49:20.000000000 +0530
+@@ -25,7 +25,7 @@
+
+ import org.jboss.deployers.plugins.deployers.helpers.ObjectModelFactoryDeployer;
+ import org.jboss.deployers.spi.DeploymentException;
+-import org.jboss.deployers.spi.deployer.DeploymentUnit;
++import org.jboss.deployers.structure.spi.DeploymentUnit;
+ import org.jboss.ejb3.metamodel.ApplicationClientDD;
+ import org.jboss.ejb3.metamodel.JBossClientDDObjectFactory;
+ import org.jboss.util.xml.DOMUtils;
+diff -urN jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/security/JaccHelper.java jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/security/JaccHelper.java
+--- jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/security/JaccHelper.java 2007-10-22 20:15:17.000000000 +0530
++++ jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/security/JaccHelper.java 2008-02-15 10:49:20.000000000 +0530
+@@ -47,7 +47,7 @@
+ import org.jboss.deployment.DeploymentInfo;
+ import org.jboss.ejb3.EJBContainer;
+ import org.jboss.logging.Logger;
+-//import org.jboss.deployers.spi.deployer.DeploymentUnit;
++//import org.jboss.deployers.structure.spi.DeploymentUnit;
+ import org.jboss.security.RealmMapping;
+ import org.jboss.security.RunAsIdentity;
+
Modified: trunk/jbossas4/debian/patches/series
===================================================================
--- trunk/jbossas4/debian/patches/series 2008-02-14 20:29:05 UTC (rev 5702)
+++ trunk/jbossas4/debian/patches/series 2008-02-15 06:24:22 UTC (rev 5703)
@@ -4,3 +4,8 @@
collection.diff
concurrent.diff
marshaller.diff
+DummyServiceRef.diff
+cluster_debugger.diff
+catch_exception.diff
+deployers.diff
+webservice.diff
Added: trunk/jbossas4/debian/patches/webservice.diff
===================================================================
--- trunk/jbossas4/debian/patches/webservice.diff (rev 0)
+++ trunk/jbossas4/debian/patches/webservice.diff 2008-02-15 06:24:22 UTC (rev 5703)
@@ -0,0 +1,22 @@
+Index: jbossas4-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/webservice/WebServiceContextImpl.java
+===================================================================
+--- jbossas4-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/webservice/WebServiceContextImpl.java 2008-02-15 11:22:38.000000000 +0530
++++ jbossas4-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/webservice/WebServiceContextImpl.java 2008-02-15 11:23:11.000000000 +0530
+@@ -60,7 +60,7 @@
+ */
+ public EndpointReference getEndpointReference(Element... referenceParameters)
+ {
+- return getDelegate().getEndpointReference(referenceParameters);
++ throw new UnsupportedOperationException();
+ }
+
+ /* (non-Javadoc)
+@@ -68,7 +68,7 @@
+ */
+ public <T extends EndpointReference> T getEndpointReference(Class<T> clazz, Element... referenceParameters)
+ {
+- return getDelegate().getEndpointReference(clazz, referenceParameters);
++ throw new UnsupportedOperationException();
+ }
+
+ /* (non-Javadoc)
Modified: trunk/jbossas4/debian/rules
===================================================================
--- trunk/jbossas4/debian/rules 2008-02-14 20:29:05 UTC (rev 5702)
+++ trunk/jbossas4/debian/rules 2008-02-15 06:24:22 UTC (rev 5703)
@@ -10,8 +10,10 @@
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 jboss-remoting \
- javacc jboss-serialization jboss-microcontainer quartz \
- ant-nodeps jboss-remoting
+ javacc jboss-serialization jboss-microcontainer quartz ant-nodeps trove \
+ jboss-remoting jboss-aop jgroups-all jbossws-common jbossws-spi jbossws-native\
+ jboss-dependency jboss-container jboss-cache1 hibernate3 hibernate-annotations \
+ hibernate-entitymanager commons-logging bsh jboss-vfs
ALL_JARS = $(wildcard *.jar)
DEST_DIR = $(DEB_DESTDIR)/usr/share/java
More information about the pkg-java-commits
mailing list