[jbossws-commits] JBossWS SVN: r16091 - in stack/native/trunk: modules/core and 6 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Wed Apr 4 06:19:42 EDT 2012
Author: ropalka
Date: 2012-04-04 06:19:40 -0400 (Wed, 04 Apr 2012)
New Revision: 16091
Modified:
stack/native/trunk/modules/core/pom.xml
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/Message.properties
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java
stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml
stack/native/trunk/pom.xml
Log:
[JBWS-3474] removing javax.jws dependency
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2012-04-04 09:32:42 UTC (rev 16090)
+++ stack/native/trunk/modules/core/pom.xml 2012-04-04 10:19:40 UTC (rev 16091)
@@ -80,10 +80,6 @@
<artifactId>jboss-jaxws-api_2.2_spec</artifactId>
</dependency>
<dependency>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/Message.properties
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/Message.properties 2012-04-04 09:32:42 UTC (rev 16090)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/Message.properties 2012-04-04 10:19:40 UTC (rev 16091)
@@ -3,7 +3,7 @@
INVALID_NAMESPACE_FOR_TYPE=Invalid namespace for type: {0}
MESSAGECONTEXT_NOT_AVAILABLE=MessageContext not available
UNEXPECTED_STYLE=Unexpected style: {0}
-UNEXPECTED_PARAMETER_STYLE=Unexpected parameter style: {0}
+UNEXPECTED_PARAMETER_STYLE=Unexpected parameter style
CANNOT_WRAP_REQUEST_STRUCTURE=Cannot wrap request structure: {0}
REQUEST_STRUCT_CANNOT_BE_NULL=Request struct cannot be null
CANNOT_UNWRAP_REQUEST_STRUCTURE=Cannot unwrap request structure: {0}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java 2012-04-04 09:32:42 UTC (rev 16090)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java 2012-04-04 10:19:40 UTC (rev 16091)
@@ -35,7 +35,6 @@
import javassist.LoaderClassPath;
import javassist.Modifier;
-import javax.jws.soap.SOAPBinding.ParameterStyle;
import javax.xml.namespace.QName;
import org.jboss.logging.Logger;
@@ -73,8 +72,8 @@
if (opMetaData.getStyle() != Style.DOCUMENT)
throw new WSException(BundleUtils.getMessage(bundle, "UNEXPECTED_STYLE", opMetaData.getStyle()));
- if (opMetaData.getParameterStyle() != ParameterStyle.WRAPPED)
- throw new WSException(BundleUtils.getMessage(bundle, "UNEXPECTED_PARAMETER_STYLE", opMetaData.getParameterStyle()));
+ if (!opMetaData.isWrappedParameterStyle())
+ throw new WSException(BundleUtils.getMessage(bundle, "UNEXPECTED_PARAMETER_STYLE"));
}
private static Object holderValue(Object holder)
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2012-04-04 09:32:42 UTC (rev 16090)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2012-04-04 10:19:40 UTC (rev 16091)
@@ -27,7 +27,6 @@
import java.util.Map;
import java.util.ResourceBundle;
-import javax.jws.soap.SOAPBinding.ParameterStyle;
import javax.xml.namespace.QName;
import javax.xml.rpc.ParameterMode;
import javax.xml.rpc.encoding.TypeMappingRegistry;
@@ -590,7 +589,7 @@
// Check if we need to wrap the parameters
boolean isWrapped = isWrapped(seiMethodMapping, javaTypeName);
- operation.getEndpointMetaData().setParameterStyle(isWrapped ? ParameterStyle.WRAPPED : ParameterStyle.BARE);
+ operation.getEndpointMetaData().setWrappedParameterStyle(Boolean.valueOf(isWrapped));
ParameterMetaData inMetaData = new ParameterMetaData(operation, xmlName, xmlType, javaTypeName);
operation.addParameter(inMetaData);
@@ -852,7 +851,7 @@
else
{
// Set the default to bare in case there isn't an input object, revisit this
- opMetaData.getEndpointMetaData().setParameterStyle(ParameterStyle.BARE);
+ opMetaData.getEndpointMetaData().setWrappedParameterStyle(Boolean.FALSE);
}
if (wsdlOperation.getOutputs().length > 0)
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-04-04 09:32:42 UTC (rev 16090)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-04-04 10:19:40 UTC (rev 16091)
@@ -37,7 +37,6 @@
import java.util.ResourceBundle;
import java.util.Set;
-import javax.jws.soap.SOAPBinding.ParameterStyle;
import javax.xml.namespace.QName;
import javax.xml.rpc.ParameterMode;
import javax.xml.ws.Service.Mode;
@@ -109,7 +108,7 @@
// The SOAPBinding use
private Use use;
// The SOAPBinding parameter style
- private ParameterStyle parameterStyle;
+ private Boolean wrappedParameterStyle;
// The JAXWS ServiceMode
private Mode serviceMode;
// The list of service meta data
@@ -267,25 +266,21 @@
this.style = value;
}
- public ParameterStyle getParameterStyle()
+ public boolean isWrappedParameterStyle()
{
- if (parameterStyle == null)
+ if (wrappedParameterStyle == null)
{
- parameterStyle = ParameterStyle.WRAPPED;
- if (log.isDebugEnabled())
- log.debug("Using default parameter style: " + parameterStyle);
+ wrappedParameterStyle = Boolean.TRUE;
}
- return parameterStyle;
+ return wrappedParameterStyle;
}
- public void setParameterStyle(ParameterStyle value)
+ public void setWrappedParameterStyle(final Boolean value)
{
- if (value != null && parameterStyle != null && !parameterStyle.equals(value))
+ if (value != null && wrappedParameterStyle != null && !wrappedParameterStyle.equals(value))
throw new WSException(BundleUtils.getMessage(bundle, "MIXED_SOAP_PARAMETER_STYLES_NOT_SUPPORTED"));
- if (log.isDebugEnabled())
- log.debug("setParameterStyle: " + value);
- this.parameterStyle = value;
+ this.wrappedParameterStyle = value;
}
public Mode getServiceMode()
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2012-04-04 09:32:42 UTC (rev 16090)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2012-04-04 10:19:40 UTC (rev 16091)
@@ -28,7 +28,6 @@
import java.util.ResourceBundle;
import java.util.Set;
-import javax.jws.soap.SOAPBinding.ParameterStyle;
import javax.xml.namespace.QName;
import javax.xml.rpc.ParameterMode;
@@ -63,7 +62,6 @@
private Method javaMethod;
private boolean oneWay;
private String soapAction;
- private ParameterStyle parameterStyle;
private List<ParameterMetaData> parameters = new ArrayList<ParameterMetaData>();
private List<FaultMetaData> faults = new ArrayList<FaultMetaData>();
private ParameterMetaData returnParam;
@@ -125,16 +123,11 @@
return epMetaData.getEncodingStyle();
}
- public ParameterStyle getParameterStyle()
+ public boolean isWrappedParameterStyle()
{
- return (parameterStyle != null) ? parameterStyle : epMetaData.getParameterStyle();
+ return epMetaData.isWrappedParameterStyle();
}
- public void setParameterStyle(ParameterStyle parameterStyle)
- {
- this.parameterStyle = parameterStyle;
- }
-
public boolean isRPCLiteral()
{
return getStyle() == Style.RPC && getUse() == Use.LITERAL;
@@ -145,14 +138,9 @@
return getStyle() == Style.RPC && getUse() == Use.ENCODED;
}
- public boolean isDocumentBare()
- {
- return getStyle() == Style.DOCUMENT && getParameterStyle() == ParameterStyle.BARE;
- }
-
public boolean isDocumentWrapped()
{
- return getStyle() == Style.DOCUMENT && getParameterStyle() == ParameterStyle.WRAPPED;
+ return getStyle() == Style.DOCUMENT && isWrappedParameterStyle();
}
public void setJavaName(String javaName)
@@ -414,33 +402,6 @@
}
}
- public void assertDocumentBare()
- {
- if (isDocumentBare())
- {
- int in = 0;
- int out = 0;
-
- for (ParameterMetaData paramMetaData : parameters)
- {
- if (paramMetaData.isInHeader())
- continue;
-
- ParameterMode mode = paramMetaData.getMode();
- if (mode != ParameterMode.OUT)
- in++;
- if (mode != ParameterMode.IN)
- out++;
- }
-
- if (returnParam != null && !returnParam.isInHeader())
- out++;
-
- if (in > 1 || out > (oneWay ? 0 : 1))
- throw new WSException(BundleUtils.getMessage(bundle, "DOC_LIT_BARE_REQUIRE", new Object[]{javaName, in, out}));
- }
- }
-
public void validate()
{
for (ParameterMetaData parameter : parameters)
@@ -502,10 +463,6 @@
buffer.append("\n qname=" + qname);
buffer.append("\n javaName=" + javaName);
buffer.append("\n style=" + getStyle() + "/" + getUse());
- if (getStyle() == Style.DOCUMENT)
- {
- buffer.append("/" + getParameterStyle());
- }
buffer.append("\n oneWay=" + oneWay);
buffer.append("\n soapAction=" + soapAction);
for (ParameterMetaData param : parameters)
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java 2012-04-04 09:32:42 UTC (rev 16090)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java 2012-04-04 10:19:40 UTC (rev 16091)
@@ -40,8 +40,6 @@
import java.util.StringTokenizer;
import javax.ejb.SessionBean;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
import javax.xml.namespace.QName;
import javax.xml.rpc.holders.BigDecimalHolder;
import javax.xml.rpc.holders.BigIntegerHolder;
@@ -96,7 +94,6 @@
private final Map primitiveMap = new HashMap();
private final static Map<String, Class> schemaBasicTypes = new HashMap<String, Class>();
-
private final static Map<Class, Class> holderTypes = new HashMap<Class, Class>();
private final static Map<Class, Class> reverseHolderTypes = new HashMap<Class, Class>();
@@ -276,52 +273,6 @@
}
/**
- * The public, non-static or non-final methods that satisfy one of the following conditions:
- * 1. They are annotated with the javax.jws.WebMethod annotation with the exclude element set to
- * false or missing (since false is the default for this annotation element).
- * 2. They are not annotated with the javax.jws.WebMethod annotation but their declaring class has a
- * javax.jws.WebService annotation.
- * @param method to process
- * @return true if webmethod, false otherwise
- */
- public static boolean isWebMethod(final Method method, final boolean definedInInterface)
- {
- if (!isWebMethodCandidate(method))
- return false;
-
- final WebMethod webMethodAnnotation = method.getAnnotation(WebMethod.class);
-
- if (webMethodAnnotation != null)
- {
- return !webMethodAnnotation.exclude();
- }
- if (definedInInterface)
- {
- return true;
- }
- else
- {
- return method.getDeclaringClass().getAnnotation(WebService.class) != null;
- }
- }
-
- /**
- * Only public, non-static and non-final methods are web method candidates.
- *
- * @param method to process
- * @return true if satisfies modifier requirements, false otherwise
- */
- private static boolean isWebMethodCandidate(final Method method)
- {
- final int modifiers = method.getModifiers();
- final boolean isPublic = Modifier.isPublic(modifiers);
- final boolean isNotStatic = !Modifier.isStatic(modifiers);
- final boolean isNotFinal = !Modifier.isFinal(modifiers);
-
- return isPublic && isNotStatic && isNotFinal;
- }
-
- /**
* Chop "PortType" at the end of the String
* @param name
* @return
Modified: stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-04-04 09:32:42 UTC (rev 16090)
+++ stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-04-04 10:19:40 UTC (rev 16091)
@@ -35,7 +35,6 @@
<include>org.jboss.ws.native:jbossws-native-factories:jar</include>
<include>org.jboss.ws.native:jbossws-native-services:jar</include>
<include>org.jboss.ws.native:jbossws-native-core</include>
- <include>javax.jws:jsr181-api:jar</include>
<include>org.jboss.ws:jbossws-api:jar</include>
<include>org.jboss.ws:jbossws-common:jar</include>
<include>org.jboss.ws:jbossws-spi:jar</include>
Modified: stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-04-04 09:32:42 UTC (rev 16090)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-04-04 10:19:40 UTC (rev 16091)
@@ -31,7 +31,6 @@
<dependencies>
<module name="javax.api" />
<module name="javax.servlet.api" />
- <module name="javax.jws.api" />
<module name="javax.mail.api" />
<module name="javax.wsdl4j.api" />
<module name="javax.xml.stream.api" />
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2012-04-04 09:32:42 UTC (rev 16090)
+++ stack/native/trunk/pom.xml 2012-04-04 10:19:40 UTC (rev 16091)
@@ -71,7 +71,6 @@
<jaxws.api.version>2.0.0.Final</jaxws.api.version>
<jaxrpc.api.version>1.0.0.Final</jaxrpc.api.version>
<saaj.api.version>1.0.1.Final</saaj.api.version>
- <jsr181.api.version>1.0-MR1</jsr181.api.version>
<jboss.common.core.version>2.2.16.GA</jboss.common.core.version>
<jboss.logging.version>3.1.0.GA</jboss.logging.version>
<netty.version>3.2.6.Final</netty.version>
@@ -174,11 +173,6 @@
<version>${commons.logging.version}</version>
</dependency>
<dependency>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- <version>${jsr181.api.version}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.spec.javax.xml.ws</groupId>
<artifactId>jboss-jaxws-api_2.2_spec</artifactId>
<version>${jaxws.api.version}</version>
More information about the jbossws-commits
mailing list