JBossWS SVN: r8601 - spi/trunk/src/main/java/org/jboss/wsf/spi/deployment.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-30 15:37:40 -0400 (Thu, 30 Oct 2008)
New Revision: 8601
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/UnifiedVirtualFile.java
Log:
[JBWS-2375] Adding getChildren and getName to UnifiedVirtualFile
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/UnifiedVirtualFile.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/UnifiedVirtualFile.java 2008-10-30 15:34:08 UTC (rev 8600)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/UnifiedVirtualFile.java 2008-10-30 19:37:40 UTC (rev 8601)
@@ -24,6 +24,7 @@
import java.io.IOException;
import java.io.Serializable;
import java.net.URL;
+import java.util.List;
/**
* An adaptor to a VirtualFile from jboss-vfs.jar
@@ -35,6 +36,10 @@
public interface UnifiedVirtualFile extends Serializable
{
UnifiedVirtualFile findChild(String child) throws IOException;
+
+ List<UnifiedVirtualFile> getChildren() throws IOException;
+
+ String getName();
URL toURL();
}
15 years, 6 months
- 1
- 0
JBossWS SVN: r8600 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1357/src: main/java/org/jboss/ws/core/soap and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-10-30 11:34:08 -0400 (Thu, 30 Oct 2008)
New Revision: 8600
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1357/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler2.java
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1357/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1357/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1357/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java
Log:
[JBPAPP-1357] Wrong Content-Type in SOAP 1.2 messages.
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1357/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1357/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2008-10-30 15:13:34 UTC (rev 8599)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1357/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2008-10-30 15:34:08 UTC (rev 8600)
@@ -45,12 +45,15 @@
import org.jboss.logging.Logger;
import org.jboss.util.NotImplementedException;
+import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.MessageAbstraction;
import org.jboss.ws.core.ConfigProvider;
import org.jboss.ws.core.client.HTTPRemotingConnection;
import org.jboss.ws.core.client.RemotingConnection;
import org.jboss.ws.core.client.SOAPRemotingConnection;
import org.jboss.ws.core.jaxws.binding.BindingProviderImpl;
+import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS;
+import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.config.ConfigurationProvider;
@@ -180,6 +183,9 @@
public void invokeOneWay(T msg)
{
+ CommonMessageContext msgContext = new SOAPMessageContextJAXWS();
+ MessageContextAssociation.pushMessageContext(msgContext);
+ msgContext.setEndpointMetaData(epMetaData);
try
{
MessageAbstraction reqMsg = getRequestMessage(msg);
@@ -190,6 +196,10 @@
{
handleInvokeException(ex);
}
+ finally
+ {
+ MessageContextAssociation.popMessageContext();
+ }
}
// 4.17. Conformance (Failed Dispatch.invoke): When an operation is invoked using an invoke method, an
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1357/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1357/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java 2008-10-30 15:13:34 UTC (rev 8599)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1357/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java 2008-10-30 15:34:08 UTC (rev 8600)
@@ -23,6 +23,7 @@
// $Id$
+import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.core.SOAPMessageAbstraction;
import org.jboss.ws.core.CommonMessageContext;
@@ -207,6 +208,24 @@
return new MimeMatchingAttachmentsIterator(headers, attachments);
}
+
+ private String getSOAPContentType() throws SOAPException
+ {
+ //Check binding type in the endpoint metadata
+ CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
+ if (msgContext != null && Constants.SOAP12HTTP_BINDING.equalsIgnoreCase(msgContext.getEndpointMetaData().getBindingId()))
+ {
+ return SOAPConstants.SOAP_1_2_CONTENT_TYPE;
+ }
+ //Check the message envelope
+ SOAPEnvelope env = soapPart != null ? soapPart.getEnvelope() : null;
+ if (env != null && SOAPConstants.URI_NS_SOAP_1_2_ENVELOPE.equals(env.getNamespaceURI()))
+ {
+ return SOAPConstants.SOAP_1_2_CONTENT_TYPE;
+ }
+ //Default to soap 1.1
+ return SOAPConstants.SOAP_1_1_CONTENT_TYPE;
+ }
public void saveChanges() throws SOAPException
{
@@ -220,7 +239,7 @@
throw new IllegalStateException("XOP parameter not properly inlined");
// default content-type
- String contentType = MimeConstants.TYPE_SOAP11 + "; charset=" + getCharSetEncoding();
+ String contentType = getSOAPContentType() + "; charset=" + getCharSetEncoding();
if (hasAttachments)
{
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1357/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler2.java (from rev 8542, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler2.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1357/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler2.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1357/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler2.java 2008-10-30 15:34:08 UTC (rev 8600)
@@ -0,0 +1,90 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.binding;
+
+import javax.xml.soap.MimeHeaders;
+import javax.xml.soap.SOAPConstants;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.soap.SOAPMessageContext;
+
+import org.jboss.logging.Logger;
+import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler;
+
+/**
+ * A client side handler
+ *
+ * @author Alessio Soldano, alessio.soldano(a)jboss.com
+ * @since 31-Oct-2007
+ */
+public class ClientHandler2 extends GenericSOAPHandler
+{
+ private static Logger log = Logger.getLogger(ClientHandler2.class);
+
+ public boolean handleInbound(MessageContext msgContext)
+ {
+ log.info("handleInbound");
+
+ SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
+
+ MimeHeaders mimeHeaders = soapMessage.getMimeHeaders();
+ String[] ct = mimeHeaders.getHeader("Content-Type");
+ if (ct != null)
+ {
+ for (int i = 0; i < ct.length; i++)
+ {
+ if (ct[i].startsWith(SOAPConstants.SOAP_1_2_CONTENT_TYPE))
+ return true;
+ }
+ }
+ return false;
+ }
+
+ protected boolean handleOutbound(MessageContext msgContext)
+ {
+ log.info("handleOutbound");
+
+ try
+ {
+ SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
+ soapMessage.saveChanges();
+
+ MimeHeaders mimeHeaders = soapMessage.getMimeHeaders();
+ String[] ct = mimeHeaders.getHeader("Content-Type");
+ if (ct != null)
+ {
+ for (int i = 0; i < ct.length; i++)
+ {
+ if (ct[i].startsWith(SOAPConstants.SOAP_1_2_CONTENT_TYPE))
+ return true;
+ }
+ }
+ return false;
+ }
+ catch (SOAPException ex)
+ {
+ throw new WebServiceException(ex);
+ }
+ }
+}
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1357/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1357/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java 2008-10-30 15:13:34 UTC (rev 8599)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1357/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java 2008-10-30 15:34:08 UTC (rev 8600)
@@ -62,6 +62,7 @@
List<Handler> handlerChain = new ArrayList<Handler>();
handlerChain.addAll(provider.getBinding().getHandlerChain());
handlerChain.add(new ClientHandler());
+ handlerChain.add(new ClientHandler2());
provider.getBinding().setHandlerChain(handlerChain);
String nsURI = port.namespace();
15 years, 6 months
- 1
- 0
JBossWS SVN: r8599 - in stack/native/branches/ropalka: modules/core/src/main/resources and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-30 11:13:34 -0400 (Thu, 30 Oct 2008)
New Revision: 8599
Added:
stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml
Removed:
stack/native/branches/ropalka/modules/core/src/main/resources/as4-jbossws-native-config.xml
stack/native/branches/ropalka/modules/core/src/main/resources/as5-jbossws-native-config.xml
Modified:
stack/native/branches/ropalka/modules/core/src/main/scripts/antrun-beans-config.xml
stack/native/branches/ropalka/modules/management/pom.xml
stack/native/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf
stack/native/branches/ropalka/pom.xml
Log:
[JBWS-2338] removing WSFRuntime abstraction
Deleted: stack/native/branches/ropalka/modules/core/src/main/resources/as4-jbossws-native-config.xml
===================================================================
--- stack/native/branches/ropalka/modules/core/src/main/resources/as4-jbossws-native-config.xml 2008-10-30 14:16:21 UTC (rev 8598)
+++ stack/native/branches/ropalka/modules/core/src/main/resources/as4-jbossws-native-config.xml 2008-10-30 15:13:34 UTC (rev 8599)
@@ -1,165 +0,0 @@
- <!-- An abstraction of server configuration aspects. -->
- <bean name="WSServerConfig" class="org.jboss.wsf.stack.jbws.NativeServerConfig">
- <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
-
- <!--
- The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address>
- element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address.
-
- If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'modifySOAPAddress' is true.
- If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below.
-
- If 'webServiceHost' is not set, JBossWS uses requesters protocol host when rewriting the <soap:address>.
- -->
- <property name="webServiceHost">${jboss.bind.address}</property>
- <property name="modifySOAPAddress">true</property>
-
- <!--
- Set these properties to explicitly define the ports that will be used for rewriting the SOAP address.
- Otherwise the ports will be identified by querying the list of installed connectors.
- If multiple connectors are found the port of the first connector is used.
- <property name="webServiceSecurePort">8443</property>
- <property name="webServicePort">8080</property>
- -->
- </bean>
-
- <!-- A subscription manager for WS-Eventing -->
- <bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager">
- <property name="bindAddress">${jboss.bind.address}</property>
- </bean>
-
- <!-- Installed Record Processors-->
- <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder">
- <property name="recording">false</property>
- </bean>
-
- <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder">
- <property name="recording">false</property>
- </bean>
-
- <bean name="StackRequestHandlerFactory" class="org.jboss.wsf.stack.jbws.RequestHandlerFactoryImpl"/>
-
- <!--
- The stack specific deployment aspects
- -->
-
- <bean name="WSNativeContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
- <property name="provides">ContextProperties,StackDescriptor</property>
- <property name="contextProperties">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.jbws.EndpointServlet</value></entry>
- </map>
- </property>
- </bean>
-
- <bean name="WSNativeEagerInitializeDeploymentAspect" class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect">
- <property name="requires">UnifiedMetaDataModel</property>
- <property name="provides">InitializedMetaDataModel</property>
- </bean>
-
- <bean name="WSNativeEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
- <property name="requires">ContainerEndpointHandler,ContainerMetaData</property>
- <property name="provides">StackEndpointHandler</property>
- </bean>
-
- <bean name="WSNativeEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
- <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
- <property name="requires">RegisteredEndpoint</property>
- <property name="provides">EndpointRecordProcessors</property>
- <property name="processors">
- <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
- <inject bean="WSMemoryBufferRecorder"/>
- <inject bean="WSLogRecorder"/>
- </list>
- </property>
- </bean>
-
- <bean name="WSNativeEventingDeploymentAspect" class="org.jboss.wsf.stack.jbws.EventingDeploymentAspect">
- <property name="requires">UnifiedMetaDataModel</property>
- </bean>
-
- <bean name="WSNativePublishContractDeploymentAspect" class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect">
- <property name="requires">UnifiedMetaDataModel,JAXBIntros</property>
- <property name="provides">PublishedContract</property>
- </bean>
-
- <bean name="WSNativeServiceEndpointInvokerDeploymentAspect" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect">
- <property name="requires">UnifiedMetaDataModel</property>
- </bean>
-
- <bean name="WSNativeRMDeploymentAspect" class="org.jboss.ws.extensions.wsrm.server.RMDeploymentAspect">
- <property name="requires">StackEndpointHandler,UnifiedMetaDataModel</property>
- </bean>
-
- <bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect">
- <property name="requires">RuntimeLoader,ContainerMetaData,URLPattern,VFSRoot,JAXBIntros</property>
- <property name="provides">UnifiedMetaDataModel</property>
- </bean>
-
- <bean name="WSJAXBIntroDeploymentAspect" class="org.jboss.wsf.stack.jbws.JAXBIntroDeploymentAspect">
- <property name="provides">JAXBIntros</property>
- </bean>
-
- <!--
- Deployment aspect installers
- -->
-
- <bean name="WSNativeDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property>
- <property name="sortAspectsOnCreate">true</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSNativeContextPropertiesDeploymentAspect"/>
- <inject bean="WSNativeEndpointHandlerDeploymentAspect"/>
- <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/>
- <inject bean="WSNativeEventingDeploymentAspect"/>
- <inject bean="WSNativePublishContractDeploymentAspect"/>
- <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/>
- <inject bean="WSNativeRMDeploymentAspect"/>
- <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/>
- <inject bean="WSNativeEagerInitializeDeploymentAspect"/>
- <inject bean="WSJAXBIntroDeploymentAspect"/>
- </set>
- </property>
- <depends>WSDeploymentAspectInstallerJSE</depends>
- </bean>
-
- <bean name="WSNativeDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
- <property name="sortAspectsOnCreate">true</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSNativeContextPropertiesDeploymentAspect"/>
- <inject bean="WSNativeEagerInitializeDeploymentAspect"/>
- <inject bean="WSNativeEndpointHandlerDeploymentAspect"/>
- <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/>
- <inject bean="WSNativeEventingDeploymentAspect"/>
- <inject bean="WSNativePublishContractDeploymentAspect"/>
- <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/>
- <inject bean="WSNativeRMDeploymentAspect"/>
- <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/>
- <inject bean="WSJAXBIntroDeploymentAspect"/>
- </set>
- </property>
- <depends>WSDeploymentAspectInstallerEJB</depends>
- </bean>
-
- <bean name="WSNativeDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property>
- <property name="sortAspectsOnCreate">true</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSNativeContextPropertiesDeploymentAspect"/>
- <inject bean="WSNativeEagerInitializeDeploymentAspect"/>
- <inject bean="WSNativeEndpointHandlerDeploymentAspect"/>
- <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/>
- <inject bean="WSNativeEventingDeploymentAspect"/>
- <inject bean="WSNativePublishContractDeploymentAspect"/>
- <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/>
- <inject bean="WSNativeRMDeploymentAspect"/>
- <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/>
- <inject bean="WSJAXBIntroDeploymentAspect"/>
- </set>
- </property>
- <depends>WSDeploymentAspectInstallerEndpointAPI</depends>
- </bean>
Deleted: stack/native/branches/ropalka/modules/core/src/main/resources/as5-jbossws-native-config.xml
===================================================================
--- stack/native/branches/ropalka/modules/core/src/main/resources/as5-jbossws-native-config.xml 2008-10-30 14:16:21 UTC (rev 8598)
+++ stack/native/branches/ropalka/modules/core/src/main/resources/as5-jbossws-native-config.xml 2008-10-30 15:13:34 UTC (rev 8599)
@@ -1,175 +0,0 @@
- <!-- An abstraction of server configuration aspects. -->
- <bean name="WSServerConfig" class="org.jboss.wsf.stack.jbws.NativeServerConfig">
- <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
-
- <!--
- The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address>
- element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address.
-
- If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'modifySOAPAddress' is true.
- If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below.
-
- If 'webServiceHost' is not set, JBossWS uses requesters protocol host when rewriting the <soap:address>.
- -->
- <property name="webServiceHost">${jboss.bind.address}</property>
- <property name="modifySOAPAddress">true</property>
-
- <!--
- Set these properties to explicitly define the ports that will be used for rewriting the SOAP address.
- Otherwise the ports will be identified by querying the list of installed connectors.
- If multiple connectors are found the port of the first connector is used.
- <property name="webServiceSecurePort">8443</property>
- <property name="webServicePort">8080</property>
- -->
- </bean>
-
- <!-- A subscription manager for WS-Eventing -->
- <bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager">
- <property name="bindAddress">${jboss.bind.address}</property>
- </bean>
-
- <!-- Installed Record Processors-->
- <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder">
- <property name="recording">false</property>
- </bean>
-
- <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder">
- <property name="recording">false</property>
- </bean>
-
- <bean name="StackRequestHandlerFactory" class="org.jboss.wsf.stack.jbws.RequestHandlerFactoryImpl"/>
-
- <!--
- The stack specific deployment aspects
- -->
-
- <bean name="WSNativeContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
- <property name="provides">ContextProperties,StackDescriptor</property>
- <property name="contextProperties">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.jbws.EndpointServlet</value></entry>
- <entry><key>org.jboss.ws.webapp.ServletAspectManagerName</key><value>WSNativeServletAspectManager</value></entry>
- </map>
- </property>
- </bean>
-
- <bean name="WSNativeEagerInitializeDeploymentAspect" class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect">
- <property name="requires">UnifiedMetaDataModel</property>
- <property name="provides">InitializedMetaDataModel</property>
- </bean>
-
- <bean name="WSNativeEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
- <property name="requires">ContainerEndpointHandler,ContainerMetaData</property>
- <property name="provides">StackEndpointHandler</property>
- </bean>
-
- <bean name="WSNativeEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
- <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
- <property name="requires">RegisteredEndpoint</property>
- <property name="provides">EndpointRecordProcessors</property>
- <property name="processors">
- <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
- <inject bean="WSMemoryBufferRecorder"/>
- <inject bean="WSLogRecorder"/>
- </list>
- </property>
- </bean>
-
- <bean name="WSNativeEventingDeploymentAspect" class="org.jboss.wsf.stack.jbws.EventingDeploymentAspect">
- <property name="requires">UnifiedMetaDataModel</property>
- </bean>
-
- <bean name="WSNativePublishContractDeploymentAspect" class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect">
- <property name="requires">UnifiedMetaDataModel,JAXBIntros</property>
- <property name="provides">PublishedContract</property>
- </bean>
-
- <bean name="WSNativeServiceEndpointInvokerDeploymentAspect" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect">
- <property name="requires">UnifiedMetaDataModel</property>
- </bean>
-
- <bean name="WSNativeRMDeploymentAspect" class="org.jboss.ws.extensions.wsrm.server.RMDeploymentAspect">
- <property name="requires">StackEndpointHandler,UnifiedMetaDataModel</property>
- </bean>
-
- <bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect">
- <property name="requires">RuntimeLoader,ContainerMetaData,URLPattern,VFSRoot,JAXBIntros</property>
- <property name="provides">UnifiedMetaDataModel</property>
- </bean>
-
- <bean name="WSJAXBIntroDeploymentAspect" class="org.jboss.wsf.stack.jbws.JAXBIntroDeploymentAspect">
- <property name="provides">JAXBIntros</property>
- </bean>
-
- <!-- This is hacky DA because endpoint servlet DAs depend on deployers DAs. But servlet DAs and deployers DAs are not in the same DA chain -->
- <bean name="WSNativeDeployersProvidedDeploymentAspect" class="org.jboss.wsf.framework.deployment.IdentityDeploymentAspect">
- <property name="provides">RuntimeLoader,ContainerMetaData,URLPattern,VFSRoot,StackEndpointHandler</property>
- </bean>
-
- <!--
- The endpoint servlet DA manager
- -->
-
- <bean name="WSNativeServletAspectManager" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
- <property name="name">WSNativeServletAspectManager</property>
- </bean>
-
- <!--
- Deployment aspect installers
- -->
-
- <bean name="WSNativeDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property>
- <property name="sortAspectsOnCreate">true</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSNativeContextPropertiesDeploymentAspect"/>
- <inject bean="WSNativeEndpointHandlerDeploymentAspect"/>
- <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/>
- </set>
- </property>
- <depends>WSDeploymentAspectInstallerJSE</depends>
- </bean>
-
- <bean name="WSNativeDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
- <property name="sortAspectsOnCreate">true</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSNativeContextPropertiesDeploymentAspect"/>
- <inject bean="WSNativeEndpointHandlerDeploymentAspect"/>
- <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/>
- </set>
- </property>
- <depends>WSDeploymentAspectInstallerEJB</depends>
- </bean>
-
- <bean name="WSNativeDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property>
- <property name="sortAspectsOnCreate">true</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSNativeContextPropertiesDeploymentAspect"/>
- <inject bean="WSNativeEndpointHandlerDeploymentAspect"/>
- <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/>
- </set>
- </property>
- <depends>WSDeploymentAspectInstallerEndpointAPI</depends>
- </bean>
-
- <bean name="WSNativeServletAspectManagerInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSNativeServletAspectManager"/></property>
- <property name="sortAspectsOnCreate">true</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSNativeDeployersProvidedDeploymentAspect"/><!-- hacky DA -->
- <inject bean="WSNativeEagerInitializeDeploymentAspect"/>
- <inject bean="WSNativeEventingDeploymentAspect"/>
- <inject bean="WSNativePublishContractDeploymentAspect"/>
- <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/>
- <inject bean="WSNativeRMDeploymentAspect"/>
- <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/>
- <inject bean="WSJAXBIntroDeploymentAspect"/>
- </set>
- </property>
- </bean>
Added: stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml
===================================================================
--- stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml (rev 0)
+++ stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml 2008-10-30 15:13:34 UTC (rev 8599)
@@ -0,0 +1,174 @@
+ <!-- An abstraction of server configuration aspects. -->
+ <bean name="WSServerConfig" class="org.jboss.wsf.stack.jbws.NativeServerConfig">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+
+ <!--
+ The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address>
+ element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address.
+
+ If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'modifySOAPAddress' is true.
+ If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below.
+
+ If 'webServiceHost' is not set, JBossWS uses requesters protocol host when rewriting the <soap:address>.
+ -->
+ <property name="webServiceHost">${jboss.bind.address}</property>
+ <property name="modifySOAPAddress">true</property>
+
+ <!--
+ Set these properties to explicitly define the ports that will be used for rewriting the SOAP address.
+ Otherwise the ports will be identified by querying the list of installed connectors.
+ If multiple connectors are found the port of the first connector is used.
+ <property name="webServiceSecurePort">8443</property>
+ <property name="webServicePort">8080</property>
+ -->
+ </bean>
+
+ <!-- The registry for web service endpoints -->
+ <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+ </bean>
+
+ <!-- A subscription manager for WS-Eventing -->
+ <bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager">
+ <property name="bindAddress">${jboss.bind.address}</property>
+ </bean>
+
+ <!-- Installed Record Processors-->
+ <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder">
+ <property name="recording">false</property>
+ </bean>
+ <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder">
+ <property name="recording">false</property>
+ </bean>
+
+ <!--
+ The stack specific deployment aspects
+ -->
+ <bean name="WSNativeContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
+ <property name="provides">ContextProperties, StackDescriptor</property>
+ <property name="contextProperties">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.jbws.EndpointServlet</value></entry>
+ </map>
+ </property>
+ </bean>
+
+ <bean name="WSNativeEagerInitializeDeploymentAspect" class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect">
+ <property name="requires">UnifiedMetaDataModel</property>
+ <property name="provides">InitializedMetaDataModel</property>
+ </bean>
+
+ <bean name="WSNativeEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
+ <property name="requires">ContainerEndpointHandler, ContainerMetaData</property>
+ <property name="provides">StackEndpointHandler</property>
+ </bean>
+
+ <bean name="WSNativeEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+ <property name="requires">RegisteredEndpoint</property>
+ <property name="provides">EndpointRecordProcessors</property>
+ <property name="processors">
+ <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
+ <inject bean="WSMemoryBufferRecorder"/>
+ <inject bean="WSLogRecorder"/>
+ </list>
+ </property>
+ </bean>
+
+ <bean name="WSNativeEventingDeploymentAspect" class="org.jboss.wsf.stack.jbws.EventingDeploymentAspect">
+ <property name="requires">UnifiedMetaDataModel</property>
+ </bean>
+
+ <bean name="WSNativePublishContractDeploymentAspect" class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect">
+ <property name="requires">UnifiedMetaDataModel, JAXBIntros</property>
+ <property name="provides">PublishedContract</property>
+ </bean>
+
+ <bean name="WSNativeServiceEndpointInvokerDeploymentAspect" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect">
+ <property name="requires">UnifiedMetaDataModel</property>
+ </bean>
+
+ <bean name="WSNativeRMDeploymentAspect" class="org.jboss.ws.extensions.wsrm.server.RMDeploymentAspect">
+ <property name="requires">StackEndpointHandler, UnifiedMetaDataModel</property>
+ </bean>
+
+ <bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect">
+ <property name="requires">RuntimeLoader, ContainerMetaData, URLPattern, VFSRoot, JAXBIntros</property>
+ <property name="provides">UnifiedMetaDataModel</property>
+ </bean>
+
+ <bean name="WSJAXBIntroDeploymentAspect" class="org.jboss.wsf.stack.jbws.JAXBIntroDeploymentAspect">
+ <property name="provides">JAXBIntros</property>
+ </bean>
+
+ <!-- Deployment aspect installers -->
+ <!-- Phase 1 -->
+ <bean name="WSNativeDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property>
+ <property name="sortAspectsOnCreate">true</property>
+ <property name="aspects">
+ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSNativeContextPropertiesDeploymentAspect"/>
+ </set>
+ </property>
+ <depends>WSDeploymentAspectInstallerPreJSE</depends>
+ </bean>
+ <!-- Phase 2 -->
+ <bean name="WSNativeDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property>
+ <property name="sortAspectsOnCreate">true</property>
+ <property name="aspects">
+ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSNativeEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/>
+ <inject bean="WSNativeEventingDeploymentAspect"/>
+ <inject bean="WSNativePublishContractDeploymentAspect"/>
+ <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/>
+ <inject bean="WSNativeRMDeploymentAspect"/>
+ <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/>
+ <inject bean="WSNativeEagerInitializeDeploymentAspect"/>
+ <inject bean="WSJAXBIntroDeploymentAspect"/>
+ </set>
+ </property>
+ <depends>WSDeploymentAspectInstallerPostJSE</depends>
+ </bean>
+
+ <bean name="WSNativeDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
+ <property name="sortAspectsOnCreate">true</property>
+ <property name="aspects">
+ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSNativeContextPropertiesDeploymentAspect"/>
+ <inject bean="WSNativeEagerInitializeDeploymentAspect"/>
+ <inject bean="WSNativeEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/>
+ <inject bean="WSNativeEventingDeploymentAspect"/>
+ <inject bean="WSNativePublishContractDeploymentAspect"/>
+ <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/>
+ <inject bean="WSNativeRMDeploymentAspect"/>
+ <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/>
+ <inject bean="WSJAXBIntroDeploymentAspect"/>
+ </set>
+ </property>
+ <depends>WSDeploymentAspectInstallerEJB</depends>
+ </bean>
+
+ <bean name="WSNativeDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property>
+ <property name="sortAspectsOnCreate">true</property>
+ <property name="aspects">
+ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSNativeContextPropertiesDeploymentAspect"/>
+ <inject bean="WSNativeEagerInitializeDeploymentAspect"/>
+ <inject bean="WSNativeEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/>
+ <inject bean="WSNativeEventingDeploymentAspect"/>
+ <inject bean="WSNativePublishContractDeploymentAspect"/>
+ <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/>
+ <inject bean="WSNativeRMDeploymentAspect"/>
+ <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/>
+ <inject bean="WSJAXBIntroDeploymentAspect"/>
+ </set>
+ </property>
+ <depends>WSDeploymentAspectInstallerEndpointAPI</depends>
+ </bean>
Modified: stack/native/branches/ropalka/modules/core/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/native/branches/ropalka/modules/core/src/main/scripts/antrun-beans-config.xml 2008-10-30 14:16:21 UTC (rev 8598)
+++ stack/native/branches/ropalka/modules/core/src/main/scripts/antrun-beans-config.xml 2008-10-30 15:13:34 UTC (rev 8599)
@@ -33,7 +33,7 @@
<header trimleading="yes">
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
xmlns="urn:jboss:bean-deployer"> </header>
- <fileset file="${project.resources.directory}/as4-jbossws-native-config.xml"/>
+ <fileset file="${project.resources.directory}/jbossws-native-config.xml"/>
<fileset file="${project.build.resources.directory}/jbossws-jboss422/jbossws-jboss42-config.xml"/>
<footer trimleading="yes">
</deployment> </footer>
@@ -45,7 +45,7 @@
<header trimleading="yes">
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
xmlns="urn:jboss:bean-deployer"> </header>
- <fileset file="${project.resources.directory}/as4-jbossws-native-config.xml"/>
+ <fileset file="${project.resources.directory}/jbossws-native-config.xml"/>
<fileset file="${project.build.resources.directory}/jbossws-jboss423/jbossws-jboss42-config.xml"/>
<footer trimleading="yes">
</deployment> </footer>
@@ -57,7 +57,7 @@
<header trimleading="yes">
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
xmlns="urn:jboss:bean-deployer"> </header>
- <fileset file="${project.resources.directory}/as4-jbossws-native-config.xml"/>
+ <fileset file="${project.resources.directory}/jbossws-native-config.xml"/>
<fileset file="${project.build.resources.directory}/jbossws-jboss424/jbossws-jboss42-config.xml"/>
<footer trimleading="yes">
</deployment> </footer>
@@ -68,7 +68,7 @@
<concat destfile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/jboss-beans.xml">
<header trimleading="yes">
<deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${project.resources.directory}/as5-jbossws-native-config.xml"/>
+ <fileset file="${project.resources.directory}/jbossws-native-config.xml"/>
<footer trimleading="yes">
</deployment> </footer>
</concat>
@@ -78,7 +78,7 @@
<concat destfile="${project.build.resources.directory}/jbossws-jboss501/jbossws.beans/META-INF/jboss-beans.xml">
<header trimleading="yes">
<deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${project.resources.directory}/as5-jbossws-native-config.xml"/>
+ <fileset file="${project.resources.directory}/jbossws-native-config.xml"/>
<footer trimleading="yes">
</deployment> </footer>
</concat>
Modified: stack/native/branches/ropalka/modules/management/pom.xml
===================================================================
--- stack/native/branches/ropalka/modules/management/pom.xml 2008-10-30 14:16:21 UTC (rev 8598)
+++ stack/native/branches/ropalka/modules/management/pom.xml 2008-10-30 15:13:34 UTC (rev 8599)
@@ -54,21 +54,9 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR2</artifactId>
- <classifier>container</classifier>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500x</artifactId>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500x</artifactId>
- <classifier>container</classifier>
- <scope>runtime</scope>
- </dependency>
<!-- END -->
<dependency>
<groupId>org.jboss.jaxr</groupId>
Modified: stack/native/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf
===================================================================
--- stack/native/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf 2008-10-30 14:16:21 UTC (rev 8598)
+++ stack/native/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf 2008-10-30 15:13:34 UTC (rev 8599)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-native-jaxrpc.jar server/default/lib/jbossw!
s-native-jaxws-ext.jar server/default/lib/jbossws-native-jaxws.jar server/default/lib/jbossws-native-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-native-jaxrpc.jar server/default/lib/jbossw!
s-native-jaxws-ext.jar server/default/lib/jbossws-native-jaxws.jar server/default/lib/jbossws-native-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml
Modified: stack/native/branches/ropalka/pom.xml
===================================================================
--- stack/native/branches/ropalka/pom.xml 2008-10-30 14:16:21 UTC (rev 8598)
+++ stack/native/branches/ropalka/pom.xml 2008-10-30 15:13:34 UTC (rev 8599)
@@ -156,12 +156,6 @@
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500CR2</artifactId>
<version>${jbossws.jboss500.version}</version>
- <classifier>container</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR2</artifactId>
- <version>${jbossws.jboss500.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
@@ -174,12 +168,6 @@
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500x</artifactId>
<version>${jbossws.jboss501.version}</version>
- <classifier>container</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500x</artifactId>
- <version>${jbossws.jboss501.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
15 years, 6 months
- 1
- 0
JBossWS SVN: r8598 - in stack/cxf/branches/ropalka: modules/management and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-30 10:16:21 -0400 (Thu, 30 Oct 2008)
New Revision: 8598
Added:
stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml
Removed:
stack/cxf/branches/ropalka/modules/server/src/main/resources/as4-jbossws-cxf-config.xml
stack/cxf/branches/ropalka/modules/server/src/main/resources/as5-jbossws-cxf-config.xml
Modified:
stack/cxf/branches/ropalka/modules/management/pom.xml
stack/cxf/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf
stack/cxf/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml
stack/cxf/branches/ropalka/pom.xml
Log:
[JBWS-2338] removing WSFRuntime abstraction
Modified: stack/cxf/branches/ropalka/modules/management/pom.xml
===================================================================
--- stack/cxf/branches/ropalka/modules/management/pom.xml 2008-10-30 13:53:53 UTC (rev 8597)
+++ stack/cxf/branches/ropalka/modules/management/pom.xml 2008-10-30 14:16:21 UTC (rev 8598)
@@ -54,21 +54,9 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR2</artifactId>
- <classifier>container</classifier>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500x</artifactId>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500x</artifactId>
- <classifier>container</classifier>
- <scope>runtime</scope>
- </dependency>
<!-- END -->
<dependency>
<groupId>jboss.jaxr</groupId>
Modified: stack/cxf/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf
===================================================================
--- stack/cxf/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf 2008-10-30 13:53:53 UTC (rev 8597)
+++ stack/cxf/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf 2008-10-30 14:16:21 UTC (rev 8598)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-native-jaxrpc.jar server/default/lib/jbossw!
s-native-jaxws-ext.jar server/default/lib/jbossws-native-jaxws.jar server/default/lib/jbossws-native-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-native-jaxrpc.jar server/default/lib/jbossw!
s-native-jaxws-ext.jar server/default/lib/jbossws-native-jaxws.jar server/default/lib/jbossws-native-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml
Deleted: stack/cxf/branches/ropalka/modules/server/src/main/resources/as4-jbossws-cxf-config.xml
===================================================================
--- stack/cxf/branches/ropalka/modules/server/src/main/resources/as4-jbossws-cxf-config.xml 2008-10-30 13:53:53 UTC (rev 8597)
+++ stack/cxf/branches/ropalka/modules/server/src/main/resources/as4-jbossws-cxf-config.xml 2008-10-30 14:16:21 UTC (rev 8598)
@@ -1,111 +0,0 @@
- <!-- An abstraction of server configuration aspects. -->
- <bean name="WSServerConfig" class="org.jboss.wsf.stack.cxf.CXFServerConfig">
- <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
-
- <!--
- The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address>
- element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address.
-
- If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'modifySOAPAddress' is true.
- If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below.
-
- If 'webServiceHost' is not set, JBossWS uses requesters protocol host and port when rewriting the <soap:address>.
- -->
- <property name="webServiceHost">${jboss.bind.address}</property>
- <property name="modifySOAPAddress">true</property>
-
- <!--
- Set these properties to explicitly define the ports that will be used for rewriting the SOAP address.
- Otherwise the ports will be identified by querying the list of installed connectors.
- If multiple connectors are found the port of the first connector is used.
- <property name="webServiceSecurePort">8443</property>
- <property name="webServicePort">8080</property>
- -->
- </bean>
-
- <!-- Logging redirector -->
- <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector">
- <property name="namespaces">
- <list class="java.util.LinkedList" elementClass="java.lang.String">
- <value>org.apache.cxf</value>
- </list>
- </property>
- </bean>
-
- <!-- Installed Record Processors-->
- <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder">
- <property name="recording">false</property>
- </bean>
- <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder">
- <property name="recording">false</property>
- </bean>
-
- <bean name="StackRequestHandlerFactory" class="org.jboss.wsf.stack.cxf.RequestHandlerFactoryImpl"/>
-
- <!--
- The stack specific deployment aspects
- -->
- <bean name="WSCXFContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
- <property name="provides">ContextProperties</property>
- <property name="contextProperties">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.cxf.CXFServletExt</value></entry>
- </map>
- </property>
- </bean>
-
- <bean name="WSCXFDescriptorDeploymentAspect" class="org.jboss.wsf.stack.cxf.DescriptorDeploymentAspect">
- <property name="requires">EndpointAddress,WebMetaData</property>
- <property name="provides">StackDescriptor</property>
- <property name="invokerEJB3">org.jboss.wsf.stack.cxf.InvokerEJB3</property>
- <property name="invokerJSE">org.jboss.wsf.stack.cxf.InvokerJSE</property>
- </bean>
-
- <bean name="WSCXFEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
- <property name="requires">ContainerEndpointHandler</property>
- <property name="provides">StackEndpointHandler</property>
- </bean>
-
- <bean name="WSCXFEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
- <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
- <property name="requires">RegisteredEndpoint</property>
- <property name="provides">EndpointRecordProcessors</property>
- <property name="processors">
- <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
- <inject bean="WSMemoryBufferRecorder"/>
- <inject bean="WSLogRecorder"/>
- </list>
- </property>
- </bean>
-
- <!--
- Deployment aspect installers
- -->
-
- <bean name="WSCXFDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property>
- <property name="sortAspectsOnCreate">true</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSCXFContextPropertiesDeploymentAspect"/>
- <inject bean="WSCXFDescriptorDeploymentAspect"/>
- <inject bean="WSCXFEndpointHandlerDeploymentAspect"/>
- <inject bean="WSCXFEndpointRecordProcessorDeploymentAspect"/>
- </set>
- </property>
- <depends>WSDeploymentAspectInstallerJSE</depends>
- </bean>
-
- <bean name="WSCXFDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
- <property name="sortAspectsOnCreate">true</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSCXFContextPropertiesDeploymentAspect"/>
- <inject bean="WSCXFEndpointHandlerDeploymentAspect"/>
- <inject bean="WSCXFEndpointRecordProcessorDeploymentAspect"/>
- <inject bean="WSCXFDescriptorDeploymentAspect"/>
- </set>
- </property>
- <depends>WSDeploymentAspectInstallerEJB</depends>
- </bean>
Deleted: stack/cxf/branches/ropalka/modules/server/src/main/resources/as5-jbossws-cxf-config.xml
===================================================================
--- stack/cxf/branches/ropalka/modules/server/src/main/resources/as5-jbossws-cxf-config.xml 2008-10-30 13:53:53 UTC (rev 8597)
+++ stack/cxf/branches/ropalka/modules/server/src/main/resources/as5-jbossws-cxf-config.xml 2008-10-30 14:16:21 UTC (rev 8598)
@@ -1,111 +0,0 @@
- <!-- An abstraction of server configuration aspects. -->
- <bean name="WSServerConfig" class="org.jboss.wsf.stack.cxf.CXFServerConfig">
- <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
-
- <!--
- The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address>
- element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address.
-
- If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'modifySOAPAddress' is true.
- If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below.
-
- If 'webServiceHost' is not set, JBossWS uses requesters protocol host and port when rewriting the <soap:address>.
- -->
- <property name="webServiceHost">${jboss.bind.address}</property>
- <property name="modifySOAPAddress">true</property>
-
- <!--
- Set these properties to explicitly define the ports that will be used for rewriting the SOAP address.
- Otherwise the ports will be identified by querying the list of installed connectors.
- If multiple connectors are found the port of the first connector is used.
- <property name="webServiceSecurePort">8443</property>
- <property name="webServicePort">8080</property>
- -->
- </bean>
-
- <!-- Logging redirector -->
- <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector">
- <property name="namespaces">
- <list class="java.util.LinkedList" elementClass="java.lang.String">
- <value>org.apache.cxf</value>
- </list>
- </property>
- </bean>
-
- <!-- Installed Record Processors-->
- <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder">
- <property name="recording">false</property>
- </bean>
- <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder">
- <property name="recording">false</property>
- </bean>
-
- <bean name="StackRequestHandlerFactory" class="org.jboss.wsf.stack.cxf.RequestHandlerFactoryImpl"/>
-
- <!--
- The stack specific deployment aspects
- -->
- <bean name="WSCXFContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
- <property name="provides">ContextProperties</property>
- <property name="contextProperties">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.cxf.CXFServletExt</value></entry>
- </map>
- </property>
- </bean>
-
- <bean name="WSCXFDescriptorDeploymentAspect" class="org.jboss.wsf.stack.cxf.DescriptorDeploymentAspect">
- <property name="requires">EndpointAddress,WebMetaData</property>
- <property name="provides">StackDescriptor</property>
- <property name="invokerEJB3">org.jboss.wsf.stack.cxf.InvokerEJB3</property>
- <property name="invokerJSE">org.jboss.wsf.stack.cxf.InvokerJSE</property>
- </bean>
-
- <bean name="WSCXFEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
- <property name="requires">ContainerEndpointHandler</property>
- <property name="provides">StackEndpointHandler</property>
- </bean>
-
- <bean name="WSCXFEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
- <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
- <property name="requires">RegisteredEndpoint</property>
- <property name="provides">EndpointRecordProcessors</property>
- <property name="processors">
- <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
- <inject bean="WSMemoryBufferRecorder"/>
- <inject bean="WSLogRecorder"/>
- </list>
- </property>
- </bean>
-
- <!--
- Deployment aspect installers
- -->
-
- <bean name="WSCXFDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property>
- <property name="sortAspectsOnCreate">true</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSCXFContextPropertiesDeploymentAspect"/>
- <inject bean="WSCXFDescriptorDeploymentAspect"/>
- <inject bean="WSCXFEndpointHandlerDeploymentAspect"/>
- <inject bean="WSCXFEndpointRecordProcessorDeploymentAspect"/>
- </set>
- </property>
- <depends>WSDeploymentAspectInstallerJSE</depends>
- </bean>
-
- <bean name="WSCXFDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
- <property name="sortAspectsOnCreate">true</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSCXFContextPropertiesDeploymentAspect"/>
- <inject bean="WSCXFEndpointHandlerDeploymentAspect"/>
- <inject bean="WSCXFEndpointRecordProcessorDeploymentAspect"/>
- <inject bean="WSCXFDescriptorDeploymentAspect"/>
- </set>
- </property>
- <depends>WSDeploymentAspectInstallerEJB</depends>
- </bean>
Added: stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml
===================================================================
--- stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml (rev 0)
+++ stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml 2008-10-30 14:16:21 UTC (rev 8598)
@@ -0,0 +1,126 @@
+
+ <!-- An abstraction of server configuration aspects. -->
+ <bean name="WSServerConfig" class="org.jboss.wsf.stack.cxf.CXFServerConfig">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+
+ <!--
+ The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address>
+ element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address.
+
+ If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'modifySOAPAddress' is true.
+ If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below.
+
+ If 'webServiceHost' is not set, JBossWS uses requesters protocol host and port when rewriting the <soap:address>.
+ -->
+ <property name="webServiceHost">${jboss.bind.address}</property>
+ <property name="modifySOAPAddress">true</property>
+
+ <!--
+ Set these properties to explicitly define the ports that will be used for rewriting the SOAP address.
+ Otherwise the ports will be identified by querying the list of installed connectors.
+ If multiple connectors are found the port of the first connector is used.
+ <property name="webServiceSecurePort">8443</property>
+ <property name="webServicePort">8080</property>
+ -->
+ </bean>
+
+ <!-- The registry for web service endpoints -->
+ <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+ </bean>
+
+ <!-- Logging redirector -->
+ <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector">
+ <property name="namespaces">
+ <list class="java.util.LinkedList" elementClass="java.lang.String">
+ <value>org.apache.cxf</value>
+ </list>
+ </property>
+ </bean>
+
+ <!-- Installed Record Processors-->
+ <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder">
+ <property name="recording">false</property>
+ </bean>
+ <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder">
+ <property name="recording">false</property>
+ </bean>
+
+ <!--
+ The stack specific deployment aspects
+ -->
+ <bean name="WSCXFContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
+ <property name="provides">ContextProperties</property>
+ <property name="contextProperties">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.cxf.CXFServletExt</value></entry>
+ </map>
+ </property>
+ </bean>
+
+ <bean name="WSCXFDescriptorDeploymentAspect" class="org.jboss.wsf.stack.cxf.DescriptorDeploymentAspect">
+ <property name="requires">EndpointAddress</property>
+ <property name="provides">StackDescriptor</property>
+ <property name="invokerEJB3">org.jboss.wsf.stack.cxf.InvokerEJB3</property>
+ <property name="invokerJSE">org.jboss.wsf.stack.cxf.InvokerJSE</property>
+ </bean>
+
+ <bean name="WSCXFEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
+ <property name="requires">ContainerEndpointHandler</property>
+ <property name="provides">StackEndpointHandler</property>
+ </bean>
+
+ <bean name="WSCXFEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+ <property name="requires">RegisteredEndpoint</property>
+ <property name="provides">EndpointRecordProcessors</property>
+ <property name="processors">
+ <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
+ <inject bean="WSMemoryBufferRecorder"/>
+ <inject bean="WSLogRecorder"/>
+ </list>
+ </property>
+ </bean>
+
+ <!-- Deployment aspect installers -->
+
+ <!-- Phase 2 -->
+ <bean name="WSCXFDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property>
+ <property name="sortAspectsOnCreate">true</property>
+ <property name="aspects">
+ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSCXFContextPropertiesDeploymentAspect"/>
+ <inject bean="WSCXFDescriptorDeploymentAspect"/>
+ </set>
+ </property>
+ <depends>WSDeploymentAspectInstallerPreJSE</depends>
+ </bean>
+
+ <!-- Phase 2 -->
+ <bean name="WSCXFDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property>
+ <property name="sortAspectsOnCreate">true</property>
+ <property name="aspects">
+ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSCXFEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSCXFEndpointRecordProcessorDeploymentAspect"/>
+ </set>
+ </property>
+ <depends>WSDeploymentAspectInstallerPostJSE</depends>
+ </bean>
+
+ <bean name="WSCXFDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
+ <property name="sortAspectsOnCreate">true</property>
+ <property name="aspects">
+ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSCXFContextPropertiesDeploymentAspect"/>
+ <inject bean="WSCXFEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSCXFEndpointRecordProcessorDeploymentAspect"/>
+ <inject bean="WSCXFDescriptorDeploymentAspect"/>
+ </set>
+ </property>
+ <depends>WSDeploymentAspectInstallerEJB</depends>
+ </bean>
+
Modified: stack/cxf/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/cxf/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml 2008-10-30 13:53:53 UTC (rev 8597)
+++ stack/cxf/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml 2008-10-30 14:16:21 UTC (rev 8598)
@@ -33,7 +33,7 @@
<header trimleading="yes">
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
xmlns="urn:jboss:bean-deployer"> </header>
- <fileset file="${project.resources.directory}/as4-jbossws-cxf-config.xml"/>
+ <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/>
<fileset file="${project.build.resources.directory}/jbossws-jboss422/jbossws-jboss42-config.xml"/>
<footer trimleading="yes">
</deployment> </footer>
@@ -45,7 +45,7 @@
<header trimleading="yes">
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
xmlns="urn:jboss:bean-deployer"> </header>
- <fileset file="${project.resources.directory}/as4-jbossws-cxf-config.xml"/>
+ <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/>
<fileset file="${project.build.resources.directory}/jbossws-jboss423/jbossws-jboss42-config.xml"/>
<footer trimleading="yes">
</deployment> </footer>
@@ -57,7 +57,7 @@
<header trimleading="yes">
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
xmlns="urn:jboss:bean-deployer"> </header>
- <fileset file="${project.resources.directory}/as4-jbossws-cxf-config.xml"/>
+ <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/>
<fileset file="${project.build.resources.directory}/jbossws-jboss424/jbossws-jboss42-config.xml"/>
<footer trimleading="yes">
</deployment> </footer>
@@ -68,7 +68,7 @@
<concat destfile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/jboss-beans.xml">
<header trimleading="yes">
<deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${project.resources.directory}/as5-jbossws-cxf-config.xml"/>
+ <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/>
<footer trimleading="yes">
</deployment> </footer>
</concat>
@@ -78,7 +78,7 @@
<concat destfile="${project.build.resources.directory}/jbossws-jboss501/jbossws.beans/META-INF/jboss-beans.xml">
<header trimleading="yes">
<deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${project.resources.directory}/as5-jbossws-cxf-config.xml"/>
+ <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/>
<footer trimleading="yes">
</deployment> </footer>
</concat>
Modified: stack/cxf/branches/ropalka/pom.xml
===================================================================
--- stack/cxf/branches/ropalka/pom.xml 2008-10-30 13:53:53 UTC (rev 8597)
+++ stack/cxf/branches/ropalka/pom.xml 2008-10-30 14:16:21 UTC (rev 8598)
@@ -143,12 +143,6 @@
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500CR2</artifactId>
<version>${jbossws.jboss500.version}</version>
- <classifier>container</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR2</artifactId>
- <version>${jbossws.jboss500.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
@@ -161,12 +155,6 @@
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500x</artifactId>
<version>${jbossws.jboss501.version}</version>
- <classifier>container</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500x</artifactId>
- <version>${jbossws.jboss501.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
15 years, 6 months
- 1
- 0
JBossWS SVN: r8597 - in stack/metro/branches/ropalka: modules/management and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-30 09:53:53 -0400 (Thu, 30 Oct 2008)
New Revision: 8597
Added:
stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml
Removed:
stack/metro/branches/ropalka/modules/server/src/main/resources/as4-jbossws-metro-config.xml
stack/metro/branches/ropalka/modules/server/src/main/resources/as5-jbossws-metro-config.xml
Modified:
stack/metro/branches/ropalka/modules/management/pom.xml
stack/metro/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf
stack/metro/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml
stack/metro/branches/ropalka/pom.xml
Log:
[JBWS-2338] removing WSFRuntime abstraction
Modified: stack/metro/branches/ropalka/modules/management/pom.xml
===================================================================
--- stack/metro/branches/ropalka/modules/management/pom.xml 2008-10-30 12:48:52 UTC (rev 8596)
+++ stack/metro/branches/ropalka/modules/management/pom.xml 2008-10-30 13:53:53 UTC (rev 8597)
@@ -54,21 +54,9 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR2</artifactId>
- <classifier>container</classifier>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500x</artifactId>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500x</artifactId>
- <classifier>container</classifier>
- <scope>runtime</scope>
- </dependency>
<!-- END -->
<dependency>
<groupId>org.jboss.jaxr</groupId>
Modified: stack/metro/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf
===================================================================
--- stack/metro/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf 2008-10-30 12:48:52 UTC (rev 8596)
+++ stack/metro/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf 2008-10-30 13:53:53 UTC (rev 8597)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-native-jaxrpc.jar server/default/lib/jbossw!
s-native-jaxws-ext.jar server/default/lib/jbossws-native-jaxws.jar server/default/lib/jbossws-native-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-native-jaxrpc.jar server/default/lib/jbossw!
s-native-jaxws-ext.jar server/default/lib/jbossws-native-jaxws.jar server/default/lib/jbossws-native-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml
Deleted: stack/metro/branches/ropalka/modules/server/src/main/resources/as4-jbossws-metro-config.xml
===================================================================
--- stack/metro/branches/ropalka/modules/server/src/main/resources/as4-jbossws-metro-config.xml 2008-10-30 12:48:52 UTC (rev 8596)
+++ stack/metro/branches/ropalka/modules/server/src/main/resources/as4-jbossws-metro-config.xml 2008-10-30 13:53:53 UTC (rev 8597)
@@ -1,118 +0,0 @@
- <!-- An abstraction of server configuration aspects. -->
- <bean name="WSServerConfig" class="org.jboss.wsf.stack.metro.MetroServerConfig">
- <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
-
- <!--
- The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address>
- element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address.
-
- If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'modifySOAPAddress' is true.
- If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below.
-
- If 'webServiceHost' is not set, JBossWS uses requesters protocol host and port when rewriting the <soap:address>.
- -->
- <property name="webServiceHost">${jboss.bind.address}</property>
- <property name="modifySOAPAddress">true</property>
-
- <!--
- Set these properties to explicitly define the ports that will be used for rewriting the SOAP address.
- Otherwise the ports will be identified by querying the list of installed connectors.
- If multiple connectors are found the port of the first connector is used.
- <property name="webServiceSecurePort">8443</property>
- <property name="webServicePort">8080</property>
- -->
- </bean>
-
- <!-- Logging redirector -->
- <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector">
- <property name="namespaces">
- <list class="java.util.LinkedList" elementClass="java.lang.String">
- <value>javax.enterprise.resource.webservices.jaxws</value>
- <value>com.sun</value>
- </list>
- </property>
- </bean>
-
- <!-- Installed Record Processors-->
- <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder">
- <property name="recording">false</property>
- </bean>
- <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder">
- <property name="recording">false</property>
- </bean>
-
- <bean name="StackRequestHandlerFactory" class="org.jboss.wsf.stack.metro.RequestHandlerFactoryImpl"/>
-
- <!--
- The stack specific deployment aspects
- -->
-
- <bean name="WSMetroContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
- <property name="provides">ContextProperties</property>
- <property name="contextProperties">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.metro.EndpointServlet</value></entry>
- </map>
- </property>
- </bean>
-
- <bean name="WSMetroEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
- <property name="requires">ContainerEndpointHandler</property>
- <property name="provides">StackEndpointHandler</property>
- </bean>
-
- <bean name="WSMetroEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
- <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
- <property name="requires">RegisteredEndpoint</property>
- <property name="provides">EndpointRecordProcessors</property>
- <property name="processors">
- <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
- <inject bean="WSMemoryBufferRecorder"/>
- <inject bean="WSLogRecorder"/>
- </list>
- </property>
- </bean>
-
- <bean name="WSMetroDescriptorDeploymentAspect" class="org.jboss.wsf.stack.metro.SunJaxwsDeploymentAspect">
- <property name="requires">URLPattern,WebMetaData</property>
- <property name="provides">StackDescriptor</property>
- </bean>
-
- <bean name="WSRuntimeModelDeploymentAspect" class="org.jboss.wsf.stack.metro.metadata.RuntimeModelDeploymentAspect">
- <property name="requires">RuntimeLoader,StackDescriptor</property>
- <property name="provides">RuntimeModel</property>
- </bean>
-
- <!--
- Deployment aspect installers
- -->
-
- <bean name="WSMetroDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property>
- <property name="sortAspectsOnCreate">true</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSMetroContextPropertiesDeploymentAspect"/>
- <inject bean="WSMetroDescriptorDeploymentAspect"/>
- <inject bean="WSMetroEndpointHandlerDeploymentAspect"/>
- <inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/>
- <inject bean="WSRuntimeModelDeploymentAspect"/>
- </set>
- </property>
- <depends>WSDeploymentAspectInstallerJSE</depends>
- </bean>
-
- <bean name="WSMetroDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
- <property name="sortAspectsOnCreate">true</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSMetroContextPropertiesDeploymentAspect"/>
- <inject bean="WSMetroDescriptorDeploymentAspect"/>
- <inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/>
- <inject bean="WSMetroEndpointHandlerDeploymentAspect"/>
- <inject bean="WSRuntimeModelDeploymentAspect"/>
- </set>
- </property>
- <depends>WSDeploymentAspectInstallerEJB</depends>
- </bean>
Deleted: stack/metro/branches/ropalka/modules/server/src/main/resources/as5-jbossws-metro-config.xml
===================================================================
--- stack/metro/branches/ropalka/modules/server/src/main/resources/as5-jbossws-metro-config.xml 2008-10-30 12:48:52 UTC (rev 8596)
+++ stack/metro/branches/ropalka/modules/server/src/main/resources/as5-jbossws-metro-config.xml 2008-10-30 13:53:53 UTC (rev 8597)
@@ -1,141 +0,0 @@
- <!-- An abstraction of server configuration aspects. -->
- <bean name="WSServerConfig" class="org.jboss.wsf.stack.metro.MetroServerConfig">
- <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
-
- <!--
- The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address>
- element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address.
-
- If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'modifySOAPAddress' is true.
- If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below.
-
- If 'webServiceHost' is not set, JBossWS uses requesters protocol host and port when rewriting the <soap:address>.
- -->
- <property name="webServiceHost">${jboss.bind.address}</property>
- <property name="modifySOAPAddress">true</property>
-
- <!--
- Set these properties to explicitly define the ports that will be used for rewriting the SOAP address.
- Otherwise the ports will be identified by querying the list of installed connectors.
- If multiple connectors are found the port of the first connector is used.
- <property name="webServiceSecurePort">8443</property>
- <property name="webServicePort">8080</property>
- -->
- </bean>
-
- <!-- Logging redirector -->
- <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector">
- <property name="namespaces">
- <list class="java.util.LinkedList" elementClass="java.lang.String">
- <value>javax.enterprise.resource.webservices.jaxws</value>
- <value>com.sun</value>
- </list>
- </property>
- </bean>
-
- <!-- Installed Record Processors-->
- <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder">
- <property name="recording">false</property>
- </bean>
- <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder">
- <property name="recording">false</property>
- </bean>
-
- <bean name="StackRequestHandlerFactory" class="org.jboss.wsf.stack.metro.RequestHandlerFactoryImpl"/>
-
- <!--
- The stack specific deployment aspects
- -->
-
- <bean name="WSMetroContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
- <property name="provides">ContextProperties</property>
- <property name="contextProperties">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.metro.EndpointServlet</value></entry>
- <entry><key>org.jboss.ws.webapp.ServletAspectManagerName</key><value>WSMetroServletAspectManager</value></entry>
- </map>
- </property>
- </bean>
-
- <bean name="WSMetroEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
- <property name="requires">ContainerEndpointHandler</property>
- <property name="provides">StackEndpointHandler</property>
- </bean>
-
- <bean name="WSMetroEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
- <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
- <property name="requires">RegisteredEndpoint</property>
- <property name="provides">EndpointRecordProcessors</property>
- <property name="processors">
- <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
- <inject bean="WSMemoryBufferRecorder"/>
- <inject bean="WSLogRecorder"/>
- </list>
- </property>
- </bean>
-
- <bean name="WSMetroDescriptorDeploymentAspect" class="org.jboss.wsf.stack.metro.SunJaxwsDeploymentAspect">
- <property name="requires">URLPattern,WebMetaData</property>
- <property name="provides">StackDescriptor</property>
- </bean>
-
- <bean name="WSRuntimeModelDeploymentAspect" class="org.jboss.wsf.stack.metro.metadata.RuntimeModelDeploymentAspect">
- <property name="requires">RuntimeLoader,StackDescriptor</property>
- <property name="provides">RuntimeModel</property>
- </bean>
-
- <!-- This is hacky DA because endpoint servlet DAs depend on deployers DAs. But servlet DAs and deployers DAs are not in the same DA chain -->
- <bean name="WSMetroDeployersProvidedDeploymentAspect" class="org.jboss.wsf.framework.deployment.IdentityDeploymentAspect">
- <property name="provides">RuntimeLoader,URLPattern,WebMetaData,StackDescriptor</property>
- </bean>
-
- <!--
- The endpoint servlet DA manager
- -->
-
- <bean name="WSMetroServletAspectManager" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
- <property name="name">WSMetroServletAspectManager</property>
- </bean>
-
- <!--
- Deployment aspect installers
- -->
-
- <bean name="WSMetroDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property>
- <property name="sortAspectsOnCreate">true</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSMetroContextPropertiesDeploymentAspect"/>
- <inject bean="WSMetroDescriptorDeploymentAspect"/>
- <inject bean="WSMetroEndpointHandlerDeploymentAspect"/>
- <inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/>
- </set>
- </property>
- <depends>WSDeploymentAspectInstallerJSE</depends>
- </bean>
-
- <bean name="WSMetroDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
- <property name="sortAspectsOnCreate">true</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSMetroContextPropertiesDeploymentAspect"/>
- <inject bean="WSMetroDescriptorDeploymentAspect"/>
- <inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/>
- <inject bean="WSMetroEndpointHandlerDeploymentAspect"/>
- </set>
- </property>
- <depends>WSDeploymentAspectInstallerEJB</depends>
- </bean>
-
- <bean name="WSMetroServletAspectManagerInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSMetroServletAspectManager"/></property>
- <property name="sortAspectsOnCreate">true</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSMetroDeployersProvidedDeploymentAspect"/><!-- hacky DA -->
- <inject bean="WSRuntimeModelDeploymentAspect"/>
- </set>
- </property>
- </bean>
Added: stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml
===================================================================
--- stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml (rev 0)
+++ stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml 2008-10-30 13:53:53 UTC (rev 8597)
@@ -0,0 +1,130 @@
+
+ <!-- An abstraction of server configuration aspects. -->
+ <bean name="WSServerConfig" class="org.jboss.wsf.stack.metro.MetroServerConfig">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+
+ <!--
+ The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address>
+ element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address.
+
+ If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'modifySOAPAddress' is true.
+ If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below.
+
+ If 'webServiceHost' is not set, JBossWS uses requesters protocol host and port when rewriting the <soap:address>.
+ -->
+ <property name="webServiceHost">${jboss.bind.address}</property>
+ <property name="modifySOAPAddress">true</property>
+
+ <!--
+ Set these properties to explicitly define the ports that will be used for rewriting the SOAP address.
+ Otherwise the ports will be identified by querying the list of installed connectors.
+ If multiple connectors are found the port of the first connector is used.
+ <property name="webServiceSecurePort">8443</property>
+ <property name="webServicePort">8080</property>
+ -->
+ </bean>
+
+ <!-- The registry for web service endpoints -->
+ <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+ </bean>
+
+ <!-- Logging redirector -->
+ <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector">
+ <property name="namespaces">
+ <list class="java.util.LinkedList" elementClass="java.lang.String">
+ <value>javax.enterprise.resource.webservices.jaxws</value>
+ <value>com.sun</value>
+ </list>
+ </property>
+ </bean>
+
+ <!-- Installed Record Processors-->
+ <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder">
+ <property name="recording">false</property>
+ </bean>
+ <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder">
+ <property name="recording">false</property>
+ </bean>
+
+ <!--
+ The stack specific deployment aspects
+ -->
+ <bean name="WSMetroContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
+ <property name="provides">ContextProperties</property>
+ <property name="contextProperties">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.metro.EndpointServlet</value></entry>
+ </map>
+ </property>
+ </bean>
+
+ <bean name="WSMetroEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
+ <property name="requires">ContainerEndpointHandler</property>
+ <property name="provides">StackEndpointHandler</property>
+ </bean>
+
+ <bean name="WSMetroEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+ <property name="requires">RegisteredEndpoint</property>
+ <property name="provides">EndpointRecordProcessors</property>
+ <property name="processors">
+ <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
+ <inject bean="WSMemoryBufferRecorder"/>
+ <inject bean="WSLogRecorder"/>
+ </list>
+ </property>
+ </bean>
+
+ <bean name="WSMetroDescriptorDeploymentAspect" class="org.jboss.wsf.stack.metro.SunJaxwsDeploymentAspect">
+ <property name="requires">URLPattern</property>
+ <property name="provides">StackDescriptor</property>
+ </bean>
+
+ <bean name="WSRuntimeModelDeploymentAspect" class="org.jboss.wsf.stack.metro.metadata.RuntimeModelDeploymentAspect">
+ <property name="requires">RuntimeLoader, StackDescriptor</property>
+ <property name="provides">RuntimeModel</property>
+ </bean>
+ <!-- Deployment aspect installers -->
+
+ <!-- Phase 1 -->
+ <bean name="WSMetroDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property>
+ <property name="sortAspectsOnCreate">true</property>
+ <property name="aspects">
+ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSMetroContextPropertiesDeploymentAspect"/>
+ <inject bean="WSMetroDescriptorDeploymentAspect"/>
+ </set>
+ </property>
+ <depends>WSDeploymentAspectInstallerPreJSE</depends>
+ </bean>
+
+ <!-- Phase 2 -->
+ <bean name="WSMetroDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property>
+ <property name="sortAspectsOnCreate">true</property>
+ <property name="aspects">
+ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSMetroEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/>
+ <inject bean="WSRuntimeModelDeploymentAspect"/>
+ </set>
+ </property>
+ <depends>WSDeploymentAspectInstallerPostJSE</depends>
+ </bean>
+
+ <bean name="WSMetroDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
+ <property name="sortAspectsOnCreate">true</property>
+ <property name="aspects">
+ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSMetroContextPropertiesDeploymentAspect"/>
+ <inject bean="WSMetroEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/>
+ <inject bean="WSMetroDescriptorDeploymentAspect"/>
+ <inject bean="WSRuntimeModelDeploymentAspect"/>
+ </set>
+ </property>
+ <depends>WSDeploymentAspectInstallerEJB</depends>
+ </bean>
Modified: stack/metro/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/metro/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml 2008-10-30 12:48:52 UTC (rev 8596)
+++ stack/metro/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml 2008-10-30 13:53:53 UTC (rev 8597)
@@ -33,7 +33,7 @@
<header trimleading="yes">
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
xmlns="urn:jboss:bean-deployer"> </header>
- <fileset file="${project.resources.directory}/as4-jbossws-metro-config.xml"/>
+ <fileset file="${project.resources.directory}/jbossws-metro-config.xml"/>
<fileset file="${project.build.resources.directory}/jbossws-jboss422/jbossws-jboss42-config.xml"/>
<footer trimleading="yes">
</deployment> </footer>
@@ -45,7 +45,7 @@
<header trimleading="yes">
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
xmlns="urn:jboss:bean-deployer"> </header>
- <fileset file="${project.resources.directory}/as4-jbossws-metro-config.xml"/>
+ <fileset file="${project.resources.directory}/jbossws-metro-config.xml"/>
<fileset file="${project.build.resources.directory}/jbossws-jboss423/jbossws-jboss42-config.xml"/>
<footer trimleading="yes">
</deployment> </footer>
@@ -57,7 +57,7 @@
<header trimleading="yes">
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
xmlns="urn:jboss:bean-deployer"> </header>
- <fileset file="${project.resources.directory}/as4-jbossws-metro-config.xml"/>
+ <fileset file="${project.resources.directory}/jbossws-metro-config.xml"/>
<fileset file="${project.build.resources.directory}/jbossws-jboss424/jbossws-jboss42-config.xml"/>
<footer trimleading="yes">
</deployment> </footer>
@@ -68,7 +68,7 @@
<concat destfile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/jboss-beans.xml">
<header trimleading="yes">
<deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${project.resources.directory}/as5-jbossws-metro-config.xml"/>
+ <fileset file="${project.resources.directory}/jbossws-metro-config.xml"/>
<footer trimleading="yes">
</deployment> </footer>
</concat>
@@ -78,7 +78,7 @@
<concat destfile="${project.build.resources.directory}/jbossws-jboss501/jbossws.beans/META-INF/jboss-beans.xml">
<header trimleading="yes">
<deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${project.resources.directory}/as5-jbossws-metro-config.xml"/>
+ <fileset file="${project.resources.directory}/jbossws-metro-config.xml"/>
<footer trimleading="yes">
</deployment> </footer>
</concat>
Modified: stack/metro/branches/ropalka/pom.xml
===================================================================
--- stack/metro/branches/ropalka/pom.xml 2008-10-30 12:48:52 UTC (rev 8596)
+++ stack/metro/branches/ropalka/pom.xml 2008-10-30 13:53:53 UTC (rev 8597)
@@ -146,12 +146,6 @@
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500CR2</artifactId>
<version>${jbossws.jboss500.version}</version>
- <classifier>container</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR2</artifactId>
- <version>${jbossws.jboss500.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
@@ -164,12 +158,6 @@
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500x</artifactId>
<version>${jbossws.jboss501.version}</version>
- <classifier>container</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500x</artifactId>
- <version>${jbossws.jboss501.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
15 years, 6 months
- 1
- 0
JBossWS SVN: r8596 - stack/native/branches.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-10-30 08:48:52 -0400 (Thu, 30 Oct 2008)
New Revision: 8596
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1357/
Log:
[JBPAPP-1357] Branch for patch.
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1357 (from rev 8595, stack/native/tags/jbossws-native-2.0.1.SP2_CP03)
15 years, 6 months
- 1
- 0
JBossWS SVN: r8595 - container/jboss50/ropalka-trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-30 08:29:56 -0400 (Thu, 30 Oct 2008)
New Revision: 8595
Modified:
container/jboss50/ropalka-trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPreJSE.java
container/jboss50/ropalka-trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPreJSE.java
Log:
deployer hooks must deal with undeployment
Modified: container/jboss50/ropalka-trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPreJSE.java
===================================================================
--- container/jboss50/ropalka-trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPreJSE.java 2008-10-30 12:29:33 UTC (rev 8594)
+++ container/jboss50/ropalka-trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPreJSE.java 2008-10-30 12:29:56 UTC (rev 8595)
@@ -45,11 +45,6 @@
public class JAXRPCDeployerHookPreJSE extends AbstractDeployerHookJSE
{
- public void undeploy(DeploymentUnit unit)
- {
- // the JAXRPCDeployerHookPostJSE deals with undeployments
- }
-
/** Get the deployemnt type this deployer can handle
*/
public DeploymentType getDeploymentType()
Modified: container/jboss50/ropalka-trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPreJSE.java
===================================================================
--- container/jboss50/ropalka-trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPreJSE.java 2008-10-30 12:29:33 UTC (rev 8594)
+++ container/jboss50/ropalka-trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPreJSE.java 2008-10-30 12:29:56 UTC (rev 8595)
@@ -46,12 +46,6 @@
public class JAXWSDeployerHookPreJSE extends AbstractDeployerHookJSE
{
-
- public void undeploy(DeploymentUnit unit)
- {
- // the JAXWSDeployerHookPostJSE deals with undeployment
- }
-
/** Get the deployment type this deployer can handle
*/
public DeploymentType getDeploymentType()
15 years, 6 months
- 1
- 0
JBossWS SVN: r8594 - in container/jboss50/ropalka-trunk/src/main: resources/jbossws-jboss50.deployer/META-INF and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-30 08:29:33 -0400 (Thu, 30 Oct 2008)
New Revision: 8594
Modified:
container/jboss50/ropalka-trunk/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java
container/jboss50/ropalka-trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
Log:
remove JBWS-2246 hacks
Modified: container/jboss50/ropalka-trunk/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java
===================================================================
--- container/jboss50/ropalka-trunk/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java 2008-10-30 07:40:01 UTC (rev 8593)
+++ container/jboss50/ropalka-trunk/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java 2008-10-30 12:29:33 UTC (rev 8594)
@@ -117,16 +117,6 @@
servlet.setInitParam(initParams);
}
- if (servlet.getLoadOnStartup() <= 0)
- {
- // [JBWS-2246] hack. We need to start all webservice endpoint servlets because of
- // wsdl-publish-location feature. This feature generates wsdl to specified file
- // location on the FS. Without starting the servlets the WSDL will not be published
- // because publish wsdl deployment aspect is now called in endpoint init servlet
- // lifecycle method and not in the deployers chain as it was in AS 4.x series.
- servlet.setLoadOnStartup(1);
- }
-
String linkName = servlet.getServletName();
// find the servlet-class
Modified: container/jboss50/ropalka-trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
===================================================================
--- container/jboss50/ropalka-trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2008-10-30 07:40:01 UTC (rev 8593)
+++ container/jboss50/ropalka-trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2008-10-30 12:29:33 UTC (rev 8594)
@@ -227,7 +227,7 @@
<property name="provides">ContainerEndpointHandler</property>
</bean>
- <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointDeployerLifecycleDeploymentAspect"> <!-- TODO: rollback to EndpointLifecycleDeploymentAspect -->
+ <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect">
<property name="requires">LAST_DEPLOYMENT_ASPECT</property>
</bean>
15 years, 6 months
- 1
- 0
JBossWS SVN: r8593 - container/jboss50/ropalka-trunk/src/main/resources/jbossws-jboss50.deployer/META-INF.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-30 03:40:01 -0400 (Thu, 30 Oct 2008)
New Revision: 8593
Modified:
container/jboss50/ropalka-trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
Log:
[JBWS-2338] fix wrong package
Modified: container/jboss50/ropalka-trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
===================================================================
--- container/jboss50/ropalka-trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2008-10-29 20:48:10 UTC (rev 8592)
+++ container/jboss50/ropalka-trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2008-10-30 07:40:01 UTC (rev 8593)
@@ -273,8 +273,8 @@
</bean>
<!-- Deployment aspect helper beans -->
- <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss50.invocation.SecurityHandlerEJB21"/>
- <bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss50.invocation.SecurityHandlerEJB3"/>
+ <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss50.deployment.tomcat.SecurityHandlerEJB21"/>
+ <bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss50.deployment.tomcat.SecurityHandlerEJB3"/>
<bean name="WSWebMetaDataModifier" class="org.jboss.wsf.container.jboss50.deployment.tomcat.WebMetaDataModifierImpl"/>
<!-- Deployment aspect installers -->
15 years, 6 months
- 1
- 0
JBossWS SVN: r8592 - stack/cxf/branches/ropalka/src/main/scripts.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-29 16:48:10 -0400 (Wed, 29 Oct 2008)
New Revision: 8592
Modified:
stack/cxf/branches/ropalka/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2338] jbossws-container-jboss-beans.xml no more available
Modified: stack/cxf/branches/ropalka/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/branches/ropalka/src/main/scripts/assembly-deploy-artifacts.xml 2008-10-29 20:47:55 UTC (rev 8591)
+++ stack/cxf/branches/ropalka/src/main/scripts/assembly-deploy-artifacts.xml 2008-10-29 20:48:10 UTC (rev 8592)
@@ -113,26 +113,6 @@
<include>*:jbossws-jboss500x:jar</include>
</includes>
</dependencySet>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>jbossws-jboss500-${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>runtime</scope>
- <unpack>false</unpack>
- <includes>
- <include>*:jbossws-jboss500CR2:jar:container</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>jbossws-jboss501-${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>runtime</scope>
- <unpack>false</unpack>
- <includes>
- <include>*:jbossws-jboss500x:jar:container</include>
- </includes>
- </dependencySet>
<!-- END -->
</dependencySets>
</binaries>
15 years, 6 months
- 1
- 0