[pkg-java] r7328 - in trunk/jbossas4/debian: . patches
twerner at alioth.debian.org
twerner at alioth.debian.org
Fri Nov 14 22:09:19 UTC 2008
Author: twerner
Date: 2008-11-14 22:09:19 +0000 (Fri, 14 Nov 2008)
New Revision: 7328
Removed:
trunk/jbossas4/debian/patches/DummyServiceRef.diff
trunk/jbossas4/debian/patches/webservice.diff
Modified:
trunk/jbossas4/debian/build.xml
trunk/jbossas4/debian/changelog
trunk/jbossas4/debian/control
trunk/jbossas4/debian/copyright
trunk/jbossas4/debian/patches/cluster_debugger.diff
trunk/jbossas4/debian/patches/concurrent.diff
trunk/jbossas4/debian/patches/series
trunk/jbossas4/debian/rules
Log:
UNRELEASED (needs jboss-aop 1.5)
* new upstream release
* Refresh patches.
* Switch to openjdk-6-jdk.
* Add Build-Depends: libjboss-managed-java.
* Bump up Standards-Version: 3.8.0 (no changes).
* Do no longer quote the full text of the Apache license in
debian/copyright.
Modified: trunk/jbossas4/debian/build.xml
===================================================================
--- trunk/jbossas4/debian/build.xml 2008-11-14 21:36:46 UTC (rev 7327)
+++ trunk/jbossas4/debian/build.xml 2008-11-14 22:09:19 UTC (rev 7328)
@@ -286,7 +286,8 @@
<mkdir dir="${connector.dir}/${class.dir}"/>
<javac srcdir="${connector.dir}/${source.dir}" destdir="${connector.dir}/${class.dir}"
- debug="true">
+ debug="true" source="1.5" includes="**/*.java"
+ excludes="**/org/jboss/resource/adapter/jdbc/jdk5/*.java">
<classpath>
<fileset dir=".">
<include name='*.jar'/>
Modified: trunk/jbossas4/debian/changelog
===================================================================
--- trunk/jbossas4/debian/changelog 2008-11-14 21:36:46 UTC (rev 7327)
+++ trunk/jbossas4/debian/changelog 2008-11-14 22:09:19 UTC (rev 7328)
@@ -1,3 +1,16 @@
+jbossas4 (4.2.3.GA-1) unstable; urgency=low
+
+ UNRELEASED (needs jboss-aop 1.5)
+ * new upstream release
+ * Refresh patches.
+ * Switch to openjdk-6-jdk.
+ * Add Build-Depends: libjboss-managed-java.
+ * Bump up Standards-Version: 3.8.0 (no changes).
+ * Do no longer quote the full text of the Apache license in
+ debian/copyright.
+
+ -- Torsten Werner <twerner at debian.org> Fri, 14 Nov 2008 22:56:48 +0100
+
jbossas4 (4.2.2.GA-5) unstable; urgency=low
* debian/control: Add libjboss-reflect-java to Build-Depends
Modified: trunk/jbossas4/debian/control
===================================================================
--- trunk/jbossas4/debian/control 2008-11-14 21:36:46 UTC (rev 7327)
+++ trunk/jbossas4/debian/control 2008-11-14 22:09:19 UTC (rev 7328)
@@ -4,7 +4,7 @@
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,
+Build-Depends-Indep: ant, openjdk-6-jdk, 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,
@@ -14,8 +14,8 @@
libjboss-web-services-java, libjboss-cache1-java, libhibernate3-java,
libhibernate-entitymanager-java, libhibernate-annotations-java,
libcommons-logging-java, libjboss-vfs-java, libjboss-microcontainer-java,
- libjboss-reflect-java, libquartz-java
-Standards-Version: 3.7.3
+ libjboss-reflect-java, libquartz-java, libjboss-managed-java
+Standards-Version: 3.8.0
Homepage: http://labs.jboss.com/jbossas/
Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/jbossas4
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jbossas4
Modified: trunk/jbossas4/debian/copyright
===================================================================
--- trunk/jbossas4/debian/copyright 2008-11-14 21:36:46 UTC (rev 7327)
+++ trunk/jbossas4/debian/copyright 2008-11-14 22:09:19 UTC (rev 7328)
@@ -158,179 +158,9 @@
Version 2.0, January 2004
http://www.apache.org/licenses/
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+The full text of the Apache License can be found in
+`/usr/share/common-licenses/Apache-2.0'.
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
------
Files:
jaxrpc/src/main/org/w3c/dom/DOMConfiguration.java
Deleted: trunk/jbossas4/debian/patches/DummyServiceRef.diff
===================================================================
--- trunk/jbossas4/debian/patches/DummyServiceRef.diff 2008-11-14 21:36:46 UTC (rev 7327)
+++ trunk/jbossas4/debian/patches/DummyServiceRef.diff 2008-11-14 22:09:19 UTC (rev 7328)
@@ -1,26 +0,0 @@
-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[]>();
-+ }
- }
- }
Modified: trunk/jbossas4/debian/patches/cluster_debugger.diff
===================================================================
--- trunk/jbossas4/debian/patches/cluster_debugger.diff 2008-11-14 21:36:46 UTC (rev 7327)
+++ trunk/jbossas4/debian/patches/cluster_debugger.diff 2008-11-14 22:09:19 UTC (rev 7328)
@@ -1,36 +1,8 @@
-Index: jbossas4-4.2.2.GA/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java
+Index: jbossas4-4.2.3.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 @@
+--- jbossas4-4.2.3.GA.orig/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java 2008-07-18 16:59:51.000000000 +0200
++++ jbossas4-4.2.3.GA/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java 2008-11-10 20:16:11.000000000 +0100
+@@ -410,7 +410,6 @@
protected void stopService() throws Exception
{
@@ -38,40 +10,10 @@
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
+Index: jbossas4-4.2.3.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
+--- jbossas4-4.2.3.GA.orig/cluster/src/main/org/jboss/ha/framework/server/ClusterPartitionMBean.java 2008-07-18 16:59:51.000000000 +0200
++++ jbossas4-4.2.3.GA/cluster/src/main/org/jboss/ha/framework/server/ClusterPartitionMBean.java 2008-11-10 20:16:11.000000000 +0100
@@ -207,7 +207,4 @@
String showHistoryAsXML ();
Modified: trunk/jbossas4/debian/patches/concurrent.diff
===================================================================
--- trunk/jbossas4/debian/patches/concurrent.diff 2008-11-14 21:36:46 UTC (rev 7327)
+++ trunk/jbossas4/debian/patches/concurrent.diff 2008-11-14 22:09:19 UTC (rev 7328)
@@ -1,7 +1,7 @@
-Index: jbossas4-4.2.2.GA/jmx/src/main/javax/management/monitor/Monitor.java
+Index: jbossas4-4.2.3.GA/jmx/src/main/javax/management/monitor/Monitor.java
===================================================================
---- 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
+--- jbossas4-4.2.3.GA.orig/jmx/src/main/javax/management/monitor/Monitor.java 2008-07-18 17:06:30.000000000 +0200
++++ jbossas4-4.2.3.GA/jmx/src/main/javax/management/monitor/Monitor.java 2008-11-10 20:14:55.000000000 +0100
@@ -33,7 +33,7 @@
import org.jboss.mx.util.ObservedObject;
@@ -11,10 +11,10 @@
/**
* The monitor service.
-Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/oil2/OIL2SocketHandler.java
+Index: jbossas4-4.2.3.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 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
+--- jbossas4-4.2.3.GA.orig/messaging/src/main/org/jboss/mq/il/oil2/OIL2SocketHandler.java 2008-07-18 17:08:01.000000000 +0200
++++ jbossas4-4.2.3.GA/messaging/src/main/org/jboss/mq/il/oil2/OIL2SocketHandler.java 2008-11-10 20:14:55.000000000 +0100
@@ -29,7 +29,7 @@
import org.jboss.logging.Logger;
@@ -24,10 +24,10 @@
import EDU.oswego.cs.dl.util.concurrent.LinkedQueue;
import EDU.oswego.cs.dl.util.concurrent.PooledExecutor;
import EDU.oswego.cs.dl.util.concurrent.Slot;
-Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/uil2/SocketManager.java
+Index: jbossas4-4.2.3.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 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
+--- jbossas4-4.2.3.GA.orig/messaging/src/main/org/jboss/mq/il/uil2/SocketManager.java 2008-07-18 17:08:02.000000000 +0200
++++ jbossas4-4.2.3.GA/messaging/src/main/org/jboss/mq/il/uil2/SocketManager.java 2008-11-10 20:14:55.000000000 +0100
@@ -35,7 +35,7 @@
import org.jboss.util.stream.NotifyingBufferedInputStream;
import org.jboss.util.stream.NotifyingBufferedOutputStream;
@@ -37,10 +37,10 @@
import EDU.oswego.cs.dl.util.concurrent.LinkedQueue;
import EDU.oswego.cs.dl.util.concurrent.PooledExecutor;
import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean;
-Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/pm/TxManager.java
+Index: jbossas4-4.2.3.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 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
+--- jbossas4-4.2.3.GA.orig/messaging/src/main/org/jboss/mq/pm/TxManager.java 2008-07-18 17:08:00.000000000 +0200
++++ jbossas4-4.2.3.GA/messaging/src/main/org/jboss/mq/pm/TxManager.java 2008-11-10 20:14:55.000000000 +0100
@@ -33,8 +33,8 @@
import org.jboss.mq.Recoverable;
import org.jboss.mq.SpyJMSException;
@@ -52,17 +52,17 @@
/**
* This class allows provides the base for user supplied persistence packages.
-@@ -476,4 +476,4 @@
+@@ -493,4 +493,4 @@
return txids.isEmpty();
}
}
-}
\ No newline at end of file
+}
-Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/pm/none/PersistenceManager.java
+Index: jbossas4-4.2.3.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 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
+--- jbossas4-4.2.3.GA.orig/messaging/src/main/org/jboss/mq/pm/none/PersistenceManager.java 2008-07-18 17:07:59.000000000 +0200
++++ jbossas4-4.2.3.GA/messaging/src/main/org/jboss/mq/pm/none/PersistenceManager.java 2008-11-10 20:14:55.000000000 +0100
@@ -33,7 +33,7 @@
import org.jboss.mq.server.MessageReference;
import org.jboss.system.ServiceMBeanSupport;
@@ -72,10 +72,10 @@
import EDU.oswego.cs.dl.util.concurrent.SynchronizedLong;
/**
-Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/BasicQueue.java
+Index: jbossas4-4.2.3.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 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
+--- jbossas4-4.2.3.GA.orig/messaging/src/main/org/jboss/mq/server/BasicQueue.java 2008-07-18 17:07:59.000000000 +0200
++++ jbossas4-4.2.3.GA/messaging/src/main/org/jboss/mq/server/BasicQueue.java 2008-11-10 20:14:55.000000000 +0100
@@ -50,8 +50,8 @@
import org.jboss.util.timeout.Timeout;
import org.jboss.util.timeout.TimeoutTarget;
@@ -87,10 +87,10 @@
/**
* 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
+Index: jbossas4-4.2.3.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 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
+--- jbossas4-4.2.3.GA.orig/server/src/main/org/jboss/invocation/pooled/interfaces/OptimizedObjectInputStream.java 2008-07-18 17:07:36.000000000 +0200
++++ jbossas4-4.2.3.GA/server/src/main/org/jboss/invocation/pooled/interfaces/OptimizedObjectInputStream.java 2008-11-10 20:14:55.000000000 +0100
@@ -32,8 +32,8 @@
import java.util.Map;
import java.util.WeakHashMap;
@@ -120,11 +120,11 @@
}
else
{
-Index: jbossas4-4.2.2.GA/tomcat/src/main/org/jboss/web/tomcat/service/sso/ClusteredSingleSignOn.java
+Index: jbossas4-4.2.3.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 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 @@
+--- jbossas4-4.2.3.GA.orig/tomcat/src/main/org/jboss/web/tomcat/service/sso/ClusteredSingleSignOn.java 2008-07-18 17:02:55.000000000 +0200
++++ jbossas4-4.2.3.GA/tomcat/src/main/org/jboss/web/tomcat/service/sso/ClusteredSingleSignOn.java 2008-11-10 20:14:55.000000000 +0100
+@@ -44,7 +44,7 @@
import org.jboss.web.tomcat.service.JBossWeb;
import org.jboss.web.tomcat.service.session.JBossManager;
@@ -133,17 +133,10 @@
/**
-@@ -1310,4 +1310,4 @@
- return valid;
- }
-
--}
-\ No newline at end of file
-+}
-Index: jbossas4-4.2.2.GA/transaction/src/main/org/jboss/tm/TransactionLocalDelegateImpl.java
+Index: jbossas4-4.2.3.GA/transaction/src/main/org/jboss/tm/TransactionLocalDelegateImpl.java
===================================================================
---- 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
+--- jbossas4-4.2.3.GA.orig/transaction/src/main/org/jboss/tm/TransactionLocalDelegateImpl.java 2008-07-18 17:02:52.000000000 +0200
++++ jbossas4-4.2.3.GA/transaction/src/main/org/jboss/tm/TransactionLocalDelegateImpl.java 2008-11-10 20:14:55.000000000 +0100
@@ -33,7 +33,7 @@
import org.jboss.util.NestedRuntimeException;
@@ -153,10 +146,10 @@
import EDU.oswego.cs.dl.util.concurrent.ReentrantLock;
/**
-Index: jbossas4-4.2.2.GA/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java
+Index: jbossas4-4.2.3.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 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
+--- jbossas4-4.2.3.GA.orig/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java 2008-07-18 17:06:53.000000000 +0200
++++ jbossas4-4.2.3.GA/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java 2008-11-10 20:14:55.000000000 +0100
@@ -30,7 +30,7 @@
import org.jboss.mx.loading.LoaderRepository;
import org.jboss.mx.loading.RepositoryClassLoader;
@@ -177,10 +170,10 @@
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
+Index: jbossas4-4.2.3.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 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
+--- jbossas4-4.2.3.GA.orig/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java 2008-07-18 16:59:51.000000000 +0200
++++ jbossas4-4.2.3.GA/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java 2008-11-10 20:14:55.000000000 +0100
@@ -37,7 +37,7 @@
import javax.management.ObjectName;
@@ -203,10 +196,10 @@
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
+Index: jbossas4-4.2.3.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 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
+--- jbossas4-4.2.3.GA.orig/connector/src/main/org/jboss/resource/adapter/jms/JmsResourceAdapter.java 2008-07-18 17:06:09.000000000 +0200
++++ jbossas4-4.2.3.GA/connector/src/main/org/jboss/resource/adapter/jms/JmsResourceAdapter.java 2008-11-10 20:14:55.000000000 +0100
@@ -37,7 +37,7 @@
import org.jboss.resource.adapter.jms.inflow.JmsActivation;
import org.jboss.resource.adapter.jms.inflow.JmsActivationSpec;
@@ -225,10 +218,10 @@
/**
* Get the work manager
-Index: jbossas4-4.2.2.GA/connector/src/main/org/jboss/resource/adapter/mail/MailResourceAdapter.java
+Index: jbossas4-4.2.3.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 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
+--- jbossas4-4.2.3.GA.orig/connector/src/main/org/jboss/resource/adapter/mail/MailResourceAdapter.java 2008-07-18 17:06:08.000000000 +0200
++++ jbossas4-4.2.3.GA/connector/src/main/org/jboss/resource/adapter/mail/MailResourceAdapter.java 2008-11-10 20:14:55.000000000 +0100
@@ -35,7 +35,7 @@
import org.jboss.resource.adapter.mail.inflow.MailActivationSpec;
import org.jboss.resource.adapter.mail.inflow.NewMsgsWorker;
@@ -247,11 +240,11 @@
/** */
private NewMsgsWorker newMsgsWorker;
-Index: jbossas4-4.2.2.GA/connector/src/main/org/jboss/resource/connectionmanager/JBossManagedConnectionPool.java
+Index: jbossas4-4.2.3.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 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 @@
+--- jbossas4-4.2.3.GA.orig/connector/src/main/org/jboss/resource/connectionmanager/JBossManagedConnectionPool.java 2008-07-18 17:06:11.000000000 +0200
++++ jbossas4-4.2.3.GA/connector/src/main/org/jboss/resource/connectionmanager/JBossManagedConnectionPool.java 2008-11-10 20:14:55.000000000 +0100
+@@ -55,7 +55,7 @@
import org.jboss.system.ServiceMBeanSupport;
import org.jboss.tm.TransactionLocal;
@@ -260,8 +253,8 @@
/**
* The JBossManagedConnectionPool mbean configures and supplies pooling of
-@@ -409,7 +409,7 @@
- public abstract static class BasePool implements ManagedConnectionPool, PreFillPoolSupport
+@@ -484,7 +484,7 @@
+ public abstract static class BasePool implements ManagedConnectionPool, StatisticsReporter, PreFillPoolSupport
{
/** The subpools */
- private final Map subPools = new ConcurrentReaderHashMap();
@@ -269,10 +262,10 @@
/** The managed connection factory */
private final ManagedConnectionFactory mcf;
-Index: jbossas4-4.2.2.GA/connector/src/main/org/jboss/resource/metadata/ConnectorMetaData.java
+Index: jbossas4-4.2.3.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 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
+--- jbossas4-4.2.3.GA.orig/connector/src/main/org/jboss/resource/metadata/ConnectorMetaData.java 2008-07-18 17:06:10.000000000 +0200
++++ jbossas4-4.2.3.GA/connector/src/main/org/jboss/resource/metadata/ConnectorMetaData.java 2008-11-10 20:14:55.000000000 +0100
@@ -25,7 +25,7 @@
import java.util.Iterator;
import java.util.Locale;
@@ -291,10 +284,10 @@
/** The connection definitions */
private HashSet connectionDefinitions = new HashSet();
-Index: jbossas4-4.2.2.GA/connector/src/main/org/jboss/resource/metadata/DescriptionMetaDataContainer.java
+Index: jbossas4-4.2.3.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 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
+--- jbossas4-4.2.3.GA.orig/connector/src/main/org/jboss/resource/metadata/DescriptionMetaDataContainer.java 2008-07-18 17:06:10.000000000 +0200
++++ jbossas4-4.2.3.GA/connector/src/main/org/jboss/resource/metadata/DescriptionMetaDataContainer.java 2008-11-10 20:14:55.000000000 +0100
@@ -26,7 +26,7 @@
import java.util.Iterator;
import java.util.Locale;
@@ -313,10 +306,10 @@
public DescriptionMetaDataContainer()
{
-Index: jbossas4-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/statistics/InvocationStatistics.java
+Index: jbossas4-4.2.3.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 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
+--- jbossas4-4.2.3.GA.orig/ejb3/src/main/org/jboss/ejb3/statistics/InvocationStatistics.java 2008-07-18 17:00:56.000000000 +0200
++++ jbossas4-4.2.3.GA/ejb3/src/main/org/jboss/ejb3/statistics/InvocationStatistics.java 2008-11-10 20:14:55.000000000 +0100
@@ -27,7 +27,7 @@
import java.util.Iterator;
import java.util.Map;
@@ -335,10 +328,10 @@
}
/** 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
+Index: jbossas4-4.2.3.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 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
+--- jbossas4-4.2.3.GA.orig/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapter.java 2008-07-18 17:00:05.000000000 +0200
++++ jbossas4-4.2.3.GA/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapter.java 2008-11-10 20:14:55.000000000 +0100
@@ -38,7 +38,7 @@
import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.mx.util.ObjectNameFactory;
@@ -357,10 +350,10 @@
public TestResourceAdapterInflowResults testInflow() throws Exception
{
-Index: jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/LoaderRepository.java
+Index: jbossas4-4.2.3.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 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
+--- jbossas4-4.2.3.GA.orig/jmx/src/main/org/jboss/mx/loading/LoaderRepository.java 2008-07-18 17:06:26.000000000 +0200
++++ jbossas4-4.2.3.GA/jmx/src/main/org/jboss/mx/loading/LoaderRepository.java 2008-11-10 20:14:55.000000000 +0100
@@ -21,7 +21,7 @@
*/
package org.jboss.mx.loading;
@@ -379,10 +372,10 @@
/**
-Index: jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/RepositoryClassLoader.java
+Index: jbossas4-4.2.3.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 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
+--- jbossas4-4.2.3.GA.orig/jmx/src/main/org/jboss/mx/loading/RepositoryClassLoader.java 2008-07-18 17:06:26.000000000 +0200
++++ jbossas4-4.2.3.GA/jmx/src/main/org/jboss/mx/loading/RepositoryClassLoader.java 2008-11-10 20:14:55.000000000 +0100
@@ -46,7 +46,7 @@
import org.jboss.util.collection.SoftSet;
@@ -401,10 +394,10 @@
/** Lock */
protected ReentrantLock loadLock = new ReentrantLock();
-Index: jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepository3.java
+Index: jbossas4-4.2.3.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 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
+--- jbossas4-4.2.3.GA.orig/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepository3.java 2008-07-18 17:06:26.000000000 +0200
++++ jbossas4-4.2.3.GA/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepository3.java 2008-11-10 20:14:55.000000000 +0100
@@ -49,8 +49,8 @@
import org.jboss.logging.Logger;
import org.jboss.mx.util.JBossNotificationBroadcasterSupport;
@@ -434,10 +427,10 @@
/** A HashMap<UCL, String[]> of class loaders to the array of pckages names
* they serve
-Index: jbossas4-4.2.2.GA/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java
+Index: jbossas4-4.2.3.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 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
+--- jbossas4-4.2.3.GA.orig/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java 2008-07-18 17:06:25.000000000 +0200
++++ jbossas4-4.2.3.GA/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java 2008-11-10 20:14:55.000000000 +0100
@@ -49,7 +49,7 @@
import javax.management.modelmbean.ModelMBeanInfo;
import javax.management.modelmbean.RequiredModelMBean;
@@ -469,10 +462,10 @@
-}
\ No newline at end of file
+}
-Index: jbossas4-4.2.2.GA/management/src/main/org/jboss/management/j2ee/factory/EJBModuleFactory.java
+Index: jbossas4-4.2.3.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 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
+--- jbossas4-4.2.3.GA.orig/management/src/main/org/jboss/management/j2ee/factory/EJBModuleFactory.java 2008-07-18 17:07:52.000000000 +0200
++++ jbossas4-4.2.3.GA/management/src/main/org/jboss/management/j2ee/factory/EJBModuleFactory.java 2008-11-10 20:14:55.000000000 +0100
@@ -35,7 +35,7 @@
import org.jboss.metadata.BeanMetaData;
import org.jboss.metadata.SessionMetaData;
@@ -495,10 +488,10 @@
static ObjectName getEJBModuleName(ObjectName ejbModuleService)
{
-Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/SpyXAResourceManager.java
+Index: jbossas4-4.2.3.GA/messaging/src/main/org/jboss/mq/SpyXAResourceManager.java
===================================================================
---- 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
+--- jbossas4-4.2.3.GA.orig/messaging/src/main/org/jboss/mq/SpyXAResourceManager.java 2008-07-18 17:08:03.000000000 +0200
++++ jbossas4-4.2.3.GA/messaging/src/main/org/jboss/mq/SpyXAResourceManager.java 2008-11-10 20:14:55.000000000 +0100
@@ -25,7 +25,7 @@
import java.util.Map;
import java.util.ArrayList;
@@ -517,10 +510,10 @@
/** The next xid */
private long nextInternalXid = Long.MIN_VALUE;
-Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/ClientMonitorInterceptor.java
+Index: jbossas4-4.2.3.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 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
+--- jbossas4-4.2.3.GA.orig/messaging/src/main/org/jboss/mq/server/ClientMonitorInterceptor.java 2008-07-18 17:07:59.000000000 +0200
++++ jbossas4-4.2.3.GA/messaging/src/main/org/jboss/mq/server/ClientMonitorInterceptor.java 2008-11-10 20:14:55.000000000 +0100
@@ -39,7 +39,7 @@
import org.jboss.mq.TransactionRequest;
import org.jboss.mq.il.jvm.JVMClientIL;
@@ -539,10 +532,10 @@
private static class ClientStats
{
-Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/JMSDestinationManager.java
+Index: jbossas4-4.2.3.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 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
+--- jbossas4-4.2.3.GA.orig/messaging/src/main/org/jboss/mq/server/JMSDestinationManager.java 2008-07-18 17:07:59.000000000 +0200
++++ jbossas4-4.2.3.GA/messaging/src/main/org/jboss/mq/server/JMSDestinationManager.java 2008-11-10 20:14:55.000000000 +0100
@@ -56,7 +56,7 @@
import org.jboss.util.threadpool.ThreadPool;
import org.jboss.util.timeout.TimeoutFactory;
@@ -574,10 +567,10 @@
/** last id given to a client */
private int lastID = 1;
-Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/server/JMSTopic.java
+Index: jbossas4-4.2.3.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 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
+--- jbossas4-4.2.3.GA.orig/messaging/src/main/org/jboss/mq/server/JMSTopic.java 2008-07-18 17:07:59.000000000 +0200
++++ jbossas4-4.2.3.GA/messaging/src/main/org/jboss/mq/server/JMSTopic.java 2008-11-10 20:14:55.000000000 +0100
@@ -39,7 +39,7 @@
import org.jboss.mq.pm.PersistenceManager;
import org.jboss.mq.pm.Tx;
@@ -598,10 +591,10 @@
public JMSTopic(SpyDestination dest, ClientConsumer temporary, JMSDestinationManager server, BasicQueueParameters parameters) throws JMSException
{
-Index: jbossas4-4.2.2.GA/security/src/main/org/jboss/security/jacc/DelegatingPolicy.java
+Index: jbossas4-4.2.3.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 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
+--- jbossas4-4.2.3.GA.orig/security/src/main/org/jboss/security/jacc/DelegatingPolicy.java 2008-07-18 17:07:47.000000000 +0200
++++ jbossas4-4.2.3.GA/security/src/main/org/jboss/security/jacc/DelegatingPolicy.java 2008-11-10 20:14:55.000000000 +0100
@@ -40,7 +40,7 @@
import javax.security.auth.Subject;
@@ -626,10 +619,10 @@
/**
* Flag indicating if our category is at trace level for logging
*/
-Index: jbossas4-4.2.2.GA/security/src/main/org/jboss/security/jacc/JBossPolicyConfigurationFactory.java
+Index: jbossas4-4.2.3.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 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
+--- jbossas4-4.2.3.GA.orig/security/src/main/org/jboss/security/jacc/JBossPolicyConfigurationFactory.java 2008-07-18 17:07:46.000000000 +0200
++++ jbossas4-4.2.3.GA/security/src/main/org/jboss/security/jacc/JBossPolicyConfigurationFactory.java 2008-11-10 20:14:55.000000000 +0100
@@ -27,7 +27,7 @@
import javax.security.jacc.PolicyConfiguration;
import javax.security.jacc.PolicyContextException;
@@ -648,10 +641,10 @@
private DelegatingPolicy policy;
/** Build the JACC policy configuration state machine from the
-Index: jbossas4-4.2.2.GA/security/src/main/org/jboss/security/plugins/JaasSecurityManagerService.java
+Index: jbossas4-4.2.3.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 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
+--- jbossas4-4.2.3.GA.orig/security/src/main/org/jboss/security/plugins/JaasSecurityManagerService.java 2008-07-18 17:07:46.000000000 +0200
++++ jbossas4-4.2.3.GA/security/src/main/org/jboss/security/plugins/JaasSecurityManagerService.java 2008-11-10 20:14:55.000000000 +0100
@@ -63,7 +63,7 @@
import org.jboss.system.ServiceMBeanSupport;
import org.jboss.util.CachePolicy;
@@ -670,10 +663,10 @@
private static NameParser parser;
/** A flag indicating if the SecurityAssociation.setServer should be called */
private boolean serverMode = true;
-Index: jbossas4-4.2.2.GA/server/src/main/org/jboss/deployment/EARDeployment.java
+Index: jbossas4-4.2.3.GA/server/src/main/org/jboss/deployment/EARDeployment.java
===================================================================
---- 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
+--- jbossas4-4.2.3.GA.orig/server/src/main/org/jboss/deployment/EARDeployment.java 2008-07-18 17:07:20.000000000 +0200
++++ jbossas4-4.2.3.GA/server/src/main/org/jboss/deployment/EARDeployment.java 2008-11-10 20:14:55.000000000 +0100
@@ -28,7 +28,7 @@
import org.jboss.mx.util.ObjectNameFactory;
import org.jboss.system.ServiceMBeanSupport;
@@ -692,10 +685,10 @@
// Static --------------------------------------------------------
-Index: jbossas4-4.2.2.GA/server/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceCache.java
+Index: jbossas4-4.2.3.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 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
+--- jbossas4-4.2.3.GA.orig/server/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceCache.java 2008-07-18 17:07:32.000000000 +0200
++++ jbossas4-4.2.3.GA/server/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceCache.java 2008-11-10 20:14:55.000000000 +0100
@@ -33,7 +33,7 @@
import org.jboss.ejb.EnterpriseContext;
import org.jboss.ejb.StatefulSessionEnterpriseContext;
@@ -721,10 +714,10 @@
-}
\ No newline at end of file
+}
-Index: jbossas4-4.2.2.GA/server/src/main/org/jboss/invocation/InvocationStatistics.java
+Index: jbossas4-4.2.3.GA/server/src/main/org/jboss/invocation/InvocationStatistics.java
===================================================================
---- 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
+--- jbossas4-4.2.3.GA.orig/server/src/main/org/jboss/invocation/InvocationStatistics.java 2008-07-18 17:07:37.000000000 +0200
++++ jbossas4-4.2.3.GA/server/src/main/org/jboss/invocation/InvocationStatistics.java 2008-11-10 20:14:55.000000000 +0100
@@ -27,7 +27,7 @@
import java.util.Iterator;
import java.util.Map;
@@ -743,20 +736,20 @@
}
/** 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
+Index: jbossas4-4.2.3.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 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;
+--- jbossas4-4.2.3.GA.orig/server/src/main/org/jboss/invocation/pooled/interfaces/PooledInvokerProxy.java 2008-07-18 17:07:36.000000000 +0200
++++ jbossas4-4.2.3.GA/server/src/main/org/jboss/invocation/pooled/interfaces/PooledInvokerProxy.java 2008-11-10 20:14:55.000000000 +0100
+@@ -56,7 +56,7 @@
import org.jboss.tm.TransactionPropagationContextFactory;
+ import org.jboss.tm.TransactionPropagationContextUtil;
import org.jboss.logging.Logger;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
/**
-@@ -117,7 +117,7 @@
+@@ -99,7 +99,7 @@
public static int MAX_RETRIES = 10;
/** A class wide pool Map<ServerAddres, LinkedList<ClientSocket>> */
@@ -765,10 +758,10 @@
/**
* connection information
-Index: jbossas4-4.2.2.GA/server/src/main/org/jboss/metadata/BeanMetaData.java
+Index: jbossas4-4.2.3.GA/server/src/main/org/jboss/metadata/BeanMetaData.java
===================================================================
---- 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
+--- jbossas4-4.2.3.GA.orig/server/src/main/org/jboss/metadata/BeanMetaData.java 2008-07-18 17:07:20.000000000 +0200
++++ jbossas4-4.2.3.GA/server/src/main/org/jboss/metadata/BeanMetaData.java 2008-11-10 20:14:55.000000000 +0100
@@ -40,7 +40,7 @@
import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
import org.w3c.dom.Element;
@@ -794,10 +787,10 @@
/** The assembly-descriptor/exclude-list method(s) */
private ArrayList excludedMethods = new ArrayList();
/** The invoker names to JNDI name mapping */
-Index: jbossas4-4.2.2.GA/server/src/main/org/jboss/web/WebServer.java
+Index: jbossas4-4.2.3.GA/server/src/main/org/jboss/web/WebServer.java
===================================================================
---- 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
+--- jbossas4-4.2.3.GA.orig/server/src/main/org/jboss/web/WebServer.java 2008-07-18 17:07:38.000000000 +0200
++++ jbossas4-4.2.3.GA/server/src/main/org/jboss/web/WebServer.java 2008-11-10 20:14:55.000000000 +0100
@@ -39,7 +39,7 @@
import org.jboss.util.threadpool.BasicThreadPool;
import org.jboss.util.threadpool.BasicThreadPoolMBean;
@@ -816,10 +809,10 @@
/**
* The web server http listening socket
-Index: jbossas4-4.2.2.GA/system/src/main/org/jboss/deployment/SARDeployer.java
+Index: jbossas4-4.2.3.GA/system/src/main/org/jboss/deployment/SARDeployer.java
===================================================================
---- 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
+--- jbossas4-4.2.3.GA.orig/system/src/main/org/jboss/deployment/SARDeployer.java 2008-07-18 17:02:35.000000000 +0200
++++ jbossas4-4.2.3.GA/system/src/main/org/jboss/deployment/SARDeployer.java 2008-11-10 20:14:55.000000000 +0100
@@ -60,7 +60,7 @@
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
@@ -838,10 +831,10 @@
/** A flag indicating if the parser used for the service descriptor should be configured for namespaces */
private boolean useNamespaceAwareParser;
-Index: jbossas4-4.2.2.GA/system/src/main/org/jboss/system/Registry.java
+Index: jbossas4-4.2.3.GA/system/src/main/org/jboss/system/Registry.java
===================================================================
---- 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
+--- jbossas4-4.2.3.GA.orig/system/src/main/org/jboss/system/Registry.java 2008-07-18 17:02:37.000000000 +0200
++++ jbossas4-4.2.3.GA/system/src/main/org/jboss/system/Registry.java 2008-11-10 20:14:55.000000000 +0100
@@ -25,7 +25,7 @@
import org.jboss.logging.Logger;
@@ -860,10 +853,10 @@
public static void bind(final Object key, final Object value)
{
-Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/fs/FSDirContextAdaptor.java
+Index: jbossas4-4.2.3.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 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
+--- jbossas4-4.2.3.GA.orig/testsuite/src/main/org/jboss/test/jca/fs/FSDirContextAdaptor.java 2008-07-18 17:03:15.000000000 +0200
++++ jbossas4-4.2.3.GA/testsuite/src/main/org/jboss/test/jca/fs/FSDirContextAdaptor.java 2008-11-10 20:14:55.000000000 +0100
@@ -31,7 +31,7 @@
import javax.transaction.xa.XAResource;
@@ -882,10 +875,10 @@
/**
* Get the work manager
-Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jca/inflow/TestResourceAdapter.java
+Index: jbossas4-4.2.3.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 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
+--- jbossas4-4.2.3.GA.orig/testsuite/src/main/org/jboss/test/jca/inflow/TestResourceAdapter.java 2008-07-18 17:03:17.000000000 +0200
++++ jbossas4-4.2.3.GA/testsuite/src/main/org/jboss/test/jca/inflow/TestResourceAdapter.java 2008-11-10 20:14:55.000000000 +0100
@@ -38,7 +38,7 @@
import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.mx.util.ObjectNameFactory;
@@ -904,10 +897,10 @@
public TestResourceAdapterInflowResults testInflow() throws Exception
{
-Index: jbossas4-4.2.2.GA/tomcat/src/main/org/jboss/web/tomcat/statistics/ReplicationStatistics.java
+Index: jbossas4-4.2.3.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 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
+--- jbossas4-4.2.3.GA.orig/tomcat/src/main/org/jboss/web/tomcat/statistics/ReplicationStatistics.java 2008-07-18 17:02:56.000000000 +0200
++++ jbossas4-4.2.3.GA/tomcat/src/main/org/jboss/web/tomcat/statistics/ReplicationStatistics.java 2008-11-10 20:14:55.000000000 +0100
@@ -25,7 +25,7 @@
import java.util.HashMap;
import java.util.Iterator;
@@ -935,10 +928,10 @@
}
public void updatePassivationStats(String ctx, long elapsed)
-Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/deployers/rar/mcf1/MCF1ManagedConnection.java
+Index: jbossas4-4.2.3.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 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
+--- jbossas4-4.2.3.GA.orig/testsuite/src/main/org/jboss/test/deployers/rar/mcf1/MCF1ManagedConnection.java 2008-07-18 17:03:20.000000000 +0200
++++ jbossas4-4.2.3.GA/testsuite/src/main/org/jboss/test/deployers/rar/mcf1/MCF1ManagedConnection.java 2008-11-10 20:14:55.000000000 +0100
@@ -34,7 +34,7 @@
import javax.security.auth.Subject;
import javax.transaction.xa.XAResource;
@@ -948,10 +941,10 @@
import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean;
public class MCF1ManagedConnection implements ManagedConnection, LocalTransaction
-Index: jbossas4-4.2.2.GA/testsuite/src/main/org/jboss/test/jcaprops/support/PropertyTestManagedConnection.java
+Index: jbossas4-4.2.3.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 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
+--- jbossas4-4.2.3.GA.orig/testsuite/src/main/org/jboss/test/jcaprops/support/PropertyTestManagedConnection.java 2008-07-18 17:03:06.000000000 +0200
++++ jbossas4-4.2.3.GA/testsuite/src/main/org/jboss/test/jcaprops/support/PropertyTestManagedConnection.java 2008-11-10 20:14:55.000000000 +0100
@@ -34,7 +34,7 @@
import javax.security.auth.Subject;
import javax.transaction.xa.XAResource;
@@ -961,10 +954,10 @@
import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean;
/**
-Index: jbossas4-4.2.2.GA/messaging/src/main/org/jboss/mq/il/uil2/UILServerILService.java
+Index: jbossas4-4.2.3.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 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
+--- jbossas4-4.2.3.GA.orig/messaging/src/main/org/jboss/mq/il/uil2/UILServerILService.java 2008-07-18 17:08:02.000000000 +0200
++++ jbossas4-4.2.3.GA/messaging/src/main/org/jboss/mq/il/uil2/UILServerILService.java 2008-11-10 20:14:55.000000000 +0100
@@ -41,7 +41,7 @@
import org.jboss.security.SecurityDomain;
import org.jboss.system.server.ServerConfigUtil;
@@ -974,10 +967,10 @@
import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean;
/** 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
+Index: jbossas4-4.2.3.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 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
+--- jbossas4-4.2.3.GA.orig/system/src/tests/org/jboss/test/system/controller/SimpleSARDeployer.java 2008-07-18 17:02:34.000000000 +0200
++++ jbossas4-4.2.3.GA/system/src/tests/org/jboss/test/system/controller/SimpleSARDeployer.java 2008-11-10 20:14:55.000000000 +0100
@@ -41,7 +41,7 @@
import org.w3c.dom.Element;
import org.xml.sax.InputSource;
Modified: trunk/jbossas4/debian/patches/series
===================================================================
--- trunk/jbossas4/debian/patches/series 2008-11-14 21:36:46 UTC (rev 7327)
+++ trunk/jbossas4/debian/patches/series 2008-11-14 22:09:19 UTC (rev 7328)
@@ -4,8 +4,6 @@
collection.diff
concurrent.diff
marshaller.diff
-DummyServiceRef.diff
cluster_debugger.diff
catch_exception.diff
deployers.diff
-webservice.diff
Deleted: trunk/jbossas4/debian/patches/webservice.diff
===================================================================
--- trunk/jbossas4/debian/patches/webservice.diff 2008-11-14 21:36:46 UTC (rev 7327)
+++ trunk/jbossas4/debian/patches/webservice.diff 2008-11-14 22:09:19 UTC (rev 7328)
@@ -1,22 +0,0 @@
-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-11-14 21:36:46 UTC (rev 7327)
+++ trunk/jbossas4/debian/rules 2008-11-14 22:09:19 UTC (rev 7328)
@@ -4,7 +4,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-JAVA_HOME := /usr/lib/jvm/java-gcj
+JAVA_HOME := /usr/lib/jvm/java-6-openjdk
DEB_ANT_BUILD_TARGET := jar
DEB_ANT_BUILDFILE := debian/build.xml
DEB_JARS := jboss-common junit log4j-1.2 jboss-profiler ant-junit commons-httpclient \
@@ -13,7 +13,8 @@
javacc jboss-serialization jboss-microcontainer quartz ant-nodeps trove \
jboss-remoting jboss-aop jgroups-all jbossws-common jbossws-spi jbossws-native\
jboss-reflect jboss-cache1 hibernate3 hibernate-annotations \
- hibernate-entitymanager commons-logging bsh jboss-vfs
+ hibernate-entitymanager commons-logging bsh jboss-vfs \
+ jboss-managed.jar
ALL_JARS = $(wildcard *.jar)
DEST_DIR = $(DEB_DESTDIR)/usr/share/java
More information about the pkg-java-commits
mailing list