JBossWS SVN: r14558 - in common: tags and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-14 11:12:56 -0400 (Tue, 14 Jun 2011)
New Revision: 14558
Added:
common/tags/jbossws-common-2.0.0.Beta4/
Removed:
common/branches/jbossws-common-2.0.0.Beta4/
Log:
Tagging jbossws-common 2.0.0.Beta4
13 years, 6 months
JBossWS SVN: r14557 - in common/branches/jbossws-common-2.0.0.Beta4/src/main/java/org/jboss/ws/common: integration and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-14 11:09:59 -0400 (Tue, 14 Jun 2011)
New Revision: 14557
Modified:
common/branches/jbossws-common-2.0.0.Beta4/src/main/java/org/jboss/ws/common/deployment/DefaultHttpEndpoint.java
common/branches/jbossws-common-2.0.0.Beta4/src/main/java/org/jboss/ws/common/deployment/DefaultJMSEndpoint.java
common/branches/jbossws-common-2.0.0.Beta4/src/main/java/org/jboss/ws/common/integration/WSHelper.java
Log:
[JBWS-3312] Further cleanup
Modified: common/branches/jbossws-common-2.0.0.Beta4/src/main/java/org/jboss/ws/common/deployment/DefaultHttpEndpoint.java
===================================================================
--- common/branches/jbossws-common-2.0.0.Beta4/src/main/java/org/jboss/ws/common/deployment/DefaultHttpEndpoint.java 2011-06-14 15:08:24 UTC (rev 14556)
+++ common/branches/jbossws-common-2.0.0.Beta4/src/main/java/org/jboss/ws/common/deployment/DefaultHttpEndpoint.java 2011-06-14 15:09:59 UTC (rev 14557)
@@ -24,7 +24,6 @@
import javax.naming.Context;
import javax.naming.NamingException;
-import org.jboss.logging.Logger;
import org.jboss.wsf.spi.deployment.HttpEndpoint;
import org.jboss.wsf.spi.management.EndpointMetrics;
@@ -36,8 +35,6 @@
public class DefaultHttpEndpoint extends AbstractDefaultEndpoint implements HttpEndpoint
{
- private static final Logger log = Logger.getLogger(DefaultHttpEndpoint.class);
-
DefaultHttpEndpoint(String targetBean)
{
super(targetBean);
Modified: common/branches/jbossws-common-2.0.0.Beta4/src/main/java/org/jboss/ws/common/deployment/DefaultJMSEndpoint.java
===================================================================
--- common/branches/jbossws-common-2.0.0.Beta4/src/main/java/org/jboss/ws/common/deployment/DefaultJMSEndpoint.java 2011-06-14 15:08:24 UTC (rev 14556)
+++ common/branches/jbossws-common-2.0.0.Beta4/src/main/java/org/jboss/ws/common/deployment/DefaultJMSEndpoint.java 2011-06-14 15:09:59 UTC (rev 14557)
@@ -45,18 +45,6 @@
super(targetBean);
}
- @Deprecated
- public String getURLPattern()
- {
- throw new UnsupportedOperationException();
- }
-
- @Deprecated
- public void setURLPattern(String urlPattern)
- {
- throw new UnsupportedOperationException();
- }
-
public String getTargetDestination()
{
return targetDestination;
@@ -102,7 +90,6 @@
return super.getAddress();
}
- //TODO:enable jms endpoint management
@Override
public EndpointMetrics getEndpointMetrics()
{
Modified: common/branches/jbossws-common-2.0.0.Beta4/src/main/java/org/jboss/ws/common/integration/WSHelper.java
===================================================================
--- common/branches/jbossws-common-2.0.0.Beta4/src/main/java/org/jboss/ws/common/integration/WSHelper.java 2011-06-14 15:08:24 UTC (rev 14556)
+++ common/branches/jbossws-common-2.0.0.Beta4/src/main/java/org/jboss/ws/common/integration/WSHelper.java 2011-06-14 15:09:59 UTC (rev 14557)
@@ -135,17 +135,6 @@
}
/**
- * Returns true if deployment represents JAXWS JMS deployment.
- *
- * @param dep webservice deployment
- * @return true if JAXWS JMS deployment, false otherwise
- */
- public static boolean isJaxwsJmsDeployment( final Deployment dep )
- {
- return DeploymentType.JAXWS_JMS.equals( dep.getType() );
- }
-
- /**
* Returns true if deployment represents either JAXWS JSE or JAXRPC JSE deployment.
*
* @param dep webservice deployment
13 years, 6 months
JBossWS SVN: r14556 - common/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-14 11:08:24 -0400 (Tue, 14 Jun 2011)
New Revision: 14556
Added:
common/branches/jbossws-common-2.0.0.Beta4/
Log:
Branching for jbossws-common-2.0.0.Beta4 release
13 years, 6 months
JBossWS SVN: r14555 - in spi: tags and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-14 11:06:25 -0400 (Tue, 14 Jun 2011)
New Revision: 14555
Added:
spi/tags/jbossws-spi-2.0.0.Beta5/
Removed:
spi/branches/jbossws-spi-2.0.0.Beta5/
Log:
Tagging jbossws-spi-2.0.0.Beta5
13 years, 6 months
JBossWS SVN: r14553 - in spi/branches/jbossws-spi-2.0.0.Beta5/src/main/java/org/jboss/wsf/spi: metadata/j2ee/serviceref and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-14 11:00:54 -0400 (Tue, 14 Jun 2011)
New Revision: 14553
Removed:
spi/branches/jbossws-spi-2.0.0.Beta5/src/main/java/org/jboss/wsf/spi/deployment/ServletClassProvider.java
Modified:
spi/branches/jbossws-spi-2.0.0.Beta5/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java
spi/branches/jbossws-spi-2.0.0.Beta5/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java
spi/branches/jbossws-spi-2.0.0.Beta5/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java
Log:
[JBWS-3312] Further cleanup of old stuff
Modified: spi/branches/jbossws-spi-2.0.0.Beta5/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java
===================================================================
--- spi/branches/jbossws-spi-2.0.0.Beta5/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2011-06-14 14:59:09 UTC (rev 14552)
+++ spi/branches/jbossws-spi-2.0.0.Beta5/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2011-06-14 15:00:54 UTC (rev 14553)
@@ -52,21 +52,6 @@
UNDEFINED, STARTED, STOPPED
};
- /** Get the URL pattern for this endpoint.
- * This has been deprecated, getting the current URLPatter
- * makes sense for {@link HttpEndpoint} only.
- */
- @Deprecated
- String getURLPattern();
- /** Set the URL pattern for this endpoint
- * This has been deprecated, setting the current URLPatter
- * makes sense for {@link HttpEndpoint} only.
- *
- * @param urlPattern
- */
- @Deprecated
- void setURLPattern(String urlPattern);
-
/** Get the service this endpoint belongs to */
Service getService();
Deleted: spi/branches/jbossws-spi-2.0.0.Beta5/src/main/java/org/jboss/wsf/spi/deployment/ServletClassProvider.java
===================================================================
--- spi/branches/jbossws-spi-2.0.0.Beta5/src/main/java/org/jboss/wsf/spi/deployment/ServletClassProvider.java 2011-06-14 14:59:09 UTC (rev 14552)
+++ spi/branches/jbossws-spi-2.0.0.Beta5/src/main/java/org/jboss/wsf/spi/deployment/ServletClassProvider.java 2011-06-14 15:00:54 UTC (rev 14553)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * 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;
-
-/**
- * Provides the name of the servlet class to be used for generating
- * the ws endpoint deployment.
- *
- * @author alessio.soldano(a)jboss.com
- *
- */
-public interface ServletClassProvider
-{
- public String getServletClassName();
-}
Modified: spi/branches/jbossws-spi-2.0.0.Beta5/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java
===================================================================
--- spi/branches/jbossws-spi-2.0.0.Beta5/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java 2011-06-14 14:59:09 UTC (rev 14552)
+++ spi/branches/jbossws-spi-2.0.0.Beta5/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java 2011-06-14 15:00:54 UTC (rev 14553)
@@ -74,24 +74,6 @@
return serviceRefMetaData;
}
- /**
- * @deprecated Use {@link #isMtomEnabled()} instead.
- */
- @Deprecated
- public Boolean getEnableMTOM()
- {
- return mtomEnabled;
- }
-
- /**
- * @deprecated Use {@link #setMtomEnabled(boolean)} instead.
- */
- @Deprecated
- public void setEnableMTOM(Boolean enableMTOM)
- {
- this.mtomEnabled = enableMTOM;
- }
-
public void setAddressingEnabled(final boolean addressingEnabled) {
this.addressingEnabled = addressingEnabled;
}
Modified: spi/branches/jbossws-spi-2.0.0.Beta5/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java
===================================================================
--- spi/branches/jbossws-spi-2.0.0.Beta5/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java 2011-06-14 14:59:09 UTC (rev 14552)
+++ spi/branches/jbossws-spi-2.0.0.Beta5/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java 2011-06-14 15:00:54 UTC (rev 14553)
@@ -189,24 +189,6 @@
this.secureWSDLAccess = secureWSDLAccess;
}
- /**
- * @deprecated Use {@link #isMtomEnabled()} instead.
- */
- @Deprecated
- public boolean isEnableMtom()
- {
- return mtomEnabled;
- }
-
- /**
- * @deprecated Use {@link #setMtomEnabled(boolean)} instead.
- */
- @Deprecated
- public void setEnableMtom(boolean enableMtom)
- {
- this.mtomEnabled = enableMtom;
- }
-
public void setAddressingEnabled(final boolean addressingEnabled) {
this.addressingEnabled = addressingEnabled;
}
13 years, 6 months
JBossWS SVN: r14552 - spi/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-14 10:59:09 -0400 (Tue, 14 Jun 2011)
New Revision: 14552
Added:
spi/branches/jbossws-spi-2.0.0.Beta5/
Log:
Branching for jbossws-spi 2.0.0.Beta5 release
13 years, 6 months
JBossWS SVN: r14551 - in stack/native/trunk/modules: testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsdd and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-14 10:28:55 -0400 (Tue, 14 Jun 2011)
New Revision: 14551
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestWSDDParser.java
Log:
[JBWS-3312] Replace usage of deprecated methods
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2011-06-14 14:23:11 UTC (rev 14550)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2011-06-14 14:28:55 UTC (rev 14551)
@@ -376,7 +376,7 @@
}
// MTOM settings
- if (portComp.isEnableMtom())
+ if (portComp.isMtomEnabled())
{
log.debug("Enabling MTOM");
MTOMFeature feature = new MTOMFeature(true, portComp.getMtomThreshold());
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestWSDDParser.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestWSDDParser.java 2011-06-14 14:23:11 UTC (rev 14550)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestWSDDParser.java 2011-06-14 14:28:55 UTC (rev 14551)
@@ -70,7 +70,7 @@
assertTrue(portComp.getWsdlService().getLocalPart().equals("WSDDEndpointImplService"));
// mtom
- assertTrue(portComp.isEnableMtom());
+ assertTrue(portComp.isMtomEnabled());
// handler chains
UnifiedHandlerChainMetaData handlerChain = portComp.getHandlerChains().getHandlerChains().get(0);
13 years, 6 months
JBossWS SVN: r14550 - in stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder: jaxws and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-14 10:23:11 -0400 (Tue, 14 Jun 2011)
New Revision: 14550
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
Log:
[JBWS-3312] Replace usage of deprecated methods
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2011-06-14 14:20:27 UTC (rev 14549)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2011-06-14 14:23:11 UTC (rev 14550)
@@ -98,7 +98,7 @@
// Unmarshall the jaxrpc-mapping.xml
String mappingFile = wsdMetaData.getJaxrpcMappingFile();
- serviceMetaData.setMappingLocation(dep.getMetaDataFileURL(mappingFile));
+ serviceMetaData.setMappingLocation(dep.getResourceResolver().resolve(mappingFile));
JavaWsdlMapping javaWsdlMapping = serviceMetaData.getJavaWsdlMapping();
if (javaWsdlMapping == null)
throw new WSException("jaxrpc-mapping-file not configured from webservices.xml");
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2011-06-14 14:20:27 UTC (rev 14549)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2011-06-14 14:23:11 UTC (rev 14550)
@@ -220,7 +220,7 @@
{
try
{
- URL xsdURL = ((ArchiveDeployment)dep).getMetaDataFileURL(xsdLoc);
+ URL xsdURL = ((ArchiveDeployment)dep).getResourceResolver().resolve(xsdLoc);
xsdLoc = xsdURL.toExternalForm();
}
catch (IOException ex)
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2011-06-14 14:20:27 UTC (rev 14549)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2011-06-14 14:23:11 UTC (rev 14550)
@@ -122,7 +122,7 @@
String wsdlLocation = anWebServiceProvider.wsdlLocation();
if (wsdlLocation.length() > 0)
{
- URL wsdlURL = dep.getMetaDataFileURL(wsdlLocation);
+ URL wsdlURL = dep.getResourceResolver().resolve(wsdlLocation);
serviceMetaData.setWsdlLocation(wsdlURL);
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2011-06-14 14:20:27 UTC (rev 14549)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2011-06-14 14:23:11 UTC (rev 14550)
@@ -481,7 +481,7 @@
wsMetaData.addService(result.serviceMetaData);
if (dep instanceof ArchiveDeployment)
- result.wsdlLocation = ((ArchiveDeployment)dep).getMetaDataFileURL(wsdlLocation);
+ result.wsdlLocation = ((ArchiveDeployment)dep).getResourceResolver().resolve(wsdlLocation);
return result;
}
13 years, 6 months
JBossWS SVN: r14549 - in container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers: deployment and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-14 10:20:27 -0400 (Tue, 14 Jun 2011)
New Revision: 14549
Modified:
container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java
container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java
Log:
[JBWS-3312] Remove references to old JMS support
Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java
===================================================================
--- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java 2011-06-14 13:49:48 UTC (rev 14548)
+++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java 2011-06-14 14:20:27 UTC (rev 14549)
@@ -29,7 +29,6 @@
import org.jboss.webservices.integration.util.ASHelper;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
-import org.jboss.wsf.spi.metadata.jms.JMSEndpointsMetaData;
import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
/**
@@ -85,11 +84,6 @@
this.log.debug("Detected JAXRPC EJB21 deployment");
unit.addAttachment(DeploymentType.class, DeploymentType.JAXRPC_EJB21);
}
- else if (this.isJaxwsJmsDeployment(unit))
- {
- this.log.debug("Detected JAXWS JMS deployment");
- unit.addAttachment(DeploymentType.class, DeploymentType.JAXWS_JMS);
- }
}
/**
@@ -160,15 +154,4 @@
return false;
}
-
- /**
- * Returns true if JAXWS JMS deployment is detected.
- *
- * @param unit deployment unit
- * @return true if JAXWS JMS, false otherwise
- */
- private boolean isJaxwsJmsDeployment(final DeploymentUnit unit)
- {
- return ASHelper.hasAttachment(unit, JMSEndpointsMetaData.class);
- }
}
Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java
===================================================================
--- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java 2011-06-14 13:49:48 UTC (rev 14548)
+++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java 2011-06-14 14:20:27 UTC (rev 14549)
@@ -47,7 +47,6 @@
WSDeploymentBuilder.builders.put(DeploymentType.JAXRPC_JSE, new DeploymentModelBuilderJAXRPC_JSE());
WSDeploymentBuilder.builders.put(DeploymentType.JAXWS_EJB3, new DeploymentModelBuilderJAXWS_EJB3());
WSDeploymentBuilder.builders.put(DeploymentType.JAXRPC_EJB21, new DeploymentModelBuilderJAXRPC_EJB21());
- WSDeploymentBuilder.builders.put(DeploymentType.JAXWS_JMS, new DeploymentModelBuilderJAXWS_JMS());
}
/**
13 years, 6 months