[jbossws-commits] JBossWS SVN: r4043 - in trunk/integration: jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF and 2 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Tue Jul 31 13:11:42 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-07-31 13:11:42 -0400 (Tue, 31 Jul 2007)
New Revision: 4043
Modified:
trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java
trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml
trunk/integration/spi/src/main/java/org/jboss/ws/integration/KernelLocator.java
trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java
trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerImpl.java
trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelLocator.java
Log:
Fix KernelLocator
Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java
===================================================================
--- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java 2007-07-31 16:15:37 UTC (rev 4042)
+++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java 2007-07-31 17:11:42 UTC (rev 4043)
@@ -34,11 +34,11 @@
import org.jboss.deployment.DeploymentInfo;
import org.jboss.system.ServiceMBeanSupport;
import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData;
+import org.jboss.ws.integration.ResourceLoaderAdapter;
import org.jboss.ws.integration.ServiceRefHandler;
import org.jboss.ws.integration.ServiceRefHandlerFactory;
-import org.jboss.wsf.common.ResourceLoaderAdapter;
-import org.jboss.wsf.common.URLLoaderAdapter;
-import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+import org.jboss.ws.integration.URLLoaderAdapter;
+import org.jboss.ws.integration.UnifiedVirtualFile;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
/**
Modified: trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml
===================================================================
--- trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-31 16:15:37 UTC (rev 4042)
+++ trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-31 17:11:42 UTC (rev 4043)
@@ -140,6 +140,9 @@
<bean name="WSDeploymentAspectManagerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
<property name="name">WSDeploymentAspectManagerEJB</property>
</bean>
+ <bean name="WSDeploymentAspectManagerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
+ <property name="name">WSDeploymentAspectManagerEndpointAPI</property>
+ </bean>
<!--
The container deployment aspects
@@ -158,6 +161,10 @@
<property name="provides">EndpointAddress</property>
</bean>
+ <bean name="WSEndpointAPIDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAPIDeploymentAspect">
+ <property name="provides">ContainerMetaData, URLPattern, VFSRoot</property>
+ </bean>
+
<bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
<property name="requires">ContainerMetaData</property>
<property name="provides">ContainerEndpointHandler</property>
@@ -250,5 +257,22 @@
</set>
</property>
</bean>
+ <bean name="WSDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property>
+ <property name="sortAspectsOnCreate">false</property>
+ <property name="aspects">
+ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSEndpointAPIDeploymentAspect"/>
+ <inject bean="WSEndpointAddressDeploymentAspect"/>
+ <inject bean="WSEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSEndpointLifecycleDeploymentAspect"/>
+ <inject bean="WSEndpointMetricsDeploymentAspect"/>
+ <inject bean="WSEndpointNameDeploymentAspect"/>
+ <inject bean="WSEndpointRegistryDeploymentAspect"/>
+ <inject bean="WSWebAppDeploymentAspect"/>
+ <inject bean="WSWebAppGeneratorDeploymentAspect"/>
+ </set>
+ </property>
+ </bean>
</deployment>
Modified: trunk/integration/spi/src/main/java/org/jboss/ws/integration/KernelLocator.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/ws/integration/KernelLocator.java 2007-07-31 16:15:37 UTC (rev 4042)
+++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/KernelLocator.java 2007-07-31 17:11:42 UTC (rev 4043)
@@ -24,6 +24,7 @@
//$Id$
import org.jboss.kernel.Kernel;
+import org.jboss.util.NotImplementedException;
/**
* @deprecated
@@ -31,15 +32,15 @@
*/
public class KernelLocator
{
- private static Kernel kernel;
-
+ @Deprecated
public static Kernel getKernel()
{
- return KernelLocator.kernel;
+ return org.jboss.wsf.common.KernelLocator.getKernel();
}
+ @Deprecated
public void setKernel(Kernel kernel)
{
- KernelLocator.kernel = kernel;
+ throw new NotImplementedException("Deprecated, use: " + org.jboss.wsf.common.KernelLocator.class.getName());
}
}
Modified: trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java 2007-07-31 16:15:37 UTC (rev 4042)
+++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java 2007-07-31 17:11:42 UTC (rev 4043)
@@ -26,7 +26,6 @@
import javax.naming.Context;
import javax.naming.NamingException;
-import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
import org.jboss.xb.binding.UnmarshallingContext;
import org.xml.sax.Attributes;
Modified: trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerImpl.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerImpl.java 2007-07-31 16:15:37 UTC (rev 4042)
+++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerImpl.java 2007-07-31 17:11:42 UTC (rev 4043)
@@ -32,9 +32,7 @@
import javax.naming.NamingException;
import org.jboss.logging.Logger;
-import org.jboss.wsf.common.URLLoaderAdapter;
import org.jboss.wsf.spi.WSFException;
-import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
import org.jboss.xb.binding.UnmarshallingContext;
import org.xml.sax.Attributes;
@@ -60,7 +58,7 @@
/* binds jaxrpc deployments */
private ServiceRefBinder jaxrpcBinder;
- /*binds jaxws deployments */
+ /* binds jaxws deployments */
private ServiceRefBinder jaxwsBinder;
public void setJaxrpcBinder(ServiceRefBinder binder)
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelLocator.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelLocator.java 2007-07-31 16:15:37 UTC (rev 4042)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelLocator.java 2007-07-31 17:11:42 UTC (rev 4043)
@@ -31,7 +31,7 @@
* @author Thomas.Diesler at jboss.org
* @since 12-May-2006
*/
-public class KernelLocator
+public class KernelLocator
{
private static Kernel kernel;
More information about the jbossws-commits
mailing list