[jboss-cvs] JBossAS SVN: r63931 - in branches/Branch_4_2: ejb3 and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jul 10 06:42:15 EDT 2007
Author: dimitris at jboss.org
Date: 2007-07-10 06:42:14 -0400 (Tue, 10 Jul 2007)
New Revision: 63931
Modified:
branches/Branch_4_2/build/build-distr.xml
branches/Branch_4_2/build/build-thirdparty.xml
branches/Branch_4_2/ejb3/build.xml
branches/Branch_4_2/iiop/src/main/org/jboss/iiop/csiv2/CSIv2Util.java
branches/Branch_4_2/server/.classpath
branches/Branch_4_2/server/build.xml
branches/Branch_4_2/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java
branches/Branch_4_2/testsuite/src/main/org/jboss/test/tm/ejb/TxTimeoutBean.java
branches/Branch_4_2/tomcat/build.xml
branches/Branch_4_2/varia/src/resources/services/snmp/deploy/attributes.mib
Log:
revert jbossws-2.0.0.GA upgrade
Modified: branches/Branch_4_2/build/build-distr.xml
===================================================================
--- branches/Branch_4_2/build/build-distr.xml 2007-07-10 10:10:46 UTC (rev 63930)
+++ branches/Branch_4_2/build/build-distr.xml 2007-07-10 10:42:14 UTC (rev 63931)
@@ -1446,12 +1446,12 @@
<!-- copy thirdparty items to client dir -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
- <fileset dir="${apache.httpclient.lib}">
- <include name="commons-httpclient.jar"/>
+ <fileset dir="${jboss.remoting.lib}">
+ <include name="jboss-remoting.jar"/>
+ </fileset>
+ <fileset dir="${sun.jaf.lib}">
+ <include name="activation.jar"/>
</fileset>
- <fileset dir="${apache.codec.lib}">
- <include name="commons-codec.jar"/>
- </fileset>
<fileset dir="${apache.logging.lib}">
<include name="commons-logging.jar"/>
</fileset>
@@ -1464,49 +1464,43 @@
<fileset dir="${javassist.javassist.lib}">
<include name="javassist.jar"/>
</fileset>
- <fileset dir="${jboss.remoting.lib}">
- <include name="jboss-remoting.jar"/>
- </fileset>
<fileset dir="${jboss.serialization.lib}">
<include name="jboss-serialization.jar"/>
</fileset>
- <fileset dir="${jboss.common.lib}">
- <include name="jboss-common-client.jar"/>
+ <fileset dir="${sun.javamail.lib}">
+ <include name="mail.jar"/>
</fileset>
- <fileset dir="${jboss.jbossws.lib}">
- <include name="jbossws-client.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
+ <fileset dir="${apache.httpclient.lib}">
+ <include name="commons-httpclient.jar"/>
</fileset>
- <fileset dir="${jboss.jbossws.jboss42.lib}">
- <include name="jbossws-jboss42.jar"/>
+ <fileset dir="${apache.codec.lib}">
+ <include name="commons-codec.jar"/>
</fileset>
- <fileset dir="${jboss.jbossws.spi.lib}">
- <include name="jbossws-spi.jar"/>
+ <fileset dir="${jboss.common.lib}">
+ <include name="jboss-common-client.jar"/>
</fileset>
<fileset dir="${jboss.jbossxb.lib}">
<include name="jboss-xml-binding.jar"/>
</fileset>
- <fileset dir="${sun.jaf.lib}">
- <include name="activation.jar"/>
- </fileset>
- <fileset dir="${sun.javamail.lib}">
- <include name="mail.jar"/>
- </fileset>
<fileset dir="${sun.jaxb.lib}">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
<include name="jaxb-xjc.jar"/>
</fileset>
+ <fileset dir="${jboss.jbossws.lib}">
+ <include name="jbossws-client.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
<fileset dir="${stax.api.lib}">
<include name="stax-api.jar"/>
</fileset>
<fileset dir="${woodstox.woodstox.lib}">
<include name="wstx.jar"/>
</fileset>
- <fileset dir="${wscommons.policy.lib}">
- <include name="policy.jar"/>
+ <fileset dir="${jboss.jbossws.wsconsume.impl.lib}">
+ <include name="jbossws-wsconsume-impl.jar"/>
</fileset>
</copy>
@@ -1528,12 +1522,11 @@
<fileset dir="${javassist.javassist.lib}">
<include name="javassist.jar"/>
</fileset>
- <fileset dir="${jboss.jbossws.jboss42.lib}">
- <include name="jbossws-jboss42.jar"/>
+ <fileset dir="${jboss.jbossws.lib}">
+ <include name="jbossws-integration.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-saaj.jar"/>
</fileset>
- <fileset dir="${jboss.jbossws.spi.lib}">
- <include name="jbossws-spi.jar"/>
- </fileset>
<fileset dir="${apache.httpclient.lib}">
<include name="commons-httpclient.jar"/>
</fileset>
@@ -1560,13 +1553,20 @@
<fileset dir="${quartz.quartz.lib}" includes="quartz.jar"/>
</copy>
- <!-- Install jbossws tools shell scripts -->
- <unzip dest="${install.bin}" src="${jboss.jbossws.spi.lib}/jbossws-spi-scripts.zip"/>
- <unzip dest="${install.bin}" src="${jboss.jbossws.lib}/jbossws-core-scripts.zip"/>
+ <!-- install thirdparty items to install/bin -->
+ <!-- install wstools shell scripts -->
+ <unzip dest="${install.bin}" src="${jboss.jbossws.lib}/jbossws-client.jar">
+ <patternset>
+ <include name="wstools.*"/>
+ <include name="wsconsume.*"/>
+ <include name="wsprovide.*"/>
+ <include name="wsrunclient.*"/>
+ </patternset>
+ </unzip>
<!-- Install JBossWS -->
<mkdir dir="${install.all.deploy}/jbossws.sar"/>
- <unjar dest="${install.all.deploy}/jbossws.sar" src="${jboss.jbossws.native42.lib}/jbossws-native42.sar"/>
+ <unjar dest="${install.all.deploy}/jbossws.sar" src="${jboss.jbossws.jboss42.lib}/jbossws42.sar"/>
<!-- This is executed last, so make executable all bin/*.sh scripts -->
<chmod perm="+x">
Modified: branches/Branch_4_2/build/build-thirdparty.xml
===================================================================
--- branches/Branch_4_2/build/build-thirdparty.xml 2007-07-10 10:10:46 UTC (rev 63930)
+++ branches/Branch_4_2/build/build-thirdparty.xml 2007-07-10 10:42:14 UTC (rev 63931)
@@ -85,8 +85,7 @@
<componentref name="jboss/dom4j-jarjar" version="1.6.1"/>
<componentref name="jboss/jaxr" version="1.2.0.GA"/>
<componentref name="jboss/jbossts14" version="4.2.3.SP5-brew"/>
- <componentref name="jboss/jbossws-jboss42" version="2.0.0.GA"/>
- <componentref name="jboss/jbossws-native42" version="2.0.0.GA"/>
+ <componentref name="jboss/jbossws-jboss42" version="1.2.1.GA"/>
<componentref name="jboss/jbossxb" version="1.0.0.GA-brew"/>
<componentref name="jboss/microcontainer" version="1.0.2"/>
<componentref name="jboss/profiler/jvmti" version="1.0.0.CR5-brew"/>
Modified: branches/Branch_4_2/ejb3/build.xml
===================================================================
--- branches/Branch_4_2/ejb3/build.xml 2007-07-10 10:10:46 UTC (rev 63930)
+++ branches/Branch_4_2/ejb3/build.xml 2007-07-10 10:42:14 UTC (rev 63931)
@@ -97,7 +97,6 @@
<path refid="jboss.microcontainer.classpath"/>
<!--path refid="jboss.jboss.vfs.classpath"/-->
<path refid="quartz.quartz.classpath"/>
- <path refid="jboss.jbossws.spi.classpath"/>
<path refid="jboss.jbossws.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
<path refid="jacorb.jacorb.classpath"/>
Modified: branches/Branch_4_2/iiop/src/main/org/jboss/iiop/csiv2/CSIv2Util.java
===================================================================
--- branches/Branch_4_2/iiop/src/main/org/jboss/iiop/csiv2/CSIv2Util.java 2007-07-10 10:10:46 UTC (rev 63930)
+++ branches/Branch_4_2/iiop/src/main/org/jboss/iiop/csiv2/CSIv2Util.java 2007-07-10 10:42:14 UTC (rev 63931)
@@ -325,7 +325,7 @@
AS_ContextSec context = null;
// the content of the context
- int support = EstablishTrustInClient.value; // per default support this
+ int support = 0;
int require = 0;
byte[] clientAuthMech = {};
byte[] targetName = {};
Modified: branches/Branch_4_2/server/.classpath
===================================================================
--- branches/Branch_4_2/server/.classpath 2007-07-10 10:10:46 UTC (rev 63930)
+++ branches/Branch_4_2/server/.classpath 2007-07-10 10:42:14 UTC (rev 63931)
@@ -25,7 +25,7 @@
<classpathentry kind="lib" path="/thirdparty/jboss/serialization/lib/jboss-serialization.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jbossws/lib/jboss-jaxrpc.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jbossws/lib/jboss-saaj.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jbossws/lib/jbossws-integration.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/jbossws-spi/lib/jbossws-spi.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: branches/Branch_4_2/server/build.xml
===================================================================
--- branches/Branch_4_2/server/build.xml 2007-07-10 10:10:46 UTC (rev 63930)
+++ branches/Branch_4_2/server/build.xml 2007-07-10 10:42:14 UTC (rev 63931)
@@ -86,7 +86,6 @@
<path refid="gnu.getopt.classpath"/>
<path refid="ibm.wsdl4j.classpath"/>
<path refid="jboss.microcontainer.classpath"/>
- <path refid="jboss.jbossws.spi.classpath"/>
<path refid="jboss.jbossws.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
<path refid="junit.junit.classpath"/>
Modified: branches/Branch_4_2/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java
===================================================================
--- branches/Branch_4_2/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java 2007-07-10 10:10:46 UTC (rev 63930)
+++ branches/Branch_4_2/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java 2007-07-10 10:42:14 UTC (rev 63931)
@@ -25,10 +25,15 @@
import javax.naming.Context;
import javax.naming.NamingException;
+import javax.xml.soap.FactoryLoader;
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.spi.registry.KernelRegistry;
+import org.jboss.kernel.spi.registry.KernelRegistryEntry;
+import org.jboss.logging.Logger;
+import org.jboss.ws.integration.KernelLocator;
import org.jboss.ws.integration.ServiceRefElement;
import org.jboss.ws.integration.ServiceRefHandler;
-import org.jboss.ws.integration.ServiceRefHandlerFactory;
import org.jboss.ws.integration.ServiceRefMetaData;
import org.jboss.ws.integration.UnifiedVirtualFile;
import org.jboss.xb.binding.UnmarshallingContext;
@@ -43,14 +48,32 @@
*/
public class ServiceRefDelegate implements ServiceRefHandler
{
+ // provide logging
+ private static final Logger log = Logger.getLogger(ServiceRefDelegate.class);
+
private static ServiceRefHandler delegate;
public ServiceRefDelegate()
{
if (delegate == null)
{
- delegate = ServiceRefHandlerFactory.getServiceRefHandler();
+ Kernel kernel = KernelLocator.getKernel();
+ if (kernel != null)
+ {
+ KernelRegistry registry = kernel.getRegistry();
+ KernelRegistryEntry entry = registry.getEntry(ServiceRefHandler.BEAN_NAME);
+ delegate = (ServiceRefHandler)entry.getTarget();
+ }
+ else
+ {
+ String propName = ServiceRefHandler.class.getName();
+ String defaultImpl = "org.jboss.ws.core.client.ServiceRefHandlerImpl";
+ delegate = (ServiceRefHandler)FactoryLoader.loadFactory(propName, defaultImpl);
+ }
}
+
+ if (delegate == null)
+ log.warn("Not registered: " + ServiceRefHandler.BEAN_NAME);
}
public ServiceRefMetaData newServiceRefMetaData()
Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/tm/ejb/TxTimeoutBean.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/tm/ejb/TxTimeoutBean.java 2007-07-10 10:10:46 UTC (rev 63930)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/tm/ejb/TxTimeoutBean.java 2007-07-10 10:42:14 UTC (rev 63931)
@@ -30,7 +30,7 @@
import org.jboss.tm.TxUtils;
/**
- * @version $Revision:$
+ * @version $Revision$
*/
public class TxTimeoutBean extends SessionSupport
{
@@ -57,7 +57,7 @@
*/
public void testOverriddenTimeoutExpires()
{
- sleep(7000, false);
+ sleep(6000, false);
int status = getTxStatus();
log.info("testOverriddenTimeoutExpires: " + TxUtils.getStatusAsString(status));
if (TxUtils.isRollback(status) == false)
Modified: branches/Branch_4_2/tomcat/build.xml
===================================================================
--- branches/Branch_4_2/tomcat/build.xml 2007-07-10 10:10:46 UTC (rev 63930)
+++ branches/Branch_4_2/tomcat/build.xml 2007-07-10 10:42:14 UTC (rev 63931)
@@ -57,7 +57,7 @@
<path refid="sun.jsf.classpath"/>
<path refid="apache.commons.classpath"/>
<path refid="apache.log4j.classpath"/>
- <path refid="jboss.jbossws.spi.classpath"/>
+ <path refid="jboss.jbossws.classpath"/>
<path refid="junit.junit.classpath"/>
<path refid="dom4j.dom4j.classpath"/>
<path refid="oswego.concurrent.classpath"/>
Modified: branches/Branch_4_2/varia/src/resources/services/snmp/deploy/attributes.mib
===================================================================
--- branches/Branch_4_2/varia/src/resources/services/snmp/deploy/attributes.mib 2007-07-10 10:10:46 UTC (rev 63930)
+++ branches/Branch_4_2/varia/src/resources/services/snmp/deploy/attributes.mib 2007-07-10 10:42:14 UTC (rev 63931)
@@ -1,98 +1,161 @@
--
-- Example MIB for the delivered attributes.xml
--- This file is only an example. The provided values will change in the future.
+-- This file is only an example. The provided values
+-- will change in the future.
-- See also <a href="http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossOIDs">The Wiki</a>
--- $Id:$
+-- $Revision$
-- <a href="mailto:hwr at pilhuhn.de>Heiko W. Rupp</a>
-JBOSS-AS-MIB DEFINITIONS ::=BEGIN
+JBOSS-AS-MIB DEFINITIONS ::= BEGIN
IMPORTS
- enterprises
- FROM RFC1213-MIB
- FROM SNMPv2-SMI
- OBJECT-TYPE
- FROM RFC-1212;
+ enterprises
+ FROM RFC1213-MIB
+ OBJECT-TYPE
+ FROM RFC-1212;
-- JBoss space within MIB-2
-jboss OBJECT IDENTIFIER ::= { enterprises 18016 } -- 1.3.4.6.1.4.1.18016
+jboss OBJECT IDENTIFIER ::= { enterprises 18016 } -- 1.3.4.6.1.4.1.18016
jbossProducts OBJECT IDENTIFIER ::= {jboss 1 }
-jbossAS OBJECT IDENTIFIER ::= { jbossProducts 1 }
-jbossAS500 OBJECT IDENTIFIER ::= { jbossAS 1 }
-jbossAS404 OBJECT IDENTIFIER ::= { jbossAS 2 }
+jbossAS OBJECT IDENTIFIER ::= { jbossProducts 1 }
+jbossAS500 OBJECT IDENTIFIER ::= { jbossAS 1 }
+jbossAS404 OBJECT IDENTIFIER ::= { jbossAS 2 }
-- Tree roots - experimental will change in the future!
-org OBJECT IDENTIFIER ::= { iso 2 } -- "iso" = 1
-jboss-exp OBJECT IDENTIFIER ::= { org 3 }
-as OBJECT IDENTIFIER ::= { jboss-exp 4 }
-system OBJECT IDENTIFIER ::= { as 1 } -- .1.2.3.4.1
-mgmt OBJECT IDENTIFIER ::= { as 5 }
-snmp OBJECT IDENTIFIER ::= { mgmt 6 }
-agent OBJECT IDENTIFIER ::= { snmp 7 }
+org OBJECT IDENTIFIER ::= { iso 2 } -- "iso" = 1
+jboss-exp OBJECT IDENTIFIER ::= { org 3 }
+as OBJECT IDENTIFIER ::= { jboss-exp 4 }
+system OBJECT IDENTIFIER ::= { as 1 } -- .1.2.3.4.1
+mgmt OBJECT IDENTIFIER ::= { as 5 }
+snmp OBJECT IDENTIFIER ::= { mgmt 6 }
+agent OBJECT IDENTIFIER ::= { snmp 7 }
-- system parameters
activeThreadCount OBJECT-TYPE
- SYNTAX INTEGER
- ACCESS read-only
- STATUS mandatory
- DESCRIPTION
- "The number of active Threads in the system"
- ::= { system 1 } -- .1.2.3.4.1.1
+ SYNTAX INTEGER
+ ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "The number of active Threads in the system"
+ ::= { system 1 } -- .1.2.3.4.1.1
freeMemory OBJECT-TYPE
- SYNTAX Gauge32
- ACCESS read-only
- STATUS mandatory
- DESCRIPTION
- "The free memory of the VM"
- ::= {system 2} -- .1.2.3.4.1.2
+ SYNTAX INTEGER
+ ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "The free memory of the VM"
+ ::= {system 2} -- .1.2.3.4.1.2
maxMemory OBJECT-TYPE
- SYNTAX Gauge32
- ACCESS read-only
- STATUS mandatory
- DESCRIPTION
- "The max memory of the VM"
- ::= {system 3} -- .1.2.3.4.1.3
+ SYNTAX INTEGER
+ ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "The max memory of the VM"
+ ::= {system 3} -- .1.2.3.4.1.3
threadPoolQueueSize OBJECT-TYPE
- SYNTAX INTEGER
- ACCESS read-only
- STATUS mandatory
- DESCRIPTION
- "The size of the thread pool queue"
- ::= {system 4 }
+ SYNTAX INTEGER
+ ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "The size of the thread pool queue"
+ ::= {system 4 }
requestCount8080 OBJECT-TYPE
- SYNTAX Gauge32
- ACCESS read-only
- STATUS mandatory
- DESCRIPTION
- "Number of requests served on port 8080"
- ::= {system 5}
+ SYNTAX INTEGER
+ ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Number of requests served on port 8080"
+ ::= {system 5}
txCommitCount OBJECT-TYPE
- SYNTAX Gauge32
- ACCESS read-only
- STATUS mandatory
- DESCRIPTION
- "Number of commited transactions"
- ::= {system 6 }
+ SYNTAX INTEGER
+ ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Number of commited transactions"
+ ::= {system 6 }
txRollbackCount OBJECT-TYPE
- SYNTAX Gauge32
- ACCESS read-only
- STATUS mandatory
- DESCRIPTION
- "Number of transactions rolled back"
- ::= {system 7 }
+ SYNTAX INTEGER
+ ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Number of transactions rolled back"
+ ::= {system 7 }
txActiveCount OBJECT-TYPE
- SYNTAX Gauge32
- ACCESS read-only
- STATUS mandatory
- DESCRIPTION
- "The number of currently active transactions"
- ::= {system 8 }
+ SYNTAX INTEGER
+ ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "The number of currently active transactions"
+ ::= {system 8 }
dbInUseCount OBJECT-TYPE
- SYNTAX Gauge32
- ACCESS read-only
- STATUS mandatory
- DESCRIPTION
- "The number of db connections currently in use"
- ::= { system 9 }
+ SYNTAX INTEGER
+ ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "The number of db connections currently in use"
+ ::= { system 9 }
+
+-- agent parameters
+aUpTime OBJECT-TYPE
+ SYNTAX INTEGER
+ ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "snmp agent / adaptor up time"
+ ::= { agent 5 }
+
+aTrapCount OBJECT-TYPE
+ SYNTAX INTEGER
+ ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "snmp agent / adaptor trap count"
+ ::= { agent 6 }
+
+nMessage OBJECT-TYPE
+ SYNTAX OCTET STRING
+ ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Notification message"
+ ::= { agent 7 }
+
+aSequenceNumber OBJECT-TYPE
+ SYNTAX INTEGER
+ ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Notification sequence number"
+ ::= { agent 8 }
+
+aStartTime OBJECT-TYPE
+ SYNTAX OCTET STRING
+ ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "snmp agent / adaptor start time"
+ ::= { agent 9 }
+
+
+StartTrap TRAP-TYPE
+ ENTERPRISE agent
+ VARIABLES {
+ aStartTime, aTrapCount
+ }
+ ::= 1
+
+heartbeatTrap TRAP-TYPE
+ ENTERPRISE agent
+ VARIABLES {
+ aUpTime, aTrapCount, nMessage, aSequenceNumber
+ }
+ ::= 2
+
+logmsgTrap TRAP-TYPE
+ ENTERPRISE agent
+ VARIABLES {
+ nMessage
+ }
+ ::= 3
END
More information about the jboss-cvs-commits
mailing list