[jbossws-commits] JBossWS SVN: r11561 - in stack/metro/branches/jaxrpc-cxf/modules/server/src/main: java/org/jboss/wsf/stack/metro/metadata and 1 other directories.

Wednesday, 10 February 2010


Author: alessio.soldano(a)jboss.com
Date: 2010-02-10 06:16:43 -0500 (Wed, 10 Feb 2010)
New Revision: 11561

Modified:
  
stack/metro/branches/jaxrpc-cxf/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java
  
stack/metro/branches/jaxrpc-cxf/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java
  
stack/metro/branches/jaxrpc-cxf/modules/server/src/main/resources/jbossws-metro-config-as6.xml
Log:
Using new AbstractDeploymentAspect, moving WSAspectizedDeployer to stack specific config,
providing sensible values for isForJaxWs / isForJaxRpc 


Modified:
stack/metro/branches/jaxrpc-cxf/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java
===================================================================
---
stack/metro/branches/jaxrpc-cxf/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java	2010-02-10
09:31:34 UTC (rev 11560)
+++
stack/metro/branches/jaxrpc-cxf/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java	2010-02-10
11:16:43 UTC (rev 11561)
@@ -1,6 +1,6 @@
 /*
  * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
  * as indicated by the @author tags. See the copyright.txt file in the
  * distribution for a full listing of individual contributors.
  *
@@ -21,28 +21,28 @@
  */
 package org.jboss.wsf.stack.metro;
 
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.ws.BindingType;
+import javax.xml.ws.soap.SOAPBinding;
+
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
 import org.jboss.wsf.common.integration.WSConstants;
 import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
 import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.stack.metro.metadata.RuntimeModelDeploymentAspect;
 import org.jboss.wsf.stack.metro.metadata.sunjaxws.DDEndpoint;
 import org.jboss.wsf.stack.metro.metadata.sunjaxws.DDEndpoints;
-import org.jboss.wsf.stack.metro.metadata.RuntimeModelDeploymentAspect;
 
-import javax.xml.ws.BindingType;
-import javax.xml.ws.soap.SOAPBinding;
-
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * An aspect that generates sun-jaxws.xml 
  *
  * @author Thomas.Diesler(a)jboss.org
  * @since 10-May-2007
  */
