JBossWS SVN: r18684 - in stack/cxf/trunk/modules: client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-05-20 06:24:27 -0400 (Tue, 20 May 2014)
New Revision: 18684
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFServiceRefFactoryImpl.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as8.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as9.xml
Log:
[JBWS-3779] WIP
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java 2014-05-20 10:23:19 UTC (rev 18683)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java 2014-05-20 10:24:27 UTC (rev 18684)
@@ -34,7 +34,6 @@
import org.jboss.logging.Message;
import org.jboss.logging.MessageBundle;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.DeploymentType;
import org.jboss.wsf.spi.deployment.WSFDeploymentException;
/**
@@ -195,9 +194,6 @@
@Message(id = 24076, value = "Service %s, cannot publish wsdl to: %s")
RuntimeException cannotPublishWSDLTo(QName serviceName, File file, @Cause Throwable cause);
- @Message(id = 24082, value = "Unsupported deployment type: %s")
- IllegalStateException unsupportedDeploymentType(DeploymentType depType);
-
@Message(id = 24083, value = "Endpoint %s is not defined in jbossws-cxf.xml")
IllegalStateException endpointNotDefineInJbwsCxf(String ep);
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFServiceRefFactoryImpl.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFServiceRefFactoryImpl.java 2014-05-20 10:23:19 UTC (rev 18683)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFServiceRefFactoryImpl.java 2014-05-20 10:24:27 UTC (rev 18684)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -23,8 +23,6 @@
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
import org.jboss.wsf.spi.serviceref.ServiceRefFactory;
-import org.jboss.wsf.spi.serviceref.ServiceRefType;
-import org.jboss.wsf.stack.cxf.Messages;
/**
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
@@ -34,10 +32,6 @@
@Override
public Object newServiceRef(final UnifiedServiceRefMetaData serviceRefUMDM)
{
- if (serviceRefUMDM.getType() == ServiceRefType.JAXWS) {
- return new CXFServiceObjectFactoryJAXWS().getObjectInstance(serviceRefUMDM);
- } else {
- throw Messages.MESSAGES.jaxrpcServiceRefNotSupported();
- }
+ return new CXFServiceObjectFactoryJAXWS().getObjectInstance(serviceRefUMDM);
}
}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2014-05-20 10:23:19 UTC (rev 18683)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2014-05-20 10:24:27 UTC (rev 18684)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -21,8 +21,6 @@
*/
package org.jboss.wsf.stack.cxf.deployment.aspect;
-import static org.jboss.wsf.spi.deployment.DeploymentType.JAXRPC;
-import static org.jboss.ws.common.integration.WSHelper.isJaxrpcDeployment;
import static org.jboss.ws.common.integration.WSHelper.isJseDeployment;
import static org.jboss.ws.common.integration.WSHelper.isWarArchive;
import static org.jboss.wsf.stack.cxf.Loggers.DEPLOYMENT_LOGGER;
@@ -35,7 +33,6 @@
import org.jboss.ws.common.integration.WSConstants;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.stack.cxf.Messages;
import org.jboss.wsf.stack.cxf.client.Constants;
import org.jboss.wsf.stack.cxf.client.util.SpringUtils;
import org.jboss.wsf.stack.cxf.configuration.BusHolder;
@@ -96,10 +93,6 @@
*/
private URL getCXFConfigFromDeployment(Deployment dep)
{
- if (isJaxrpcDeployment(dep))
- {
- throw Messages.MESSAGES.unsupportedDeploymentType(JAXRPC);
- }
String metadir = null;
if (isJseDeployment(dep) || isWarArchive(dep))
{
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as8.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as8.xml 2014-05-20 10:23:19 UTC (rev 18683)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as8.xml 2014-05-20 10:24:27 UTC (rev 18684)
@@ -34,41 +34,34 @@
</entry>
</map>
</property>
- <property name="forJaxRpc" class="boolean">false</property>
</deploymentAspect>
<deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.DescriptorDeploymentAspect">
<property name="requires" class="java.lang.String">EndpointAddress,JAXBIntros</property>
<property name="provides" class="java.lang.String">StackDescriptor</property>
- <property name="forJaxRpc" class="boolean">false</property>
</deploymentAspect>
<deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.ResourceResolverDeploymentAspect">
<property name="provides" class="java.lang.String">ResourceResolver</property>
- <property name="forJaxRpc" class="boolean">false</property>
</deploymentAspect>
<deploymentAspect class="org.jboss.ws.common.deployment.EndpointHandlerDeploymentAspect">
<property name="requires" class="java.lang.String">ContainerMetaData</property>
<property name="provides" class="java.lang.String">StackEndpointHandler</property>
- <property name="forJaxRpc" class="boolean">false</property>
</deploymentAspect>
<deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.CXFInstanceProviderDeploymentAspect">
<property name="requires" class="java.lang.String">ContainerMetaData,BusHolder</property>
<property name="provides" class="java.lang.String">StackInstanceProvider</property>
- <property name="forJaxRpc" class="boolean">false</property>
</deploymentAspect>
<deploymentAspect class="org.jboss.ws.common.deployment.JAXBIntroDeploymentAspect">
<property name="provides" class="java.lang.String">JAXBIntros</property>
- <property name="forJaxRpc" class="boolean">false</property>
</deploymentAspect>
<deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.BusDeploymentAspect">
<property name="provides" class="java.lang.String">BusHolder</property>
<property name="requires" class="java.lang.String">ResourceResolver,StackDescriptor</property>
- <property name="forJaxRpc" class="boolean">false</property>
</deploymentAspect>
</deploymentAspects>
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as9.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as9.xml 2014-05-20 10:23:19 UTC (rev 18683)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as9.xml 2014-05-20 10:24:27 UTC (rev 18684)
@@ -34,41 +34,34 @@
</entry>
</map>
</property>
- <property name="forJaxRpc" class="boolean">false</property>
</deploymentAspect>
<deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.DescriptorDeploymentAspect">
<property name="requires" class="java.lang.String">EndpointAddress,JAXBIntros</property>
<property name="provides" class="java.lang.String">StackDescriptor</property>
- <property name="forJaxRpc" class="boolean">false</property>
</deploymentAspect>
<deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.ResourceResolverDeploymentAspect">
<property name="provides" class="java.lang.String">ResourceResolver</property>
- <property name="forJaxRpc" class="boolean">false</property>
</deploymentAspect>
<deploymentAspect class="org.jboss.ws.common.deployment.EndpointHandlerDeploymentAspect">
<property name="requires" class="java.lang.String">ContainerMetaData</property>
<property name="provides" class="java.lang.String">StackEndpointHandler</property>
- <property name="forJaxRpc" class="boolean">false</property>
</deploymentAspect>
<deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.CXFInstanceProviderDeploymentAspect">
<property name="requires" class="java.lang.String">ContainerMetaData,BusHolder</property>
<property name="provides" class="java.lang.String">StackInstanceProvider</property>
- <property name="forJaxRpc" class="boolean">false</property>
</deploymentAspect>
<deploymentAspect class="org.jboss.ws.common.deployment.JAXBIntroDeploymentAspect">
<property name="provides" class="java.lang.String">JAXBIntros</property>
- <property name="forJaxRpc" class="boolean">false</property>
</deploymentAspect>
<deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.BusDeploymentAspect">
<property name="provides" class="java.lang.String">BusHolder</property>
<property name="requires" class="java.lang.String">ResourceResolver,StackDescriptor</property>
- <property name="forJaxRpc" class="boolean">false</property>
</deploymentAspect>
</deploymentAspects>
9 years, 11 months
- 1
- 0
JBossWS SVN: r18683 - in container/wildfly80/branches/jbossws-wildfly800/server-integration/src: main/java/org/jboss/as/webservices/deployers/deployment and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-05-20 06:23:19 -0400 (Tue, 20 May 2014)
New Revision: 18683
Modified:
container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/AspectDeploymentProcessor.java
container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/EndpointServiceDeploymentAspect.java
container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/AbstractDeploymentModelBuilder.java
container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_EJB.java
container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_JMS.java
container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_POJO.java
container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/injection/InjectionDeploymentAspect.java
container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/invocation/AbstractInvocationHandler.java
container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/publish/EndpointPublisherImpl.java
container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/tomcat/ServletDelegateFactoryImpl.java
container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/tomcat/WebMetaDataModifier.java
container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/util/VirtualFileAdaptor.java
container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WSRefUtils.java
container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WebServiceReferences.java
container/wildfly80/branches/jbossws-wildfly800/server-integration/src/test/java/org/jboss/as/webservices/parser/TestDA1.java
Log:
[JBWS-3779] WIP
Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/AspectDeploymentProcessor.java
===================================================================
--- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/AspectDeploymentProcessor.java 2014-05-20 10:23:04 UTC (rev 18682)
+++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/AspectDeploymentProcessor.java 2014-05-20 10:23:19 UTC (rev 18683)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -66,17 +66,15 @@
if (isWebServiceDeployment(unit)) {
ensureAspectInitialized();
final Deployment dep = ASHelper.getRequiredAttachment(unit, WSAttachmentKeys.DEPLOYMENT_KEY);
- if (aspect.canHandle(dep)) {
- ROOT_LOGGER.aspectStart(aspect, unit.getName());
- ClassLoader origClassLoader = WildFlySecurityManager.getCurrentContextClassLoaderPrivileged();
- try {
- WildFlySecurityManager.setCurrentContextClassLoaderPrivileged(aspect.getLoader());
- dep.addAttachment(ServiceTarget.class, phaseContext.getServiceTarget());
- aspect.start(dep);
- dep.removeAttachment(ServiceTarget.class);
- } finally {
- WildFlySecurityManager.setCurrentContextClassLoaderPrivileged(origClassLoader);
- }
+ ROOT_LOGGER.aspectStart(aspect, unit.getName());
+ ClassLoader origClassLoader = WildFlySecurityManager.getCurrentContextClassLoaderPrivileged();
+ try {
+ WildFlySecurityManager.setCurrentContextClassLoaderPrivileged(aspect.getLoader());
+ dep.addAttachment(ServiceTarget.class, phaseContext.getServiceTarget());
+ aspect.start(dep);
+ dep.removeAttachment(ServiceTarget.class);
+ } finally {
+ WildFlySecurityManager.setCurrentContextClassLoaderPrivileged(origClassLoader);
}
}
}
@@ -85,15 +83,13 @@
public void undeploy(final DeploymentUnit unit) {
if (isWebServiceDeployment(unit)) {
final Deployment dep = ASHelper.getRequiredAttachment(unit, WSAttachmentKeys.DEPLOYMENT_KEY);
- if (aspect.canHandle(dep)) {
- ROOT_LOGGER.aspectStop(aspect, unit.getName());
- ClassLoader origClassLoader = WildFlySecurityManager.getCurrentContextClassLoaderPrivileged();
- try {
- WildFlySecurityManager.setCurrentContextClassLoaderPrivileged(aspect.getLoader());
- aspect.stop(dep);
- } finally {
- WildFlySecurityManager.setCurrentContextClassLoaderPrivileged(origClassLoader);
- }
+ ROOT_LOGGER.aspectStop(aspect, unit.getName());
+ ClassLoader origClassLoader = WildFlySecurityManager.getCurrentContextClassLoaderPrivileged();
+ try {
+ WildFlySecurityManager.setCurrentContextClassLoaderPrivileged(aspect.getLoader());
+ aspect.stop(dep);
+ } finally {
+ WildFlySecurityManager.setCurrentContextClassLoaderPrivileged(origClassLoader);
}
}
}
Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/EndpointServiceDeploymentAspect.java
===================================================================
--- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/EndpointServiceDeploymentAspect.java 2014-05-20 10:23:04 UTC (rev 18682)
+++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/EndpointServiceDeploymentAspect.java 2014-05-20 10:23:19 UTC (rev 18683)
@@ -70,8 +70,6 @@
public Object clone() {
EndpointServiceDeploymentAspect clone = new EndpointServiceDeploymentAspect();
- clone.setForJaxRpc(isForJaxRpc());
- clone.setForJaxWs(isForJaxWs());
clone.setLast(isLast());
clone.setProvides(getProvides());
clone.setRelativeOrder(getRelativeOrder());
Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/AbstractDeploymentModelBuilder.java
===================================================================
--- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/AbstractDeploymentModelBuilder.java 2014-05-20 10:23:04 UTC (rev 18682)
+++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/AbstractDeploymentModelBuilder.java 2014-05-20 10:23:19 UTC (rev 18683)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -48,7 +48,6 @@
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentModelFactory;
-import org.jboss.wsf.spi.deployment.DeploymentType;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.EndpointType;
import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
@@ -65,21 +64,17 @@
/** Deployment model factory. */
private final DeploymentModelFactory deploymentModelFactory;
- /** Deployment type this builder creates. */
- private final DeploymentType deploymentType;
-
/** Endpoint type this builder creates. */
private final EndpointType endpointType;
/**
* Constructor.
*/
- protected AbstractDeploymentModelBuilder(final DeploymentType deploymentType, final EndpointType endpointType) {
+ protected AbstractDeploymentModelBuilder(final EndpointType endpointType) {
// deployment factory
final ClassLoader cl = AbstractDeploymentModelBuilder.class.getClassLoader();
final SPIProvider spiProvider = SPIProviderResolver.getInstance(cl).getProvider();
this.deploymentModelFactory = spiProvider.getSPI(DeploymentModelFactory.class, cl);
- this.deploymentType = deploymentType;
this.endpointType = endpointType;
}
@@ -210,7 +205,6 @@
dep.setRootFile(new ResourceLoaderAdapter(classLoader));
}
dep.setRuntimeClassLoader(classLoader);
- dep.setType(deploymentType);
//add an AnnotationInfo attachment that uses composite jandex index
dep.addAttachment(AnnotationsInfo.class, new JandexAnnotationsInfo(unit));
Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_EJB.java
===================================================================
--- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_EJB.java 2014-05-20 10:23:04 UTC (rev 18682)
+++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_EJB.java 2014-05-20 10:23:19 UTC (rev 18683)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -24,7 +24,6 @@
import static org.jboss.as.webservices.WSLogger.ROOT_LOGGER;
import static org.jboss.as.webservices.metadata.model.AbstractEndpoint.COMPONENT_VIEW_NAME;
import static org.jboss.as.webservices.util.ASHelper.getJaxwsEjbs;
-import static org.jboss.wsf.spi.deployment.DeploymentType.JAXWS;
import static org.jboss.wsf.spi.deployment.EndpointType.JAXWS_EJB3;
import org.jboss.as.server.deployment.DeploymentUnit;
@@ -40,7 +39,7 @@
final class DeploymentModelBuilderJAXWS_EJB extends AbstractDeploymentModelBuilder {
DeploymentModelBuilderJAXWS_EJB() {
- super(JAXWS, JAXWS_EJB3);
+ super(JAXWS_EJB3);
}
@Override
Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_JMS.java
===================================================================
--- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_JMS.java 2014-05-20 10:23:04 UTC (rev 18682)
+++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_JMS.java 2014-05-20 10:23:19 UTC (rev 18683)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -24,7 +24,6 @@
import static org.jboss.as.webservices.WSLogger.ROOT_LOGGER;
import static org.jboss.as.webservices.util.ASHelper.getOptionalAttachment;
import static org.jboss.as.webservices.util.WSAttachmentKeys.JMS_ENDPOINT_METADATA_KEY;
-import static org.jboss.wsf.spi.deployment.DeploymentType.JAXWS;
import static org.jboss.wsf.spi.deployment.EndpointType.JAXWS_JSE;
import org.jboss.as.server.deployment.DeploymentUnit;
@@ -40,7 +39,7 @@
final class DeploymentModelBuilderJAXWS_JMS extends AbstractDeploymentModelBuilder {
DeploymentModelBuilderJAXWS_JMS() {
- super(JAXWS, JAXWS_JSE);
+ super(JAXWS_JSE);
}
@Override
Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_POJO.java
===================================================================
--- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_POJO.java 2014-05-20 10:23:04 UTC (rev 18682)
+++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_POJO.java 2014-05-20 10:23:19 UTC (rev 18683)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -24,7 +24,6 @@
import static org.jboss.as.webservices.WSLogger.ROOT_LOGGER;
import static org.jboss.as.webservices.metadata.model.AbstractEndpoint.COMPONENT_VIEW_NAME;
import static org.jboss.as.webservices.util.ASHelper.getJaxwsPojos;
-import static org.jboss.wsf.spi.deployment.DeploymentType.JAXWS;
import static org.jboss.wsf.spi.deployment.EndpointType.JAXWS_JSE;
import org.jboss.as.server.deployment.DeploymentUnit;
@@ -40,7 +39,7 @@
final class DeploymentModelBuilderJAXWS_POJO extends AbstractDeploymentModelBuilder {
DeploymentModelBuilderJAXWS_POJO() {
- super(JAXWS, JAXWS_JSE);
+ super(JAXWS_JSE);
}
@Override
Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/injection/InjectionDeploymentAspect.java
===================================================================
--- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/injection/InjectionDeploymentAspect.java 2014-05-20 10:23:04 UTC (rev 18682)
+++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/injection/InjectionDeploymentAspect.java 2014-05-20 10:23:19 UTC (rev 18683)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat, Inc., and individual contributors
+ * Copyright 2014, Red Hat, Inc., and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -19,7 +19,6 @@
* 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.as.webservices.injection;
import java.security.AccessController;
@@ -35,7 +34,6 @@
import org.jboss.msc.service.ServiceName;
import org.jboss.ws.common.deployment.ReferenceFactory;
import org.jboss.ws.common.integration.AbstractDeploymentAspect;
-import org.jboss.ws.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.InstanceProvider;
@@ -48,8 +46,6 @@
@Override
public void start(final Deployment dep) {
- if (WSHelper.isJaxrpcDeployment(dep)) return;
-
for (final Endpoint ep : dep.getService().getEndpoints()) {
setInjectionAwareInstanceProvider(ep);
}
Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/invocation/AbstractInvocationHandler.java
===================================================================
--- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/invocation/AbstractInvocationHandler.java 2014-05-20 10:23:04 UTC (rev 18682)
+++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/invocation/AbstractInvocationHandler.java 2014-05-20 10:23:19 UTC (rev 18683)
@@ -36,6 +36,7 @@
import org.jboss.as.ee.component.Component;
import org.jboss.as.ee.component.ComponentView;
import org.jboss.as.naming.ManagedReference;
+import org.jboss.as.webservices.WSLogger;
import org.jboss.as.webservices.injection.WSComponent;
import org.jboss.invocation.InterceptorContext;
import org.jboss.msc.service.ServiceName;
@@ -132,7 +133,7 @@
wsInvocation.setReturnValue(retObj);
}
catch (Throwable t) {
- log.error(MESSAGES.methodInvocationFailed(t.getLocalizedMessage()), t);
+ WSLogger.ROOT_LOGGER.error(MESSAGES.methodInvocationFailed(t.getLocalizedMessage()), t);
handleInvocationException(t);
}
finally {
Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/publish/EndpointPublisherImpl.java
===================================================================
--- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/publish/EndpointPublisherImpl.java 2014-05-20 10:23:04 UTC (rev 18682)
+++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/publish/EndpointPublisherImpl.java 2014-05-20 10:23:19 UTC (rev 18683)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2012, Red Hat, Inc., and individual contributors
+ * Copyright 2014, Red Hat, Inc., and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -324,7 +324,6 @@
depAspects.add(aspect);
//add another aspect to set InvocationHandlerJAXWS to each endpoint
ForceJAXWSInvocationHandlerDeploymentAspect handlerAspect = new ForceJAXWSInvocationHandlerDeploymentAspect();
- handlerAspect.setForJaxRpc(false);
depAspects.add(handlerAspect);
} else {
depAspects.add(aspect);
@@ -349,7 +348,6 @@
publisherDepAspects.add(aspect);
//add another aspect to set InvocationHandlerJAXWS to each endpoint
ForceJAXWSInvocationHandlerDeploymentAspect handlerAspect = new ForceJAXWSInvocationHandlerDeploymentAspect();
- handlerAspect.setForJaxRpc(false);
publisherDepAspects.add(handlerAspect);
} else {
publisherDepAspects.add(aspect);
Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/tomcat/ServletDelegateFactoryImpl.java
===================================================================
--- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/tomcat/ServletDelegateFactoryImpl.java 2014-05-20 10:23:04 UTC (rev 18682)
+++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/tomcat/ServletDelegateFactoryImpl.java 2014-05-20 10:23:19 UTC (rev 18683)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -28,7 +28,7 @@
import org.jboss.wsf.spi.deployment.ServletDelegateFactory;
/**
- * AS7 implementation of {@link org.jboss.wsf.spi.deployment.ServletDelegateFactory}
+ * WildFly implementation of {@link org.jboss.wsf.spi.deployment.ServletDelegateFactory}
* that uses modular classloading for creating the delegate instance.
*
* @author alessio.soldano(a)jboss.com
@@ -38,11 +38,10 @@
public final class ServletDelegateFactoryImpl implements ServletDelegateFactory {
@Override
- public ServletDelegate newServletDelegate(final String servletClassName, final boolean isJaxWs) {
+ public ServletDelegate newServletDelegate(final String servletClassName) {
final ClassLoaderProvider provider = ClassLoaderProvider.getDefaultProvider();
- final ClassLoader classLoader = isJaxWs ? provider.getServerIntegrationClassLoader() : provider.getServerJAXRPCIntegrationClassLoader();
try {
- final Class<?> clazz = classLoader.loadClass(servletClassName);
+ final Class<?> clazz = provider.getServerIntegrationClassLoader().loadClass(servletClassName);
return (ServletDelegate) clazz.newInstance();
} catch (final Exception e) {
throw MESSAGES.cannotInstantiateServletDelegate(e, servletClassName);
Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/tomcat/WebMetaDataModifier.java
===================================================================
--- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/tomcat/WebMetaDataModifier.java 2014-05-20 10:23:04 UTC (rev 18682)
+++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/tomcat/WebMetaDataModifier.java 2014-05-20 10:23:19 UTC (rev 18683)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -94,8 +94,6 @@
final List<ParamValueMetaData> initParams = WebMetaDataHelper.getServletInitParams(servletMD);
// configure transport class name
WebMetaDataHelper.newParamValue(WSFServlet.STACK_SERVLET_DELEGATE_CLASS, transportClassName, initParams);
- // configure the integration classloader to be used (JAXRPC or JAXWS)
- WebMetaDataHelper.newParamValue(WSFServlet.INTEGRATION_CLASSLOADER, dep.getType().toString(), initParams);
// configure webservice endpoint
WebMetaDataHelper.newParamValue(Endpoint.SEPID_DOMAIN_ENDPOINT, endpointClassName, initParams);
}
Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/util/VirtualFileAdaptor.java
===================================================================
--- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/util/VirtualFileAdaptor.java 2014-05-20 10:23:04 UTC (rev 18682)
+++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/util/VirtualFileAdaptor.java 2014-05-20 10:23:19 UTC (rev 18683)
@@ -43,7 +43,7 @@
private static final long serialVersionUID = -4509594124653184349L;
- private transient VirtualFile file;
+ private final transient VirtualFile file;
public VirtualFileAdaptor(VirtualFile file) {
this.file = file;
Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WSRefUtils.java
===================================================================
--- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WSRefUtils.java 2014-05-20 10:23:04 UTC (rev 18682)
+++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WSRefUtils.java 2014-05-20 10:23:19 UTC (rev 18683)
@@ -65,7 +65,6 @@
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaDataBuilder;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData;
-import org.jboss.wsf.spi.serviceref.ServiceRefType;
/**
* Translates WS Refs from JBossAS MD to JBossWS UMDM format.
@@ -127,8 +126,6 @@
builder.setHandlerChain(jbossServiceRefMD.getHandlerChain());
}
- builder.setType(ServiceRefType.JAXWS);
-
return builder.build();
}
Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WebServiceReferences.java
===================================================================
--- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WebServiceReferences.java 2014-05-20 10:23:04 UTC (rev 18682)
+++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WebServiceReferences.java 2014-05-20 10:23:19 UTC (rev 18683)
@@ -1,5 +1,7 @@
package org.jboss.as.webservices.webserviceref;
+import static org.jboss.as.webservices.webserviceref.WSRefUtils.processAnnotatedElement;
+
import java.lang.reflect.AnnotatedElement;
import javax.xml.ws.Service;
@@ -14,11 +16,8 @@
import org.jboss.modules.Module;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
-import org.jboss.wsf.spi.serviceref.ServiceRefType;
import org.wildfly.security.manager.WildFlySecurityManager;
-import static org.jboss.as.webservices.webserviceref.WSRefUtils.processAnnotatedElement;
-
/**
* Utility class that encapsulates the creation of web service ref factories.
* <p/>
@@ -74,8 +73,6 @@
} else {
serviceRefUMDM.setServiceInterface(Service.class.getName());
}
- // ref type
- serviceRefUMDM.setType(ServiceRefType.JAXWS);
return serviceRefUMDM;
}
Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/test/java/org/jboss/as/webservices/parser/TestDA1.java
===================================================================
--- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/test/java/org/jboss/as/webservices/parser/TestDA1.java 2014-05-20 10:23:04 UTC (rev 18682)
+++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/test/java/org/jboss/as/webservices/parser/TestDA1.java 2014-05-20 10:23:19 UTC (rev 18683)
@@ -89,31 +89,6 @@
}
@Override
- public boolean canHandle(Deployment dep) {
- return false;
- }
-
- @Override
- public boolean isForJaxWs() {
- return false;
- }
-
- @Override
- public void setForJaxWs(boolean isForJaxWs) {
-
- }
-
- @Override
- public boolean isForJaxRpc() {
- return false;
- }
-
- @Override
- public void setForJaxRpc(boolean isForJaxRpc) {
-
- }
-
- @Override
public ClassLoader getLoader() {
return null;
}
9 years, 11 months
- 1
- 0
JBossWS SVN: r18682 - in container/wildfly81/branches/jbossws-wildfly810/server-integration/src: main/java/org/jboss/as/webservices/deployers/deployment and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-05-20 06:23:04 -0400 (Tue, 20 May 2014)
New Revision: 18682
Modified:
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/AspectDeploymentProcessor.java
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/EndpointServiceDeploymentAspect.java
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/AbstractDeploymentModelBuilder.java
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_EJB.java
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_JMS.java
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_POJO.java
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/injection/InjectionDeploymentAspect.java
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/invocation/AbstractInvocationHandler.java
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/publish/EndpointPublisherImpl.java
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/tomcat/ServletDelegateFactoryImpl.java
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/tomcat/WebMetaDataModifier.java
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/util/VirtualFileAdaptor.java
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WSRefUtils.java
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WebServiceReferences.java
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/test/java/org/jboss/as/webservices/parser/TestDA1.java
Log:
[JBWS-3779] WIP
Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/AspectDeploymentProcessor.java
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/AspectDeploymentProcessor.java 2014-05-20 10:22:02 UTC (rev 18681)
+++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/AspectDeploymentProcessor.java 2014-05-20 10:23:04 UTC (rev 18682)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -66,17 +66,15 @@
if (isWebServiceDeployment(unit)) {
ensureAspectInitialized();
final Deployment dep = ASHelper.getRequiredAttachment(unit, WSAttachmentKeys.DEPLOYMENT_KEY);
- if (aspect.canHandle(dep)) {
- ROOT_LOGGER.aspectStart(aspect, unit.getName());
- ClassLoader origClassLoader = WildFlySecurityManager.getCurrentContextClassLoaderPrivileged();
- try {
- WildFlySecurityManager.setCurrentContextClassLoaderPrivileged(aspect.getLoader());
- dep.addAttachment(ServiceTarget.class, phaseContext.getServiceTarget());
- aspect.start(dep);
- dep.removeAttachment(ServiceTarget.class);
- } finally {
- WildFlySecurityManager.setCurrentContextClassLoaderPrivileged(origClassLoader);
- }
+ ROOT_LOGGER.aspectStart(aspect, unit.getName());
+ ClassLoader origClassLoader = WildFlySecurityManager.getCurrentContextClassLoaderPrivileged();
+ try {
+ WildFlySecurityManager.setCurrentContextClassLoaderPrivileged(aspect.getLoader());
+ dep.addAttachment(ServiceTarget.class, phaseContext.getServiceTarget());
+ aspect.start(dep);
+ dep.removeAttachment(ServiceTarget.class);
+ } finally {
+ WildFlySecurityManager.setCurrentContextClassLoaderPrivileged(origClassLoader);
}
}
}
@@ -85,15 +83,13 @@
public void undeploy(final DeploymentUnit unit) {
if (isWebServiceDeployment(unit)) {
final Deployment dep = ASHelper.getRequiredAttachment(unit, WSAttachmentKeys.DEPLOYMENT_KEY);
- if (aspect.canHandle(dep)) {
- ROOT_LOGGER.aspectStop(aspect, unit.getName());
- ClassLoader origClassLoader = WildFlySecurityManager.getCurrentContextClassLoaderPrivileged();
- try {
- WildFlySecurityManager.setCurrentContextClassLoaderPrivileged(aspect.getLoader());
- aspect.stop(dep);
- } finally {
- WildFlySecurityManager.setCurrentContextClassLoaderPrivileged(origClassLoader);
- }
+ ROOT_LOGGER.aspectStop(aspect, unit.getName());
+ ClassLoader origClassLoader = WildFlySecurityManager.getCurrentContextClassLoaderPrivileged();
+ try {
+ WildFlySecurityManager.setCurrentContextClassLoaderPrivileged(aspect.getLoader());
+ aspect.stop(dep);
+ } finally {
+ WildFlySecurityManager.setCurrentContextClassLoaderPrivileged(origClassLoader);
}
}
}
Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/EndpointServiceDeploymentAspect.java
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/EndpointServiceDeploymentAspect.java 2014-05-20 10:22:02 UTC (rev 18681)
+++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/EndpointServiceDeploymentAspect.java 2014-05-20 10:23:04 UTC (rev 18682)
@@ -70,8 +70,6 @@
public Object clone() {
EndpointServiceDeploymentAspect clone = new EndpointServiceDeploymentAspect();
- clone.setForJaxRpc(isForJaxRpc());
- clone.setForJaxWs(isForJaxWs());
clone.setLast(isLast());
clone.setProvides(getProvides());
clone.setRelativeOrder(getRelativeOrder());
Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/AbstractDeploymentModelBuilder.java
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/AbstractDeploymentModelBuilder.java 2014-05-20 10:22:02 UTC (rev 18681)
+++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/AbstractDeploymentModelBuilder.java 2014-05-20 10:23:04 UTC (rev 18682)
@@ -48,7 +48,6 @@
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentModelFactory;
-import org.jboss.wsf.spi.deployment.DeploymentType;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.EndpointType;
import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
@@ -65,21 +64,17 @@
/** Deployment model factory. */
private final DeploymentModelFactory deploymentModelFactory;
- /** Deployment type this builder creates. */
- private final DeploymentType deploymentType;
-
/** Endpoint type this builder creates. */
private final EndpointType endpointType;
/**
* Constructor.
*/
- protected AbstractDeploymentModelBuilder(final DeploymentType deploymentType, final EndpointType endpointType) {
+ protected AbstractDeploymentModelBuilder(final EndpointType endpointType) {
// deployment factory
final ClassLoader cl = AbstractDeploymentModelBuilder.class.getClassLoader();
final SPIProvider spiProvider = SPIProviderResolver.getInstance(cl).getProvider();
this.deploymentModelFactory = spiProvider.getSPI(DeploymentModelFactory.class, cl);
- this.deploymentType = deploymentType;
this.endpointType = endpointType;
}
@@ -210,7 +205,6 @@
dep.setRootFile(new ResourceLoaderAdapter(classLoader));
}
dep.setRuntimeClassLoader(classLoader);
- dep.setType(deploymentType);
//add an AnnotationInfo attachment that uses composite jandex index
dep.addAttachment(AnnotationsInfo.class, new JandexAnnotationsInfo(unit));
Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_EJB.java
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_EJB.java 2014-05-20 10:22:02 UTC (rev 18681)
+++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_EJB.java 2014-05-20 10:23:04 UTC (rev 18682)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -24,7 +24,6 @@
import static org.jboss.as.webservices.WSLogger.ROOT_LOGGER;
import static org.jboss.as.webservices.metadata.model.AbstractEndpoint.COMPONENT_VIEW_NAME;
import static org.jboss.as.webservices.util.ASHelper.getJaxwsEjbs;
-import static org.jboss.wsf.spi.deployment.DeploymentType.JAXWS;
import static org.jboss.wsf.spi.deployment.EndpointType.JAXWS_EJB3;
import org.jboss.as.server.deployment.DeploymentUnit;
@@ -41,7 +40,7 @@
final class DeploymentModelBuilderJAXWS_EJB extends AbstractDeploymentModelBuilder {
DeploymentModelBuilderJAXWS_EJB() {
- super(JAXWS, JAXWS_EJB3);
+ super(JAXWS_EJB3);
}
@Override
Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_JMS.java
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_JMS.java 2014-05-20 10:22:02 UTC (rev 18681)
+++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_JMS.java 2014-05-20 10:23:04 UTC (rev 18682)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -24,7 +24,6 @@
import static org.jboss.as.webservices.WSLogger.ROOT_LOGGER;
import static org.jboss.as.webservices.util.ASHelper.getOptionalAttachment;
import static org.jboss.as.webservices.util.WSAttachmentKeys.JMS_ENDPOINT_METADATA_KEY;
-import static org.jboss.wsf.spi.deployment.DeploymentType.JAXWS;
import static org.jboss.wsf.spi.deployment.EndpointType.JAXWS_JSE;
import org.jboss.as.server.deployment.DeploymentUnit;
@@ -40,7 +39,7 @@
final class DeploymentModelBuilderJAXWS_JMS extends AbstractDeploymentModelBuilder {
DeploymentModelBuilderJAXWS_JMS() {
- super(JAXWS, JAXWS_JSE);
+ super(JAXWS_JSE);
}
@Override
Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_POJO.java
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_POJO.java 2014-05-20 10:22:02 UTC (rev 18681)
+++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_POJO.java 2014-05-20 10:23:04 UTC (rev 18682)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -24,7 +24,6 @@
import static org.jboss.as.webservices.WSLogger.ROOT_LOGGER;
import static org.jboss.as.webservices.metadata.model.AbstractEndpoint.COMPONENT_VIEW_NAME;
import static org.jboss.as.webservices.util.ASHelper.getJaxwsPojos;
-import static org.jboss.wsf.spi.deployment.DeploymentType.JAXWS;
import static org.jboss.wsf.spi.deployment.EndpointType.JAXWS_JSE;
import org.jboss.as.server.deployment.DeploymentUnit;
@@ -41,7 +40,7 @@
final class DeploymentModelBuilderJAXWS_POJO extends AbstractDeploymentModelBuilder {
DeploymentModelBuilderJAXWS_POJO() {
- super(JAXWS, JAXWS_JSE);
+ super(JAXWS_JSE);
}
@Override
Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/injection/InjectionDeploymentAspect.java
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/injection/InjectionDeploymentAspect.java 2014-05-20 10:22:02 UTC (rev 18681)
+++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/injection/InjectionDeploymentAspect.java 2014-05-20 10:23:04 UTC (rev 18682)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat, Inc., and individual contributors
+ * Copyright 2014, Red Hat, Inc., and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -19,7 +19,6 @@
* 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.as.webservices.injection;
import java.security.AccessController;
@@ -35,7 +34,6 @@
import org.jboss.msc.service.ServiceName;
import org.jboss.ws.common.deployment.ReferenceFactory;
import org.jboss.ws.common.integration.AbstractDeploymentAspect;
-import org.jboss.ws.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.InstanceProvider;
@@ -48,8 +46,6 @@
@Override
public void start(final Deployment dep) {
- if (WSHelper.isJaxrpcDeployment(dep)) return;
-
for (final Endpoint ep : dep.getService().getEndpoints()) {
setInjectionAwareInstanceProvider(ep);
}
Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/invocation/AbstractInvocationHandler.java
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/invocation/AbstractInvocationHandler.java 2014-05-20 10:22:02 UTC (rev 18681)
+++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/invocation/AbstractInvocationHandler.java 2014-05-20 10:23:04 UTC (rev 18682)
@@ -36,6 +36,7 @@
import org.jboss.as.ee.component.Component;
import org.jboss.as.ee.component.ComponentView;
import org.jboss.as.naming.ManagedReference;
+import org.jboss.as.webservices.WSLogger;
import org.jboss.as.webservices.injection.WSComponent;
import org.jboss.invocation.InterceptorContext;
import org.jboss.msc.service.ServiceName;
@@ -132,7 +133,7 @@
wsInvocation.setReturnValue(retObj);
}
catch (Throwable t) {
- log.error(MESSAGES.methodInvocationFailed(t.getLocalizedMessage()), t);
+ WSLogger.ROOT_LOGGER.error(MESSAGES.methodInvocationFailed(t.getLocalizedMessage()), t);
handleInvocationException(t);
}
finally {
Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/publish/EndpointPublisherImpl.java
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/publish/EndpointPublisherImpl.java 2014-05-20 10:22:02 UTC (rev 18681)
+++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/publish/EndpointPublisherImpl.java 2014-05-20 10:23:04 UTC (rev 18682)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2012, Red Hat, Inc., and individual contributors
+ * Copyright 2014, Red Hat, Inc., and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -324,7 +324,6 @@
depAspects.add(aspect);
//add another aspect to set InvocationHandlerJAXWS to each endpoint
ForceJAXWSInvocationHandlerDeploymentAspect handlerAspect = new ForceJAXWSInvocationHandlerDeploymentAspect();
- handlerAspect.setForJaxRpc(false);
depAspects.add(handlerAspect);
} else {
depAspects.add(aspect);
@@ -349,7 +348,6 @@
publisherDepAspects.add(aspect);
//add another aspect to set InvocationHandlerJAXWS to each endpoint
ForceJAXWSInvocationHandlerDeploymentAspect handlerAspect = new ForceJAXWSInvocationHandlerDeploymentAspect();
- handlerAspect.setForJaxRpc(false);
publisherDepAspects.add(handlerAspect);
} else {
publisherDepAspects.add(aspect);
Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/tomcat/ServletDelegateFactoryImpl.java
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/tomcat/ServletDelegateFactoryImpl.java 2014-05-20 10:22:02 UTC (rev 18681)
+++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/tomcat/ServletDelegateFactoryImpl.java 2014-05-20 10:23:04 UTC (rev 18682)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -28,7 +28,7 @@
import org.jboss.wsf.spi.deployment.ServletDelegateFactory;
/**
- * AS7 implementation of {@link org.jboss.wsf.spi.deployment.ServletDelegateFactory}
+ * WildFly implementation of {@link org.jboss.wsf.spi.deployment.ServletDelegateFactory}
* that uses modular classloading for creating the delegate instance.
*
* @author alessio.soldano(a)jboss.com
@@ -38,11 +38,10 @@
public final class ServletDelegateFactoryImpl implements ServletDelegateFactory {
@Override
- public ServletDelegate newServletDelegate(final String servletClassName, final boolean isJaxWs) {
+ public ServletDelegate newServletDelegate(final String servletClassName) {
final ClassLoaderProvider provider = ClassLoaderProvider.getDefaultProvider();
- final ClassLoader classLoader = isJaxWs ? provider.getServerIntegrationClassLoader() : provider.getServerJAXRPCIntegrationClassLoader();
try {
- final Class<?> clazz = classLoader.loadClass(servletClassName);
+ final Class<?> clazz = provider.getServerIntegrationClassLoader().loadClass(servletClassName);
return (ServletDelegate) clazz.newInstance();
} catch (final Exception e) {
throw MESSAGES.cannotInstantiateServletDelegate(e, servletClassName);
Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/tomcat/WebMetaDataModifier.java
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/tomcat/WebMetaDataModifier.java 2014-05-20 10:22:02 UTC (rev 18681)
+++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/tomcat/WebMetaDataModifier.java 2014-05-20 10:23:04 UTC (rev 18682)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -94,8 +94,6 @@
final List<ParamValueMetaData> initParams = WebMetaDataHelper.getServletInitParams(servletMD);
// configure transport class name
WebMetaDataHelper.newParamValue(WSFServlet.STACK_SERVLET_DELEGATE_CLASS, transportClassName, initParams);
- // configure the integration classloader to be used (JAXRPC or JAXWS)
- WebMetaDataHelper.newParamValue(WSFServlet.INTEGRATION_CLASSLOADER, dep.getType().toString(), initParams);
// configure webservice endpoint
WebMetaDataHelper.newParamValue(Endpoint.SEPID_DOMAIN_ENDPOINT, endpointClassName, initParams);
}
Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/util/VirtualFileAdaptor.java
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/util/VirtualFileAdaptor.java 2014-05-20 10:22:02 UTC (rev 18681)
+++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/util/VirtualFileAdaptor.java 2014-05-20 10:23:04 UTC (rev 18682)
@@ -43,7 +43,7 @@
private static final long serialVersionUID = -4509594124653184349L;
- private transient VirtualFile file;
+ private final transient VirtualFile file;
public VirtualFileAdaptor(VirtualFile file) {
this.file = file;
Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WSRefUtils.java
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WSRefUtils.java 2014-05-20 10:22:02 UTC (rev 18681)
+++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WSRefUtils.java 2014-05-20 10:23:04 UTC (rev 18682)
@@ -65,7 +65,6 @@
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaDataBuilder;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData;
-import org.jboss.wsf.spi.serviceref.ServiceRefType;
/**
* Translates WS Refs from JBossAS MD to JBossWS UMDM format.
@@ -127,8 +126,6 @@
builder.setHandlerChain(jbossServiceRefMD.getHandlerChain());
}
- builder.setType(ServiceRefType.JAXWS);
-
return builder.build();
}
Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WebServiceReferences.java
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WebServiceReferences.java 2014-05-20 10:22:02 UTC (rev 18681)
+++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WebServiceReferences.java 2014-05-20 10:23:04 UTC (rev 18682)
@@ -1,5 +1,7 @@
package org.jboss.as.webservices.webserviceref;
+import static org.jboss.as.webservices.webserviceref.WSRefUtils.processAnnotatedElement;
+
import java.lang.reflect.AnnotatedElement;
import javax.xml.ws.Service;
@@ -14,11 +16,8 @@
import org.jboss.modules.Module;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
-import org.jboss.wsf.spi.serviceref.ServiceRefType;
import org.wildfly.security.manager.WildFlySecurityManager;
-import static org.jboss.as.webservices.webserviceref.WSRefUtils.processAnnotatedElement;
-
/**
* Utility class that encapsulates the creation of web service ref factories.
* <p/>
@@ -74,8 +73,6 @@
} else {
serviceRefUMDM.setServiceInterface(Service.class.getName());
}
- // ref type
- serviceRefUMDM.setType(ServiceRefType.JAXWS);
return serviceRefUMDM;
}
Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/test/java/org/jboss/as/webservices/parser/TestDA1.java
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/test/java/org/jboss/as/webservices/parser/TestDA1.java 2014-05-20 10:22:02 UTC (rev 18681)
+++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/test/java/org/jboss/as/webservices/parser/TestDA1.java 2014-05-20 10:23:04 UTC (rev 18682)
@@ -89,31 +89,6 @@
}
@Override
- public boolean canHandle(Deployment dep) {
- return false;
- }
-
- @Override
- public boolean isForJaxWs() {
- return false;
- }
-
- @Override
- public void setForJaxWs(boolean isForJaxWs) {
-
- }
-
- @Override
- public boolean isForJaxRpc() {
- return false;
- }
-
- @Override
- public void setForJaxRpc(boolean isForJaxRpc) {
-
- }
-
- @Override
public ClassLoader getLoader() {
return null;
}
9 years, 11 months
- 1
- 0
JBossWS SVN: r18681 - in common/trunk/src/main/java/org/jboss/ws/common: integration and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-05-20 06:22:02 -0400 (Tue, 20 May 2014)
New Revision: 18681
Modified:
common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultDeployment.java
common/trunk/src/main/java/org/jboss/ws/common/deployment/DeploymentAspectManagerImpl.java
common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java
common/trunk/src/main/java/org/jboss/ws/common/integration/AbstractDeploymentAspect.java
common/trunk/src/main/java/org/jboss/ws/common/integration/WSHelper.java
Log:
[JBWS-3779] WIP
Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultDeployment.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultDeployment.java 2014-05-20 10:21:21 UTC (rev 18680)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultDeployment.java 2014-05-20 10:22:02 UTC (rev 18681)
@@ -24,7 +24,6 @@
import org.jboss.wsf.spi.deployment.AbstractExtensible;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentState;
-import org.jboss.wsf.spi.deployment.DeploymentType;
import org.jboss.wsf.spi.deployment.Service;
/**
@@ -41,8 +40,6 @@
private String simpleName;
// A deployment has one service
private Service service;
- // The type of this deployment
- private DeploymentType type;
// The state for this deployment
private DeploymentState state;
// The deployment class loader
@@ -109,14 +106,4 @@
{
this.state = deploymentState;
}
-
- public DeploymentType getType()
- {
- return type;
- }
-
- public void setType(DeploymentType deploymentType)
- {
- this.type = deploymentType;
- }
}
Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/DeploymentAspectManagerImpl.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/DeploymentAspectManagerImpl.java 2014-05-20 10:21:21 UTC (rev 18680)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/DeploymentAspectManagerImpl.java 2014-05-20 10:22:02 UTC (rev 18681)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -43,8 +43,7 @@
public class DeploymentAspectManagerImpl implements DeploymentAspectManager
{
private String name;
- private DeploymentAspectManager parent;
- private List<DeploymentAspect> depAspects = new ArrayList<DeploymentAspect>();
+ private final List<DeploymentAspect> depAspects = new ArrayList<DeploymentAspect>();
public String getName()
{
@@ -56,16 +55,6 @@
this.name = name;
}
- public DeploymentAspectManager getParent()
- {
- return parent;
- }
-
- public void setParent(DeploymentAspectManager parent)
- {
- this.parent = parent;
- }
-
public List<DeploymentAspect> getDeploymentAspects()
{
return Collections.unmodifiableList(depAspects);
@@ -122,19 +111,17 @@
DeploymentAspect aspect = deploymentAspects.get(i);
try
{
- if (aspect.canHandle(dep)) {
- logInvocation(aspect, "Start");
- ClassLoader origClassLoader = SecurityActions.getContextClassLoader();
- try
- {
- SecurityActions.setContextClassLoader(aspect.getLoader());
- aspect.start(dep);
- }
- finally
- {
- SecurityActions.setContextClassLoader(origClassLoader);
- }
+ logInvocation(aspect, "Start");
+ ClassLoader origClassLoader = SecurityActions.getContextClassLoader();
+ try
+ {
+ SecurityActions.setContextClassLoader(aspect.getLoader());
+ aspect.start(dep);
}
+ finally
+ {
+ SecurityActions.setContextClassLoader(origClassLoader);
+ }
}
catch (RuntimeException rte)
{
Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java 2014-05-20 10:21:21 UTC (rev 18680)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java 2014-05-20 10:22:02 UTC (rev 18681)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -21,7 +21,6 @@
*/
package org.jboss.ws.common.deployment;
-import static org.jboss.ws.common.integration.WSHelper.isJaxrpcDeployment;
import static org.jboss.ws.common.integration.WSHelper.isJaxwsEjbEndpoint;
import static org.jboss.ws.common.integration.WSHelper.isJaxwsJseEndpoint;
@@ -118,8 +117,6 @@
protected boolean isConfidentialTransportGuarantee(final Deployment dep, final Endpoint ep)
{
- if (isJaxrpcDeployment(dep)) return false;
-
String transportGuarantee = null;
if (isJaxwsJseEndpoint(ep))
{
Modified: common/trunk/src/main/java/org/jboss/ws/common/integration/AbstractDeploymentAspect.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/integration/AbstractDeploymentAspect.java 2014-05-20 10:21:21 UTC (rev 18680)
+++ common/trunk/src/main/java/org/jboss/ws/common/integration/AbstractDeploymentAspect.java 2014-05-20 10:22:02 UTC (rev 18681)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -42,8 +42,6 @@
private String requires;
private int relativeOrder;
private boolean isLast;
- private boolean isForJaxWs = true;
- private boolean isForJaxRpc = true;
private WeakReference<ClassLoader> loader;
public AbstractDeploymentAspect()
@@ -127,30 +125,4 @@
}
return condset;
}
-
- public boolean canHandle(Deployment dep)
- {
- return (this.isForJaxWs && WSHelper.isJaxwsDeployment(dep) ||
- this.isForJaxRpc && WSHelper.isJaxrpcDeployment(dep));
- }
-
- public boolean isForJaxWs()
- {
- return isForJaxWs;
- }
-
- public void setForJaxWs(boolean isForJaxWs)
- {
- this.isForJaxWs = isForJaxWs;
- }
-
- public boolean isForJaxRpc()
- {
- return isForJaxRpc;
- }
-
- public void setForJaxRpc(boolean isForJaxRpc)
- {
- this.isForJaxRpc = isForJaxRpc;
- }
}
Modified: common/trunk/src/main/java/org/jboss/ws/common/integration/WSHelper.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/integration/WSHelper.java 2014-05-20 10:21:21 UTC (rev 18680)
+++ common/trunk/src/main/java/org/jboss/ws/common/integration/WSHelper.java 2014-05-20 10:22:02 UTC (rev 18681)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -21,10 +21,6 @@
*/
package org.jboss.ws.common.integration;
-import static org.jboss.wsf.spi.deployment.DeploymentType.JAXRPC;
-import static org.jboss.wsf.spi.deployment.DeploymentType.JAXWS;
-import static org.jboss.wsf.spi.deployment.EndpointType.JAXRPC_EJB21;
-import static org.jboss.wsf.spi.deployment.EndpointType.JAXRPC_JSE;
import static org.jboss.wsf.spi.deployment.EndpointType.JAXWS_EJB3;
import static org.jboss.wsf.spi.deployment.EndpointType.JAXWS_JSE;
@@ -40,8 +36,6 @@
*/
public final class WSHelper {
- private static final EndpointTypeFilter JAXRPC_EJB_ENDPOINT_FILTER = new EndpointTypeFilterImpl( JAXRPC_EJB21 );
- private static final EndpointTypeFilter JAXRPC_JSE_ENDPOINT_FILTER = new EndpointTypeFilterImpl( JAXRPC_JSE );
private static final EndpointTypeFilter JAXWS_EJB_ENDPOINT_FILTER = new EndpointTypeFilterImpl( JAXWS_EJB3 );
private static final EndpointTypeFilter JAXWS_JSE_ENDPOINT_FILTER = new EndpointTypeFilterImpl( JAXWS_JSE );
private static final String WAR_EXTENSION = ".war";
@@ -108,7 +102,7 @@
*/
public static boolean isJaxwsJseDeployment( final Deployment dep )
{
- return isJaxwsDeployment( dep ) && dep.getService().getEndpoints( JAXWS_JSE_ENDPOINT_FILTER ).size() > 0;
+ return dep.getService().getEndpoints( JAXWS_JSE_ENDPOINT_FILTER ).size() > 0;
}
/**
@@ -119,76 +113,32 @@
*/
public static boolean isJaxwsEjbDeployment( final Deployment dep )
{
- return isJaxwsDeployment( dep ) && dep.getService().getEndpoints( JAXWS_EJB_ENDPOINT_FILTER ).size() > 0;
+ return dep.getService().getEndpoints( JAXWS_EJB_ENDPOINT_FILTER ).size() > 0;
}
/**
- * Returns true if deployment represents JAXRPC JSE deployment.
+ * Returns true if deployment represents a JSE deployment.
*
* @param dep webservice deployment
- * @return true if JAXRPC JSE deployment, false otherwise
+ * @return true if JSE deployment, false otherwise.
*/
- public static boolean isJaxrpcJseDeployment( final Deployment dep )
- {
- return isJaxrpcDeployment( dep ) && dep.getService().getEndpoints( JAXRPC_JSE_ENDPOINT_FILTER ).size() > 0;
- }
-
- /**
- * Returns true if deployment represents JAXRPC EJB deployment.
- *
- * @param dep webservice deployment
- * @return true if JAXRPC EJB deployment, false otherwise
- */
- public static boolean isJaxrpcEjbDeployment( final Deployment dep )
- {
- return isJaxrpcDeployment( dep ) && dep.getService().getEndpoints( JAXRPC_EJB_ENDPOINT_FILTER ).size() > 0;
- }
-
- /**
- * Returns true if deployment represents either JAXWS JSE or JAXRPC JSE deployment.
- *
- * @param dep webservice deployment
- * @return true if either JAXWS JSE or JAXRPC JSE deployment, false otherwise.
- */
public static boolean isJseDeployment( final Deployment dep )
{
- return isJaxwsJseDeployment( dep ) || isJaxrpcJseDeployment( dep );
+ return isJaxwsJseDeployment( dep );
}
/**
- * Returns true if deployment represents either JAXWS EJB or JAXRPC EJB deployment.
+ * Returns true if deployment represents an EJB deployment.
*
* @param dep webservice deployment
- * @return true if either JAXWS EJB or JAXRPC EJB deployment, false otherwise
+ * @return true if either EJB deployment, false otherwise
*/
public static boolean isEjbDeployment( final Deployment dep )
{
- return isJaxwsEjbDeployment( dep ) || isJaxrpcEjbDeployment( dep );
+ return isJaxwsEjbDeployment( dep );
}
/**
- * Returns true if deployment represents either JAXWS EJB or JAXWS JSE deployment.
- *
- * @param dep webservice deployment
- * @return true if either JAXWS EJB or JAXWS JSE deployment, false otherwise
- */
- public static boolean isJaxwsDeployment( final Deployment dep )
- {
- return JAXWS == dep.getType();
- }
-
- /**
- * Returns true if deployment represents either JAXRPC EJB or JAXRPC JSE deployment.
- *
- * @param dep webservice deployment
- * @return true if either JAXRPC EJB or JAXRPC JSE deployment, false otherwise
- */
- public static boolean isJaxrpcDeployment( final Deployment dep )
- {
- return JAXRPC == dep.getType();
- }
-
- /**
* Returns true if archive name ends with '.jar' suffix.
*
* @param dep webservice deployment
@@ -244,69 +194,36 @@
}
/**
- * Returns true if endpoint represents JAXRPC JSE endpoint.
+ * Returns true if endpoint represents a JSE endpoint.
*
* @param ep webservice endpoint
- * @return true if JAXRPC JSE endpoint, false otherwise
+ * @return true if JSE endpoint, false otherwise
*/
- public static boolean isJaxrpcJseEndpoint( final Endpoint ep )
- {
- return JAXRPC_JSE == ep.getType();
- }
-
- /**
- * Returns true if endpoint represents JAXRPC EJB21 endpoint.
- *
- * @param ep webservice endpoint
- * @return true if JAXRPC EJB21 endpoint, false otherwise
- */
- public static boolean isJaxrpcEjbEndpoint( final Endpoint ep )
- {
- return JAXRPC_EJB21 == ep.getType();
- }
-
- /**
- * Returns true if endpoint represents either JAXWS JSE or JAXRPC JSE endpoint.
- *
- * @param ep webservice endpoint
- * @return true if either JAXWS JSE or JAXRPC JSE endpoint, false otherwise
- */
public static boolean isJseEndpoint( final Endpoint ep )
{
- return isJaxwsJseEndpoint( ep ) || isJaxrpcJseEndpoint( ep );
+ return isJaxwsJseEndpoint( ep );
}
/**
- * Returns true if endpoint represents either JAXWS EJB3 or JAXRPC EJB21 endpoint.
+ * Returns true if endpoint represents either an EJB endpoint.
*
* @param ep webservice endpoint
- * @return true if either JAXWS EJB3 or JAXRPC EJB21 endpoint, false otherwise
+ * @return true if EJB endpoint, false otherwise
*/
public static boolean isEjbEndpoint( final Endpoint ep )
{
- return isJaxwsEjbEndpoint( ep ) || isJaxrpcEjbEndpoint( ep );
+ return isJaxwsEjbEndpoint( ep );
}
/**
- * Returns true if endpoint represents either JAXWS JSE or JAXWS EJB3 endpoint.
+ * Returns true if endpoint represents a JAXWS endpoint.
*
* @param ep webservice endpoint
- * @return true if either JAXWS JSE or JAXWS EJB3 endpoint, false otherwise
+ * @return true if either JAXWS endpoint, false otherwise
*/
public static boolean isJaxwsEndpoint( final Endpoint ep )
{
- return isJaxwsJseEndpoint( ep ) || isJaxwsEjbEndpoint( ep );
+ return isJaxwsJseEndpoint( ep );
}
- /**
- * Returns true if endpoint represents either JAXRPC JSE or JAXRPC EJB21 endpoint.
- *
- * @param ep webservice endpoint
- * @return true if either JAXRPC JSE or JAXRPC EJB21 endpoint, false otherwise
- */
- public static boolean isJaxrpcEndpoint( final Endpoint ep )
- {
- return isJaxrpcJseEndpoint( ep ) || isJaxrpcEjbEndpoint( ep );
- }
-
}
9 years, 11 months
- 1
- 0
JBossWS SVN: r18680 - in spi/trunk/src/main/java/org/jboss/wsf/spi: metadata/j2ee/serviceref and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-05-20 06:21:21 -0400 (Tue, 20 May 2014)
New Revision: 18680
Removed:
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentType.java
spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefType.java
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManager.java
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/EndpointType.java
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ServletDelegateFactory.java
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/WSFServlet.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaDataBuilder.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java
Log:
[JBWS-3779] WIP
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2014-05-20 09:45:36 UTC (rev 18679)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2014-05-20 10:21:21 UTC (rev 18680)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -48,12 +48,6 @@
/** Set the runtime class loader for this deployment */
void setRuntimeClassLoader(ClassLoader loader);
- /** Get the deployment type */
- DeploymentType getType();
-
- /** Set the deployment type */
- void setType(DeploymentType type);
-
/** Get the current deployment state */
DeploymentState getState();
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java 2014-05-20 09:45:36 UTC (rev 18679)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java 2014-05-20 10:21:21 UTC (rev 18680)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -60,15 +60,5 @@
public Set<String> getRequiresAsSet();
- public boolean canHandle(Deployment dep);
-
- public boolean isForJaxWs();
-
- public void setForJaxWs(boolean isForJaxWs);
-
- public boolean isForJaxRpc();
-
- public void setForJaxRpc(boolean isForJaxRpc);
-
public ClassLoader getLoader();
}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManager.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManager.java 2014-05-20 09:45:36 UTC (rev 18679)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManager.java 2014-05-20 10:21:21 UTC (rev 18680)
@@ -35,12 +35,6 @@
/** Get the name for this aspect manager */
String getName();
- /** Get the optional parent for this manager */
- DeploymentAspectManager getParent();
-
- /** Set the optional parent for this manager */
- void setParent(DeploymentAspectManager dam);
-
/** Get the list of registered deployment aspects */
List<DeploymentAspect> getDeploymentAspects();
Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java 2014-05-20 09:45:36 UTC (rev 18679)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java 2014-05-20 10:21:21 UTC (rev 18680)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * 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.wsf.spi.deployment;
-
-
-/**
- * Creates DeploymentAspectManager's by {@link org.jboss.wsf.spi.deployment.Deployment.DeploymentType}
- *
- * @author Heiko.Braun(a)jboss.com
- * Created: Jul 20, 2007
- */
-public abstract class DeploymentAspectManagerFactory
-{
- public abstract DeploymentAspectManager getDeploymentAspectManager(DeploymentType deploymentType);
-
- /**
- * Get a named instance of a deployment aspect manager
- */
- public abstract DeploymentAspectManager getDeploymentAspectManager(String beanName);
-}
Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentType.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentType.java 2014-05-20 09:45:36 UTC (rev 18679)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentType.java 2014-05-20 10:21:21 UTC (rev 18680)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.wsf.spi.deployment;
-
-/**
- * WebService deployment type.
- *
- * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
- */
-public enum DeploymentType
-{
- JAXWS, JAXRPC,
-}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/EndpointType.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/EndpointType.java 2014-05-20 09:45:36 UTC (rev 18679)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/EndpointType.java 2014-05-20 10:21:21 UTC (rev 18680)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat, Inc., and individual contributors
+ * Copyright 2014, Red Hat, Inc., and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -29,5 +29,5 @@
*/
public enum EndpointType
{
- JAXRPC_JSE, JAXRPC_EJB21, JAXWS_JSE, JAXWS_EJB3
+ JAXWS_JSE, JAXWS_EJB3
}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ServletDelegateFactory.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ServletDelegateFactory.java 2014-05-20 09:45:36 UTC (rev 18679)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ServletDelegateFactory.java 2014-05-20 10:21:21 UTC (rev 18680)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -30,5 +30,5 @@
*/
public interface ServletDelegateFactory
{
- public ServletDelegate newServletDelegate(String delegateClassName, boolean isJaxWs);
+ public ServletDelegate newServletDelegate(String delegateClassName);
}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/WSFServlet.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/WSFServlet.java 2014-05-20 09:45:36 UTC (rev 18679)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/WSFServlet.java 2014-05-20 10:21:21 UTC (rev 18680)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -42,8 +42,9 @@
*/
public class WSFServlet extends HttpServlet
{
+ private static final long serialVersionUID = -1958443536378468262L;
+
public static final String STACK_SERVLET_DELEGATE_CLASS = "org.jboss.wsf.spi.deployment.stackServletDelegateClass";
- public static final String INTEGRATION_CLASSLOADER = "org.jboss.wsf.spi.deployment.integrationClassLoader";
private volatile ServletDelegate delegate = null;
@@ -74,8 +75,7 @@
ClassLoader cl = clProvider.getWebServiceSubsystemClassLoader();
ServiceLoader<ServletDelegateFactory> sl = ServiceLoader.load(ServletDelegateFactory.class, cl);
ServletDelegateFactory factory = sl.iterator().next();
- boolean isJaxWs = DeploymentType.JAXWS.toString().equals(servletConfig.getInitParameter(INTEGRATION_CLASSLOADER));
- return factory.newServletDelegate(servletConfig.getInitParameter(STACK_SERVLET_DELEGATE_CLASS), isJaxWs);
+ return factory.newServletDelegate(servletConfig.getInitParameter(STACK_SERVLET_DELEGATE_CLASS));
}
@Override
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2014-05-20 09:45:36 UTC (rev 18679)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2014-05-20 10:21:21 UTC (rev 18680)
@@ -39,7 +39,6 @@
import org.jboss.wsf.spi.Loggers;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
-import org.jboss.wsf.spi.serviceref.ServiceRefType;
/**
* The metadata from service-ref element in web.xml, ejb-jar.xml,
@@ -60,8 +59,6 @@
// Standard properties
- // Service reference type - either JAX-RPC or JAXWS
- private volatile ServiceRefType type; //TODO REMOVE
// The required <service-ref-name> element
private final String serviceRefName;
// The <service-interface> element
@@ -141,7 +138,7 @@
- public UnifiedServiceRefMetaData(UnifiedVirtualFile vfsRoot, ServiceRefType type, String serviceRefName,
+ public UnifiedServiceRefMetaData(UnifiedVirtualFile vfsRoot, String serviceRefName,
String serviceInterface, String serviceRefType, String wsdlFile, String mappingFile, QName serviceQName,
List<UnifiedPortComponentRefMetaData> portComponentRefs, List<UnifiedHandlerMetaData> handlers,
UnifiedHandlerChainsMetaData handlerChains, String serviceImplClass, String configName, String configFile,
@@ -149,7 +146,6 @@
RespectBindingMetadata respectBindingMetadata)
{
this.vfsRoot = vfsRoot;
- this.type = type;
this.serviceRefName = serviceRefName;
this.serviceInterface = serviceInterface;
this.serviceRefType = serviceRefType;
@@ -235,16 +231,6 @@
this.vfsRoot = vfsRoot;
}
- public ServiceRefType getType()
- {
- return type;
- }
-
- public void setType(ServiceRefType type)
- {
- this.type = type;
- }
-
public String getServiceRefName()
{
return serviceRefName;
@@ -468,7 +454,6 @@
StringBuilder str = new StringBuilder();
str.append("\nUnifiedServiceRef");
str.append("\n serviceRefName=" + serviceRefName);
- str.append("\n type=" + type);
str.append("\n serviceInterface=" + serviceInterface);
str.append("\n serviceImplClass=" + serviceImplClass);
str.append("\n serviceRefType=" + serviceRefType);
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaDataBuilder.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaDataBuilder.java 2014-05-20 09:45:36 UTC (rev 18679)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaDataBuilder.java 2014-05-20 10:21:21 UTC (rev 18680)
@@ -29,7 +29,6 @@
import javax.xml.namespace.QName;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
-import org.jboss.wsf.spi.serviceref.ServiceRefType;
/**
* Utility class for building UnifiedServiceRefMetaData instances
@@ -42,8 +41,6 @@
// Standard properties
- // Service reference type - either JAX-RPC or JAXWS
- private ServiceRefType type;
// The required <service-ref-name> element
private String serviceRefName;
// The JAXRPC required <service-interface> element
@@ -92,7 +89,6 @@
public UnifiedServiceRefMetaData build() {
return new UnifiedServiceRefMetaData(vfsRoot,
- type,
serviceRefName,
serviceInterface,
serviceRefType,
@@ -158,11 +154,6 @@
this.vfsRoot = vfsRoot;
}
- public void setType(ServiceRefType type)
- {
- this.type = type;
- }
-
public String getServiceRefName()
{
return serviceRefName;
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java 2014-05-20 09:45:36 UTC (rev 18679)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java 2014-05-20 10:21:21 UTC (rev 18680)
@@ -32,12 +32,6 @@
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData;
/**
- * XML Binding and ws4ee meta-data element for
- * <code>webservices/webservice-description/port-component</code>
- * <p/>
- * A port component is the equivalent of an ordinary Axis service (and
- * as such it constitutes the building blocks for jaxrpc services).
- * <p/>
*
* @author Thomas.Diesler(a)jboss.org
* @author alessio.soldano(a)jboss.com
Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefType.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefType.java 2014-05-20 09:45:36 UTC (rev 18679)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefType.java 2014-05-20 10:21:21 UTC (rev 18680)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * 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.wsf.spi.serviceref;
-
-/**
- * Creates a ServiceReferenceable and binds it to JNDI.
- *
- * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
- */
-public enum ServiceRefType
-{
- JAXRPC, JAXWS
-}
9 years, 11 months
- 1
- 0
JBossWS SVN: r18679 - in common/trunk/src/main/java/org/jboss/ws/common: configuration and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-05-20 05:45:36 -0400 (Tue, 20 May 2014)
New Revision: 18679
Modified:
common/trunk/src/main/java/org/jboss/ws/common/DOMUtils.java
common/trunk/src/main/java/org/jboss/ws/common/DOMWriter.java
common/trunk/src/main/java/org/jboss/ws/common/IOUtils.java
common/trunk/src/main/java/org/jboss/ws/common/JavaUtils.java
common/trunk/src/main/java/org/jboss/ws/common/ObjectNameFactory.java
common/trunk/src/main/java/org/jboss/ws/common/ResourceLoaderAdapter.java
common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigHelper.java
common/trunk/src/main/java/org/jboss/ws/common/injection/finders/ResourceFieldFinder.java
common/trunk/src/main/java/org/jboss/ws/common/injection/finders/ResourceMethodFinder.java
common/trunk/src/main/java/org/jboss/ws/common/invocation/AbstractInvocationHandler.java
common/trunk/src/main/java/org/jboss/ws/common/invocation/RecordingServerHandler.java
common/trunk/src/main/java/org/jboss/ws/common/management/DefaultEndpointRegistry.java
common/trunk/src/main/java/org/jboss/ws/common/management/ManagedEndpointRegistry.java
common/trunk/src/main/java/org/jboss/ws/common/reflection/AbstractAnnotatedClassProcessor.java
common/trunk/src/main/java/org/jboss/ws/common/security/DefaultSecurityAdapterFactory.java
common/trunk/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java
common/trunk/src/main/java/org/jboss/ws/common/utils/DelegateClassLoader.java
common/trunk/src/main/java/org/jboss/ws/common/utils/JBossWSEntityResolver.java
common/trunk/src/main/java/org/jboss/ws/common/utils/JarUrlConnection.java
common/trunk/src/main/java/org/jboss/ws/common/utils/ResourceURL.java
common/trunk/src/main/java/org/jboss/ws/common/utils/XMLPredefinedEntityReferenceResolver.java
Log:
Misc minor improvements / fixes / warning removal
Modified: common/trunk/src/main/java/org/jboss/ws/common/DOMUtils.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/DOMUtils.java 2014-05-20 07:18:18 UTC (rev 18678)
+++ common/trunk/src/main/java/org/jboss/ws/common/DOMUtils.java 2014-05-20 09:45:36 UTC (rev 18679)
@@ -71,8 +71,8 @@
private static final String ENABLE_DOCTYPE_DECL = "org.jboss.ws.enable_doctype_decl";
private static final String DISALLOW_DOCTYPE_DECL_FEATURE = "http://apache.org/xml/features/disallow-doctype-decl";
- private static String documentBuilderFactoryName;
- private static DocumentBuilderFactory documentBuilderFactory;
+ private static final String documentBuilderFactoryName;
+ private static final DocumentBuilderFactory documentBuilderFactory;
private static final boolean alwaysResolveFactoryName = Boolean.getBoolean(Constants.ALWAYS_RESOLVE_DOCUMENT_BUILDER_FACTORY);
private static final boolean disableDeferedNodeExpansion = Boolean.getBoolean(DISABLE_DEFERRED_NODE_EXPANSION);
Modified: common/trunk/src/main/java/org/jboss/ws/common/DOMWriter.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/DOMWriter.java 2014-05-20 07:18:18 UTC (rev 18678)
+++ common/trunk/src/main/java/org/jboss/ws/common/DOMWriter.java 2014-05-20 09:45:36 UTC (rev 18679)
@@ -64,7 +64,6 @@
import java.io.UnsupportedEncodingException;
import java.io.Writer;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
Modified: common/trunk/src/main/java/org/jboss/ws/common/IOUtils.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/IOUtils.java 2014-05-20 07:18:18 UTC (rev 18678)
+++ common/trunk/src/main/java/org/jboss/ws/common/IOUtils.java 2014-05-20 09:45:36 UTC (rev 18679)
@@ -21,13 +21,11 @@
*/
package org.jboss.ws.common;
-import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Reader;
Modified: common/trunk/src/main/java/org/jboss/ws/common/JavaUtils.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/JavaUtils.java 2014-05-20 07:18:18 UTC (rev 18678)
+++ common/trunk/src/main/java/org/jboss/ws/common/JavaUtils.java 2014-05-20 09:45:36 UTC (rev 18679)
@@ -43,9 +43,9 @@
*/
public class JavaUtils
{
- private static HashMap<String, Class<?>> primitiveNames = new HashMap<String, Class<?>>();
- private static HashMap<String, String> primitiveNameDescriptors = new HashMap<String, String>();
- private static HashSet<String> reservedKeywords = new HashSet<String>(64,0.8f);
+ private static final HashMap<String, Class<?>> primitiveNames = new HashMap<String, Class<?>>();
+ private static final HashMap<String, String> primitiveNameDescriptors = new HashMap<String, String>();
+ private static final HashSet<String> reservedKeywords = new HashSet<String>(64,0.8f);
static
{
Modified: common/trunk/src/main/java/org/jboss/ws/common/ObjectNameFactory.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/ObjectNameFactory.java 2014-05-20 07:18:18 UTC (rev 18678)
+++ common/trunk/src/main/java/org/jboss/ws/common/ObjectNameFactory.java 2014-05-20 09:45:36 UTC (rev 18679)
@@ -58,7 +58,7 @@
}
}
- public static ObjectName create(String domain, Hashtable table)
+ public static ObjectName create(String domain, Hashtable<String, String> table)
{
try
{
Modified: common/trunk/src/main/java/org/jboss/ws/common/ResourceLoaderAdapter.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/ResourceLoaderAdapter.java 2014-05-20 07:18:18 UTC (rev 18678)
+++ common/trunk/src/main/java/org/jboss/ws/common/ResourceLoaderAdapter.java 2014-05-20 09:45:36 UTC (rev 18679)
@@ -48,8 +48,10 @@
*/
public class ResourceLoaderAdapter implements UnifiedVirtualFile
{
- private URL resourceURL;
- private ClassLoader loader;
+ private static final long serialVersionUID = -8567810932195204615L;
+
+ private final URL resourceURL;
+ private final ClassLoader loader;
private static final String jarFileSeparator = "/";
public ResourceLoaderAdapter()
@@ -59,6 +61,7 @@
public ResourceLoaderAdapter(ClassLoader loader)
{
+ this.resourceURL = null;
this.loader = loader;
}
Modified: common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigHelper.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigHelper.java 2014-05-20 07:18:18 UTC (rev 18678)
+++ common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigHelper.java 2014-05-20 09:45:36 UTC (rev 18679)
@@ -62,7 +62,7 @@
*/
public class ConfigHelper implements ClientConfigurer
{
- private static Map<String, String> bindingIDs = new HashMap<String, String>(8);
+ private static final Map<String, String> bindingIDs = new HashMap<String, String>(8);
static {
bindingIDs.put(SOAPBinding.SOAP11HTTP_BINDING, "##SOAP11_HTTP");
bindingIDs.put(SOAPBinding.SOAP12HTTP_BINDING, "##SOAP12_HTTP");
Modified: common/trunk/src/main/java/org/jboss/ws/common/injection/finders/ResourceFieldFinder.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/injection/finders/ResourceFieldFinder.java 2014-05-20 07:18:18 UTC (rev 18678)
+++ common/trunk/src/main/java/org/jboss/ws/common/injection/finders/ResourceFieldFinder.java 2014-05-20 09:45:36 UTC (rev 18679)
@@ -22,10 +22,8 @@
package org.jboss.ws.common.injection.finders;
import java.lang.reflect.Field;
-import java.lang.reflect.Method;
import javax.annotation.Resource;
-import javax.xml.ws.WebServiceContext;
import org.jboss.ws.common.reflection.AnnotatedFieldFinder;
Modified: common/trunk/src/main/java/org/jboss/ws/common/injection/finders/ResourceMethodFinder.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/injection/finders/ResourceMethodFinder.java 2014-05-20 07:18:18 UTC (rev 18678)
+++ common/trunk/src/main/java/org/jboss/ws/common/injection/finders/ResourceMethodFinder.java 2014-05-20 09:45:36 UTC (rev 18679)
@@ -24,7 +24,6 @@
import java.lang.reflect.Method;
import javax.annotation.Resource;
-import javax.xml.ws.WebServiceContext;
import org.jboss.ws.common.reflection.AnnotatedMethodFinder;
Modified: common/trunk/src/main/java/org/jboss/ws/common/invocation/AbstractInvocationHandler.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/invocation/AbstractInvocationHandler.java 2014-05-20 07:18:18 UTC (rev 18678)
+++ common/trunk/src/main/java/org/jboss/ws/common/invocation/AbstractInvocationHandler.java 2014-05-20 09:45:36 UTC (rev 18679)
@@ -26,7 +26,6 @@
import javax.naming.Context;
import javax.naming.NamingException;
-import org.jboss.logging.Logger;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.invocation.Invocation;
import org.jboss.wsf.spi.invocation.InvocationHandler;
@@ -39,9 +38,6 @@
*/
public abstract class AbstractInvocationHandler extends InvocationHandler
{
-
- protected final Logger log = Logger.getLogger(this.getClass()); //TODO! remove after having refactored the AbstractInvocationHandlerEJB3 in ASIL
-
/**
* Constructor.
*/
Modified: common/trunk/src/main/java/org/jboss/ws/common/invocation/RecordingServerHandler.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/invocation/RecordingServerHandler.java 2014-05-20 07:18:18 UTC (rev 18678)
+++ common/trunk/src/main/java/org/jboss/ws/common/invocation/RecordingServerHandler.java 2014-05-20 09:45:36 UTC (rev 18679)
@@ -55,10 +55,10 @@
* @author alessio.soldano(a)jboss.com
* @since 8-Dec-2007
*/
-public class RecordingServerHandler extends GenericSOAPHandler
+public class RecordingServerHandler extends GenericSOAPHandler<SOAPMessageContext>
{
@SuppressWarnings("unchecked")
- protected boolean handleInbound(MessageContext ctx)
+ protected boolean handleInbound(SOAPMessageContext ctx)
{
Endpoint endpoint = EndpointAssociation.getEndpoint();
if (endpoint != null && isRecording(endpoint))
@@ -89,10 +89,9 @@
}
if (processEnvelope) //skip message processing if not required since it's very time-consuming
{
- SOAPMessageContext soapCtx = (SOAPMessageContext)ctx;
try
{
- SOAPEnvelope soapEnv = soapCtx.getMessage().getSOAPPart().getEnvelope();
+ SOAPEnvelope soapEnv = ctx.getMessage().getSOAPPart().getEnvelope();
if (soapEnv != null)
{
record.setEnvelope(DOMWriter.printNode(soapEnv, true));
@@ -109,7 +108,7 @@
}
@SuppressWarnings("unchecked")
- protected boolean handleOutbound(MessageContext ctx)
+ protected boolean handleOutbound(SOAPMessageContext ctx)
{
Endpoint endpoint = EndpointAssociation.getEndpoint();
if (endpoint != null && isRecording(endpoint))
@@ -127,10 +126,9 @@
}
if (processEnvelope) //skip message processing if not required since it's very time-consuming
{
- SOAPMessageContext soapCtx = (SOAPMessageContext)ctx;
try
{
- SOAPEnvelope soapEnv = soapCtx.getMessage().getSOAPPart().getEnvelope();
+ SOAPEnvelope soapEnv = ctx.getMessage().getSOAPPart().getEnvelope();
if (soapEnv != null)
{
record.setEnvelope(DOMWriter.printNode(soapEnv, true));
@@ -146,7 +144,7 @@
return true;
}
- public boolean handleFault(MessageContext ctx)
+ public boolean handleFault(SOAPMessageContext ctx)
{
return handleOutbound(ctx);
}
Modified: common/trunk/src/main/java/org/jboss/ws/common/management/DefaultEndpointRegistry.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/management/DefaultEndpointRegistry.java 2014-05-20 07:18:18 UTC (rev 18678)
+++ common/trunk/src/main/java/org/jboss/ws/common/management/DefaultEndpointRegistry.java 2014-05-20 09:45:36 UTC (rev 18679)
@@ -44,7 +44,7 @@
*/
public class DefaultEndpointRegistry implements EndpointRegistry
{
- private Map<ObjectName, Endpoint> endpoints = new ConcurrentHashMap<ObjectName, Endpoint>();
+ private final Map<ObjectName, Endpoint> endpoints = new ConcurrentHashMap<ObjectName, Endpoint>();
public Endpoint getEndpoint(ObjectName epName)
{
Modified: common/trunk/src/main/java/org/jboss/ws/common/management/ManagedEndpointRegistry.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/management/ManagedEndpointRegistry.java 2014-05-20 07:18:18 UTC (rev 18678)
+++ common/trunk/src/main/java/org/jboss/ws/common/management/ManagedEndpointRegistry.java 2014-05-20 09:45:36 UTC (rev 18679)
@@ -37,7 +37,7 @@
public class ManagedEndpointRegistry extends DefaultEndpointRegistry implements ManagedEndpointRegistryMBean
{
// The MBeanServer
- private MBeanServer mbeanServer;
+ private volatile MBeanServer mbeanServer;
public MBeanServer getMbeanServer()
{
Modified: common/trunk/src/main/java/org/jboss/ws/common/reflection/AbstractAnnotatedClassProcessor.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/reflection/AbstractAnnotatedClassProcessor.java 2014-05-20 07:18:18 UTC (rev 18678)
+++ common/trunk/src/main/java/org/jboss/ws/common/reflection/AbstractAnnotatedClassProcessor.java 2014-05-20 09:45:36 UTC (rev 18679)
@@ -32,8 +32,7 @@
* @author ropalka(a)redhat.com
*/
public abstract class AbstractAnnotatedClassProcessor<AO extends AccessibleObject, A extends Annotation>
-extends AbstractClassProcessor<AO>
-implements AnnotationAware<A>
+ extends AbstractClassProcessor<AO> implements AnnotationAware<A>
{
/**
* Annotation class.
Modified: common/trunk/src/main/java/org/jboss/ws/common/security/DefaultSecurityAdapterFactory.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/security/DefaultSecurityAdapterFactory.java 2014-05-20 07:18:18 UTC (rev 18678)
+++ common/trunk/src/main/java/org/jboss/ws/common/security/DefaultSecurityAdapterFactory.java 2014-05-20 09:45:36 UTC (rev 18679)
@@ -23,8 +23,6 @@
import java.security.Principal;
-import javax.security.auth.Subject;
-
import org.jboss.wsf.spi.invocation.SecurityAdaptor;
import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory;
@@ -36,7 +34,7 @@
public final class DefaultSecurityAdapterFactory extends SecurityAdaptorFactory
{
- private static SecurityAdaptor SECURITY_ADAPTOR = new DefaultSecurityAdaptor();
+ private static final SecurityAdaptor SECURITY_ADAPTOR = new DefaultSecurityAdaptor();
/**
* Constructor.
@@ -59,8 +57,8 @@
private static class DefaultSecurityAdaptor implements SecurityAdaptor
{
- private static ThreadLocal<Principal> principal = new ThreadLocal<Principal>();
- private static ThreadLocal<Object> credential = new ThreadLocal<Object>();
+ private static final ThreadLocal<Principal> principal = new ThreadLocal<Principal>();
+ private static final ThreadLocal<Object> credential = new ThreadLocal<Object>();
public Object getCredential()
{
@@ -72,11 +70,6 @@
return DefaultSecurityAdaptor.principal.get();
}
- public void pushSubjectContext(Subject subject, Principal principal, Object credential)
- {
- // does nothing
- }
-
public void setCredential(Object credential)
{
DefaultSecurityAdaptor.credential.set(credential);
Modified: common/trunk/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java 2014-05-20 07:18:18 UTC (rev 18678)
+++ common/trunk/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java 2014-05-20 09:45:36 UTC (rev 18679)
@@ -63,11 +63,11 @@
public abstract class AbstractWSDLFilePublisher
{
// The deployment info for the web service archive
- protected ArchiveDeployment dep;
+ protected final ArchiveDeployment dep;
// The expected wsdl location in the deployment
- protected String expLocation;
+ protected final String expLocation;
// The server config
- protected ServerConfig serverConfig;
+ protected final ServerConfig serverConfig;
private static DocumentBuilder builder;
@@ -75,11 +75,8 @@
{
this.dep = dep;
- serverConfig = dep.getAttachment(ServerConfig.class);
- if (serverConfig == null)
- {
- serverConfig = getServerConfig();
- }
+ ServerConfig sc = dep.getAttachment(ServerConfig.class);
+ serverConfig = sc != null ? sc : getServerConfig();
if (isJseDeployment(dep) || isWarArchive(dep))
{
Modified: common/trunk/src/main/java/org/jboss/ws/common/utils/DelegateClassLoader.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/utils/DelegateClassLoader.java 2014-05-20 07:18:18 UTC (rev 18678)
+++ common/trunk/src/main/java/org/jboss/ws/common/utils/DelegateClassLoader.java 2014-05-20 09:45:36 UTC (rev 18679)
@@ -37,9 +37,9 @@
*/
public class DelegateClassLoader extends SecureClassLoader
{
- private ClassLoader delegate;
+ private final ClassLoader delegate;
- private ClassLoader parent;
+ private final ClassLoader parent;
public DelegateClassLoader(final ClassLoader delegate, final ClassLoader parent)
{
Modified: common/trunk/src/main/java/org/jboss/ws/common/utils/JBossWSEntityResolver.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/utils/JBossWSEntityResolver.java 2014-05-20 07:18:18 UTC (rev 18678)
+++ common/trunk/src/main/java/org/jboss/ws/common/utils/JBossWSEntityResolver.java 2014-05-20 09:45:36 UTC (rev 18679)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -54,9 +54,9 @@
* A synchronized weak hash map that keeps entities' properties for each classloader.
* Weak keys are used to remove entries when classloaders are garbage collected; values are filenames -> properties.
*/
- private static Map<ClassLoader, Map<String, Properties>> propertiesMap = Collections.synchronizedMap(new WeakHashMap<ClassLoader, Map<String, Properties>>());
+ private static final Map<ClassLoader, Map<String, Properties>> propertiesMap = Collections.synchronizedMap(new WeakHashMap<ClassLoader, Map<String, Properties>>());
- private ClassLoader additionalClassLoader;
+ private final ClassLoader additionalClassLoader;
public JBossWSEntityResolver()
{
Modified: common/trunk/src/main/java/org/jboss/ws/common/utils/JarUrlConnection.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/utils/JarUrlConnection.java 2014-05-20 07:18:18 UTC (rev 18678)
+++ common/trunk/src/main/java/org/jboss/ws/common/utils/JarUrlConnection.java 2014-05-20 09:45:36 UTC (rev 18679)
@@ -47,10 +47,10 @@
// ----------------------------------------------------------------------
/** Base resource. */
- private URL baseResource;
+ private final URL baseResource;
/** Additional nested segments. */
- private String[] segments;
+ private final String[] segments;
/** Terminal input-stream. */
private InputStream in;
Modified: common/trunk/src/main/java/org/jboss/ws/common/utils/ResourceURL.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/utils/ResourceURL.java 2014-05-20 07:18:18 UTC (rev 18678)
+++ common/trunk/src/main/java/org/jboss/ws/common/utils/ResourceURL.java 2014-05-20 09:45:36 UTC (rev 18679)
@@ -37,7 +37,7 @@
*/
public class ResourceURL
{
- private URL targetURL;
+ private final URL targetURL;
public ResourceURL(URL targetURL)
{
Modified: common/trunk/src/main/java/org/jboss/ws/common/utils/XMLPredefinedEntityReferenceResolver.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/utils/XMLPredefinedEntityReferenceResolver.java 2014-05-20 07:18:18 UTC (rev 18678)
+++ common/trunk/src/main/java/org/jboss/ws/common/utils/XMLPredefinedEntityReferenceResolver.java 2014-05-20 09:45:36 UTC (rev 18679)
@@ -32,7 +32,7 @@
*/
public class XMLPredefinedEntityReferenceResolver
{
- private static HashMap<String, Character> entities = new HashMap<String, Character>(8);
+ private static final HashMap<String, Character> entities = new HashMap<String, Character>(8);
static
{
9 years, 11 months
- 1
- 0
JBossWS SVN: r18678 - spi/trunk/src/main/java/org/jboss/wsf/spi/invocation.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-05-20 03:18:18 -0400 (Tue, 20 May 2014)
New Revision: 18678
Removed:
spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/integration/
Log:
Removing classes not used anymore
9 years, 11 months
- 1
- 0
JBossWS SVN: r18677 - stack/cxf/branches/rsearls/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-05-19 12:10:09 -0400 (Mon, 19 May 2014)
New Revision: 18677
Modified:
stack/cxf/branches/rsearls/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java
Log:
[JBWS-3750] minor update to test
Modified: stack/cxf/branches/rsearls/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java
===================================================================
--- stack/cxf/branches/rsearls/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java 2014-05-19 16:09:03 UTC (rev 18676)
+++ stack/cxf/branches/rsearls/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java 2014-05-19 16:10:09 UTC (rev 18677)
@@ -537,7 +537,7 @@
public void testRewriteContext() throws Exception
{
setModifySOAPAddress(true);
- final String addContext = "xx";
+ final String addContext = "xx/jaxws-jbws2150";
setWebServicePath(addContext);
deploy("jaxws-jbws2150.war");
try
@@ -554,19 +554,19 @@
Definition definition = getWSDLDefinition(wsdlLocation);
String address = getPortAddress(definition, "ValidURLService", "ValidURLPort");
- assertEquals("http://" + serverHost + ":8080/" + addContext + "/jaxws-jbws2150/ValidURL", address);
+ assertEquals("http://" + serverHost + ":8080/" + addContext + "/ValidURL", address);
address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort");
- assertEquals("http://" + serverHost + ":8080/" + addContext + "/jaxws-jbws2150/InvalidURL", address);
+ assertEquals("http://" + serverHost + ":8080/" + addContext + "/InvalidURL", address);
address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort");
- assertEquals("https://" + serverHost + ":8443/" + addContext + "/jaxws-jbws2150/ValidSecureURL", address);
+ assertEquals("https://" + serverHost + ":8443/" + addContext + "/ValidSecureURL", address);
address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort");
- assertEquals("https://" + serverHost + ":8443/" + addContext + "/jaxws-jbws2150/InvalidSecureURL", address);
+ assertEquals("https://" + serverHost + ":8443/" + addContext + "/InvalidSecureURL", address);
//check wsdl import (which is bound to the endpoint currently serving the wsdl)
- assertTrue(getWsdlImportAddress(definition).contains(addContext + "/jaxws-jbws2150"));
+ assertTrue(getWsdlImportAddress(definition).contains(addContext));
}
}
finally
@@ -584,8 +584,8 @@
public void testAutoRewriteContext() throws Exception
{
setModifySOAPAddress(true);
- final String addContext = "xx";
- setWebServicePath(addContext);
+ final String addContext = "jaxws-jbws2150";
+ setWebServicePath("xx/" + addContext);
setWebServiceHost(ServerConfig.UNDEFINED_HOSTNAME);
deploy("jaxws-jbws2150.war");
try
@@ -597,24 +597,25 @@
wsdlLocations.add("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl");
wsdlLocations.add("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl");
+ // the addresses should not be rewritten because of the webServiceHost setting.
for (final String wsdlLocation : wsdlLocations)
{
Definition definition = getWSDLDefinition(wsdlLocation);
String address = getPortAddress(definition, "ValidURLService", "ValidURLPort");
- assertEquals("http://" + serverHost + ":8080/" + addContext + "/jaxws-jbws2150/ValidURL", address);
+ assertEquals("http://" + serverHost + ":8080/" + addContext + "/ValidURL", address);
address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort");
- assertEquals("http://" + serverHost + ":8080/" + addContext + "/jaxws-jbws2150/InvalidURL", address);
+ assertEquals("http://" + serverHost + ":8080/" + addContext + "/InvalidURL", address);
address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort");
- assertEquals("https://" + serverHost + ":8443/" + addContext + "/jaxws-jbws2150/ValidSecureURL", address);
+ assertEquals("http://" + serverHost + ":8080/" + addContext + "/ValidSecureURL", address);
address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort");
- assertEquals("https://" + serverHost + ":8443/" + addContext + "/jaxws-jbws2150/InvalidSecureURL", address);
+ assertEquals("http://" + serverHost + ":8080/" + addContext + "/InvalidSecureURL", address);
//check wsdl import (which is bound to the endpoint currently serving the wsdl)
- assertTrue(getWsdlImportAddress(definition).contains(addContext + "/jaxws-jbws2150"));
+ assertTrue(getWsdlImportAddress(definition).contains(addContext));
}
}
finally
9 years, 11 months
- 1
- 0
JBossWS SVN: r18676 - stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-05-19 12:09:03 -0400 (Mon, 19 May 2014)
New Revision: 18676
Modified:
stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
Log:
[JBWS-3750] added param to rewriteSoapAddress call
Modified: stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
===================================================================
--- stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2014-05-19 15:55:08 UTC (rev 18675)
+++ stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2014-05-19 16:09:03 UTC (rev 18676)
@@ -293,8 +293,9 @@
SOAPAddressWSDLParser parser = getCurrentSOAPAddressWSDLParser(wsdlUrl, soapAddressWsdlParsers);
//do not try rewriting addresses for not-http binding
String wsdlAddress = parser.filterSoapAddress(ddep.getServiceName(), ddep.getPortName(), SOAPAddressWSDLParser.SOAP_HTTP_NS);
-
- String rewrittenWsdlAddress = SoapAddressRewriteHelper.getRewrittenPublishedEndpointUrl(wsdlAddress, ddep.getAddress(), sc);
+
+ String rewrittenWsdlAddress =
+ SoapAddressRewriteHelper.getRewrittenPublishedEndpointUrl(wsdlAddress, ddep.getAddress(), sc, dep.getService().getContextRoot());
//If "auto rewrite", leave "publishedEndpointUrl" unset so that CXF does not force host/port values for
//wsdl imports and auto-rewrite them too; otherwise set the new address into "publishedEndpointUrl",
//which causes CXF to override any address in the published wsdl.
9 years, 11 months
- 1
- 0
JBossWS SVN: r18675 - stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/addressRewrite.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-05-19 11:55:08 -0400 (Mon, 19 May 2014)
New Revision: 18675
Modified:
stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/addressRewrite/SoapAddressRewriteHelper.java
Log:
[JBWS-3750] added url path substitution in rewriteSoapAddress
Modified: stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/addressRewrite/SoapAddressRewriteHelper.java
===================================================================
--- stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/addressRewrite/SoapAddressRewriteHelper.java 2014-05-19 14:22:07 UTC (rev 18674)
+++ stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/addressRewrite/SoapAddressRewriteHelper.java 2014-05-19 15:55:08 UTC (rev 18675)
@@ -47,7 +47,7 @@
* @param serverConfig The current ServerConfig
* @return The rewritten soap:address to be used in the wsdl
*/
- public static String getRewrittenPublishedEndpointUrl(String wsdlAddress, String epAddress, ServerConfig serverConfig) {
+ public static String getRewrittenPublishedEndpointUrl(String wsdlAddress, String epAddress, ServerConfig serverConfig, String contextRoot) {
if (wsdlAddress == null) {
return null;
}
@@ -56,7 +56,7 @@
final String origUriScheme = getUriScheme(wsdlAddress); //will be https if the user wants a https address in the wsdl
final String newUriScheme = getUriScheme(epAddress); //will be https if the user set confidential transport for the endpoint
final String uriScheme = (origUriScheme.equals(HTTPS) || newUriScheme.equals(HTTPS)) ? HTTPS : HTTP;
- return rewriteSoapAddress(serverConfig, wsdlAddress, epAddress, uriScheme, serverConfig.getWebServicePath());
+ return rewriteSoapAddress(serverConfig, wsdlAddress, epAddress, uriScheme, serverConfig.getWebServicePath(), contextRoot);
}
else
{
@@ -118,7 +118,7 @@
* @param uriScheme The uriScheme to use for rewrite
* @return The obtained address
*/
- private static String rewriteSoapAddress(ServerConfig serverConfig, String origAddress, String newAddress, String uriScheme, String additionalCcontext)
+ private static String rewriteSoapAddress(ServerConfig serverConfig, String origAddress, String newAddress, String uriScheme, String additionalCcontext, String contextRoot)
{
try
{
@@ -147,13 +147,15 @@
sb.append("://");
sb.append(host);
sb.append(port);
- if (additionalCcontext != null) {
- if (!additionalCcontext.startsWith("/")) {
- sb.append("/");
- }
- sb.append(additionalCcontext);
+ // replace original context-root with replacement context
+ if (additionalCcontext != null && additionalCcontext.length() > 0) {
+ String tmpAdditionalCcontext = additionalCcontext.startsWith("/") ? additionalCcontext : "/" + additionalCcontext;
+ String tmpPath = path.replace(contextRoot, tmpAdditionalCcontext);
+ sb.append(tmpPath);
+ } else
+ {
+ sb.append(path);
}
- sb.append(path);
final String urlStr = sb.toString();
ADDRESS_REWRITE_LOGGER.addressRewritten(origAddress, urlStr);
9 years, 11 months
- 1
- 0