[jboss-cvs] JBossAS SVN: r65715 - in branches/tdiesler/Branch_4_2: server/src/main/org/jboss/metadata/serviceref and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Oct 1 12:24:47 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-10-01 12:24:46 -0400 (Mon, 01 Oct 2007)
New Revision: 65715
Added:
branches/tdiesler/Branch_4_2/webservices/src/resources/jbossws-jboss42.jar/
branches/tdiesler/Branch_4_2/webservices/src/resources/jbossws-jboss42.jar/META-INF/
branches/tdiesler/Branch_4_2/webservices/src/resources/jbossws-jboss42.jar/META-INF/services/
branches/tdiesler/Branch_4_2/webservices/src/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory
branches/tdiesler/Branch_4_2/webservices/src/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory
branches/tdiesler/Branch_4_2/webservices/src/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory
branches/tdiesler/Branch_4_2/webservices/src/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory
branches/tdiesler/Branch_4_2/webservices/src/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory
branches/tdiesler/Branch_4_2/webservices/src/resources/jbossws-jboss42.sar/
branches/tdiesler/Branch_4_2/webservices/src/resources/jbossws-jboss42.sar/META-INF/
branches/tdiesler/Branch_4_2/webservices/src/resources/jbossws-jboss42.sar/META-INF/jboss-service.xml
Removed:
branches/tdiesler/Branch_4_2/webservices/src/main/org/jboss/wsf/container/jboss42/serviceref/
branches/tdiesler/Branch_4_2/webservices/src/resources/jbossws-jboss50.deployer/
branches/tdiesler/Branch_4_2/webservices/src/resources/jbossws-jboss50.jar/
Modified:
branches/tdiesler/Branch_4_2/build/build-distr.xml
branches/tdiesler/Branch_4_2/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java
branches/tdiesler/Branch_4_2/webservices/build.xml
Log:
partial commit
Modified: branches/tdiesler/Branch_4_2/build/build-distr.xml
===================================================================
--- branches/tdiesler/Branch_4_2/build/build-distr.xml 2007-10-01 14:44:10 UTC (rev 65714)
+++ branches/tdiesler/Branch_4_2/build/build-distr.xml 2007-10-01 16:24:46 UTC (rev 65715)
@@ -1563,6 +1563,12 @@
<fileset dir="${javassist.javassist.lib}">
<include name="javassist.jar"/>
</fileset>
+ <fileset dir="${jboss.jbossws.common.lib}">
+ <include name="jbossws-common.jar"/>
+ </fileset>
+ <fileset dir="${jboss.jbossws.framework.lib}">
+ <include name="jbossws-framework.jar"/>
+ </fileset>
<fileset dir="${jboss.jbossws.spi.lib}">
<include name="jbossws-spi.jar"/>
</fileset>
Modified: branches/tdiesler/Branch_4_2/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java
===================================================================
--- branches/tdiesler/Branch_4_2/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java 2007-10-01 14:44:10 UTC (rev 65714)
+++ branches/tdiesler/Branch_4_2/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java 2007-10-01 16:24:46 UTC (rev 65715)
@@ -59,18 +59,8 @@
{
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
- {
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- delegate = spiProvider.getSPI(ServiceRefHandlerFactory.class).getServiceRefHandler();
- }
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ delegate = spiProvider.getSPI(ServiceRefHandlerFactory.class).getServiceRefHandler();
}
if (delegate == null)
Modified: branches/tdiesler/Branch_4_2/webservices/build.xml
===================================================================
--- branches/tdiesler/Branch_4_2/webservices/build.xml 2007-10-01 14:44:10 UTC (rev 65714)
+++ branches/tdiesler/Branch_4_2/webservices/build.xml 2007-10-01 16:24:46 UTC (rev 65715)
@@ -83,10 +83,13 @@
<!-- The combined dependant module classpath -->
<path id="dependentmodule.classpath">
+ <path refid="jboss.j2ee.classpath"/>
<path refid="jboss.jmx.classpath"/>
+ <path refid="jboss.security.classpath"/>
<path refid="jboss.server.classpath"/>
<path refid="jboss.system.classpath"/>
<path refid="jboss.ejb3.classpath"/>
+ <path refid="jboss.ejb3x.classpath"/>
<path refid="jboss.tomcat.classpath"/>
</path>
Added: branches/tdiesler/Branch_4_2/webservices/src/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory
===================================================================
--- branches/tdiesler/Branch_4_2/webservices/src/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory (rev 0)
+++ branches/tdiesler/Branch_4_2/webservices/src/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory 2007-10-01 16:24:46 UTC (rev 65715)
@@ -0,0 +1 @@
+org.jboss.wsf.framework.deployment.ArchiveDeploymentModelFactory
\ No newline at end of file
Added: branches/tdiesler/Branch_4_2/webservices/src/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory
===================================================================
--- branches/tdiesler/Branch_4_2/webservices/src/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory (rev 0)
+++ branches/tdiesler/Branch_4_2/webservices/src/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory 2007-10-01 16:24:46 UTC (rev 65715)
@@ -0,0 +1 @@
+org.jboss.wsf.container.jboss42.InvocationHandlerFactoryImpl
\ No newline at end of file
Added: branches/tdiesler/Branch_4_2/webservices/src/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory
===================================================================
--- branches/tdiesler/Branch_4_2/webservices/src/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory (rev 0)
+++ branches/tdiesler/Branch_4_2/webservices/src/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory 2007-10-01 16:24:46 UTC (rev 65715)
@@ -0,0 +1 @@
+org.jboss.wsf.container.jboss42.SecurityAdapterFactoryImpl
\ No newline at end of file
Added: branches/tdiesler/Branch_4_2/webservices/src/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory
===================================================================
--- branches/tdiesler/Branch_4_2/webservices/src/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory (rev 0)
+++ branches/tdiesler/Branch_4_2/webservices/src/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory 2007-10-01 16:24:46 UTC (rev 65715)
@@ -0,0 +1 @@
+org.jboss.wsf.container.jboss42.WebServiceContextFactoryImpl
\ No newline at end of file
Added: branches/tdiesler/Branch_4_2/webservices/src/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory
===================================================================
--- branches/tdiesler/Branch_4_2/webservices/src/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory (rev 0)
+++ branches/tdiesler/Branch_4_2/webservices/src/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory 2007-10-01 16:24:46 UTC (rev 65715)
@@ -0,0 +1 @@
+org.jboss.wsf.framework.management.ServerConfigFactoryImpl
\ No newline at end of file
Added: branches/tdiesler/Branch_4_2/webservices/src/resources/jbossws-jboss42.sar/META-INF/jboss-service.xml
===================================================================
--- branches/tdiesler/Branch_4_2/webservices/src/resources/jbossws-jboss42.sar/META-INF/jboss-service.xml (rev 0)
+++ branches/tdiesler/Branch_4_2/webservices/src/resources/jbossws-jboss42.sar/META-INF/jboss-service.xml 2007-10-01 16:24:46 UTC (rev 65715)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id: jboss-service.xml 3884 2007-07-13 15:42:07Z thomas.diesler at jboss.com $ -->
+
+<server>
+
+ <!--
+ A deployer service for JSE endpoints.
+ -->
+ <mbean name="jboss.ws:service=DeployerInterceptorJSE" code="org.jboss.wsf.container.jboss42.DeployerInterceptorJSE">
+ <depends-list optional-attribute-name="Interceptables">
+ <depends-list-element>jboss.web:service=WebServer</depends-list-element>
+ </depends-list>
+ </mbean>
+
+ <!--
+ A deployer service for EJB2.1 endpoints.
+ -->
+ <mbean name="jboss.ws:service=DeployerInterceptorEJB21" code="org.jboss.wsf.container.jboss42.DeployerInterceptorEJB21">
+ <depends-list optional-attribute-name="Interceptables">
+ <depends-list-element>jboss.ejb:service=EJBDeployer</depends-list-element>
+ </depends-list>
+ </mbean>
+
+ <!--
+ A deployer service for EJB3 endpoints.
+ -->
+ <mbean name="jboss.ws:service=DeployerInterceptorEJB3" code="org.jboss.wsf.container.jboss42.DeployerInterceptorEJB3">
+ <depends-list optional-attribute-name="Interceptables">
+ <depends-list-element>jboss.ejb3:service=EJB3Deployer</depends-list-element>
+ </depends-list>
+ </mbean>
+
+</server>
More information about the jboss-cvs-commits
mailing list