-public class SunJaxwsDeploymentAspect extends DeploymentAspect
+public class SunJaxwsDeploymentAspect extends AbstractDeploymentAspect
 {
    @Override
    @SuppressWarnings("unchecked")

Modified:
stack/metro/branches/jaxrpc-cxf/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java
===================================================================
---
stack/metro/branches/jaxrpc-cxf/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java	2010-02-10
09:31:34 UTC (rev 11560)
+++
stack/metro/branches/jaxrpc-cxf/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java	2010-02-10
11:16:43 UTC (rev 11561)
@@ -1,6 +1,6 @@
 /*
  * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
  * as indicated by the @author tags. See the copyright.txt file in the
  * distribution for a full listing of individual contributors.
  *
@@ -21,22 +21,22 @@
  */
 package org.jboss.wsf.stack.metro.metadata;
 
-import com.sun.xml.ws.api.server.BoundEndpoint;
-import com.sun.xml.ws.api.server.Container;
-import com.sun.xml.ws.api.server.Module;
-import com.sun.xml.ws.api.server.ResourceInjector;
-import com.sun.xml.ws.api.server.ServerPipelineHook;
-import com.sun.xml.ws.transport.http.DeploymentDescriptorParser;
-import com.sun.xml.ws.transport.http.ResourceLoader;
-import com.sun.xml.ws.transport.http.servlet.ServletAdapter;
-import com.sun.xml.ws.transport.http.servlet.ServletAdapterList;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
+import javax.servlet.ServletContext;
+import javax.xml.ws.WebServiceException;
+
 import org.jboss.logging.Logger;
 import org.jboss.wsf.common.ResourceLoaderAdapter;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
 import org.jboss.wsf.common.integration.WSConstants;
 import org.jboss.wsf.spi.deployment.ArchiveDeployment;
 import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
 import org.jboss.wsf.spi.deployment.Endpoint;
 import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
 import org.jboss.wsf.stack.metro.DeploymentDescriptorParserExt;
@@ -44,14 +44,15 @@
 import org.jboss.wsf.stack.metro.MessageStreamAdapter;
 import org.jboss.wsf.stack.metro.log.MessageLogPipelineHook;
 
-import javax.xml.ws.WebServiceException;
-import javax.servlet.ServletContext;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.List;
+import com.sun.xml.ws.api.server.BoundEndpoint;
+import com.sun.xml.ws.api.server.Container;
+import com.sun.xml.ws.api.server.Module;
+import com.sun.xml.ws.api.server.ResourceInjector;
+import com.sun.xml.ws.api.server.ServerPipelineHook;
+import com.sun.xml.ws.transport.http.DeploymentDescriptorParser;
+import com.sun.xml.ws.transport.http.ResourceLoader;
+import com.sun.xml.ws.transport.http.servlet.ServletAdapter;
+import com.sun.xml.ws.transport.http.servlet.ServletAdapterList;
 
 /**
  * Creates a Metro runtime model and associates it with the deployment.
@@ -67,7 +68,7 @@
  *
  * @author Heiko.Braun(a)jboss.com
  */
-public class RuntimeModelDeploymentAspect extends DeploymentAspect
+public class RuntimeModelDeploymentAspect extends AbstractDeploymentAspect
 {
    private static final org.jboss.logging.Logger log =
Logger.getLogger(RuntimeModelDeploymentAspect.class);
    protected static final String JAXWS_RI_RUNTIME = "/WEB-INF/sun-jaxws.xml";

Modified:
stack/metro/branches/jaxrpc-cxf/modules/server/src/main/resources/jbossws-metro-config-as6.xml
===================================================================
---
stack/metro/branches/jaxrpc-cxf/modules/server/src/main/resources/jbossws-metro-config-as6.xml	2010-02-10
09:31:34 UTC (rev 11560)
+++
stack/metro/branches/jaxrpc-cxf/modules/server/src/main/resources/jbossws-metro-config-as6.xml	2010-02-10
11:16:43 UTC (rev 11561)
@@ -36,11 +36,13 @@
         </entry>
       </map>
     </property>
+    <property name="forJaxRpc">false</property>
   </bean>
 
   <bean name="WSMetroEndpointHandlerDeploymentAspect"
class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
     <property name="requires">ContainerMetaData</property>
     <property name="provides">StackEndpointHandler</property>
+    <property name="forJaxRpc">false</property>
   </bean>
 
   <bean name="WSMetroEndpointRecordProcessorDeploymentAspect"
class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
@@ -53,16 +55,19 @@
         <inject bean="WSLogRecorder"/>
       </list>
     </property>
+    <property name="forJaxRpc">false</property>
   </bean>
 
   <bean name="WSMetroDescriptorDeploymentAspect"
class="org.jboss.wsf.stack.metro.SunJaxwsDeploymentAspect">
     <property name="requires">URLPattern</property>
     <property name="provides">StackDescriptor</property>
+    <property name="forJaxRpc">false</property>
   </bean>
 
   <bean name="WSRuntimeModelDeploymentAspect"
class="org.jboss.wsf.stack.metro.metadata.RuntimeModelDeploymentAspect">
     <property name="requires">StackDescriptor</property>
     <property name="provides">RuntimeModel</property>
+    <property name="forJaxRpc">false</property>
   </bean>
 
 </deployment>


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

[jbossws-commits] JBossWS SVN: r11561 - in stack/metro/branches/jaxrpc-cxf/modules/server/src/main: java/org/jboss/wsf/stack/metro/metadata and 1 other directories.