[jboss-cvs] JBossAS SVN: r63884 - in branches/Branch_4_2: ejb3 and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jul 6 15:25:35 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-07-06 15:25:34 -0400 (Fri, 06 Jul 2007)
New Revision: 63884
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/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/tomcat/build.xml
Log:
Install jbossws-2.0.0.GA
Modified: branches/Branch_4_2/build/build-distr.xml
===================================================================
--- branches/Branch_4_2/build/build-distr.xml 2007-07-06 19:06:12 UTC (rev 63883)
+++ branches/Branch_4_2/build/build-distr.xml 2007-07-06 19:25:34 UTC (rev 63884)
@@ -1446,12 +1446,12 @@
<!-- copy thirdparty items to client dir -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
- <fileset dir="${jboss.remoting.lib}">
- <include name="jboss-remoting.jar"/>
- </fileset>
- <fileset dir="${sun.jaf.lib}">
- <include name="activation.jar"/>
+ <fileset dir="${apache.httpclient.lib}">
+ <include name="commons-httpclient.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,43 +1464,49 @@
<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="${sun.javamail.lib}">
- <include name="mail.jar"/>
+ <fileset dir="${jboss.common.lib}">
+ <include name="jboss-common-client.jar"/>
</fileset>
- <fileset dir="${apache.httpclient.lib}">
- <include name="commons-httpclient.jar"/>
+ <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="${apache.codec.lib}">
- <include name="commons-codec.jar"/>
+ <fileset dir="${jboss.jbossws.jboss42.lib}">
+ <include name="jbossws-jboss42.jar"/>
</fileset>
- <fileset dir="${jboss.common.lib}">
- <include name="jboss-common-client.jar"/>
+ <fileset dir="${jboss.jbossws.spi.lib}">
+ <include name="jbossws-spi.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="${jboss.jbossws.wsconsume.impl.lib}">
- <include name="jbossws-wsconsume-impl.jar"/>
+ <fileset dir="${wscommons.policy.lib}">
+ <include name="policy.jar"/>
</fileset>
</copy>
@@ -1522,11 +1528,12 @@
<fileset dir="${javassist.javassist.lib}">
<include name="javassist.jar"/>
</fileset>
- <fileset dir="${jboss.jbossws.lib}">
- <include name="jbossws-integration.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-saaj.jar"/>
+ <fileset dir="${jboss.jbossws.jboss42.lib}">
+ <include name="jbossws-jboss42.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>
@@ -1553,20 +1560,13 @@
<fileset dir="${quartz.quartz.lib}" includes="quartz.jar"/>
</copy>
- <!-- 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 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 JBossWS -->
<mkdir dir="${install.all.deploy}/jbossws.sar"/>
- <unjar dest="${install.all.deploy}/jbossws.sar" src="${jboss.jbossws.jboss42.lib}/jbossws42.sar"/>
+ <unjar dest="${install.all.deploy}/jbossws.sar" src="${jboss.jbossws.native42.lib}/jbossws-native42.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-06 19:06:12 UTC (rev 63883)
+++ branches/Branch_4_2/build/build-thirdparty.xml 2007-07-06 19:25:34 UTC (rev 63884)
@@ -85,7 +85,8 @@
<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="1.2.1.GA"/>
+ <componentref name="jboss/jbossws-jboss42" version="2.0.0.GA"/>
+ <componentref name="jboss/jbossws-native42" version="2.0.0.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-06 19:06:12 UTC (rev 63883)
+++ branches/Branch_4_2/ejb3/build.xml 2007-07-06 19:25:34 UTC (rev 63884)
@@ -97,6 +97,7 @@
<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/server/.classpath
===================================================================
--- branches/Branch_4_2/server/.classpath 2007-07-06 19:06:12 UTC (rev 63883)
+++ branches/Branch_4_2/server/.classpath 2007-07-06 19:25:34 UTC (rev 63884)
@@ -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-06 19:06:12 UTC (rev 63883)
+++ branches/Branch_4_2/server/build.xml 2007-07-06 19:25:34 UTC (rev 63884)
@@ -86,6 +86,7 @@
<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-06 19:06:12 UTC (rev 63883)
+++ branches/Branch_4_2/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java 2007-07-06 19:25:34 UTC (rev 63884)
@@ -25,15 +25,10 @@
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;
@@ -48,32 +43,14 @@
*/
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)
{
- 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);
- }
+ delegate = ServiceRefHandlerFactory.getServiceRefHandler();
}
-
- if (delegate == null)
- log.warn("Not registered: " + ServiceRefHandler.BEAN_NAME);
}
public ServiceRefMetaData newServiceRefMetaData()
Modified: branches/Branch_4_2/tomcat/build.xml
===================================================================
--- branches/Branch_4_2/tomcat/build.xml 2007-07-06 19:06:12 UTC (rev 63883)
+++ branches/Branch_4_2/tomcat/build.xml 2007-07-06 19:25:34 UTC (rev 63884)
@@ -57,7 +57,7 @@
<path refid="sun.jsf.classpath"/>
<path refid="apache.commons.classpath"/>
<path refid="apache.log4j.classpath"/>
- <path refid="jboss.jbossws.classpath"/>
+ <path refid="jboss.jbossws.spi.classpath"/>
<path refid="junit.junit.classpath"/>
<path refid="dom4j.dom4j.classpath"/>
<path refid="oswego.concurrent.classpath"/>
More information about the jboss-cvs-commits
mailing list