JBossWS SVN: r18633 - in spi/trunk/src/main/java/org/jboss/wsf/spi: metadata/config and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-05-12 13:48:00 -0400 (Mon, 12 May 2014)
New Revision: 18633
Added:
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/AddressingMetadata.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/MTOMMetadata.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/RespectBindingMetadata.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaDataBuilder.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaDataBuilder.java
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationContext.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/Feature.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBSecurityMetaData.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.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/webservices/JBossWebservicesFactory.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java
Log:
[JBWS-3793] Initial changes to j2ee/serviceref stuff + few misc final modifier additions
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationContext.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationContext.java 2014-05-10 00:59:38 UTC (rev 18632)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationContext.java 2014-05-12 17:48:00 UTC (rev 18633)
@@ -31,7 +31,7 @@
*/
public class InvocationContext extends AbstractExtensible
{
- private Object targetBean;
+ private volatile Object targetBean;
public InvocationContext() {
super(4, 4);
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/Feature.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/Feature.java 2014-05-10 00:59:38 UTC (rev 18632)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/Feature.java 2014-05-12 17:48:00 UTC (rev 18633)
@@ -23,7 +23,7 @@
public final class Feature
{
- private String name;
+ private final String name;
public Feature(final String name)
{
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBSecurityMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBSecurityMetaData.java 2014-05-10 00:59:38 UTC (rev 18632)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBSecurityMetaData.java 2014-05-12 17:48:00 UTC (rev 18633)
@@ -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.
*
@@ -29,18 +29,20 @@
*/
public class EJBSecurityMetaData
{
- private String authMethod;
- private String transportGuarantee;
- private boolean secureWSDLAccess;
+ private final String authMethod;
+ private final String transportGuarantee;
+ private final boolean secureWSDLAccess;
- public String getAuthMethod()
+ public EJBSecurityMetaData(String authMethod, String transportGuarantee, boolean secureWSDLAccess)
{
- return authMethod;
+ this.authMethod = authMethod;
+ this.transportGuarantee = transportGuarantee;
+ this.secureWSDLAccess = secureWSDLAccess;
}
- public void setAuthMethod(String authMethod)
+ public String getAuthMethod()
{
- this.authMethod = authMethod;
+ return authMethod;
}
public String getTransportGuarantee()
@@ -48,19 +50,8 @@
return transportGuarantee;
}
- public void setTransportGuarantee(String transportGuarantee)
- {
- this.transportGuarantee = transportGuarantee;
- }
-
public boolean getSecureWSDLAccess()
{
return secureWSDLAccess;
}
-
- public void setSecureWSDLAccess(Boolean access)
- {
- if (access != null)
- this.secureWSDLAccess = access;
- }
}
Added: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/AddressingMetadata.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/AddressingMetadata.java (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/AddressingMetadata.java 2014-05-12 17:48:00 UTC (rev 18633)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * 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.
+ *
+ * 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.metadata.j2ee.serviceref;
+
+import static org.jboss.wsf.spi.Messages.MESSAGES;
+
+public final class AddressingMetadata
+{
+ private final boolean annotationSpecified;
+ private final boolean enabled;
+ private final boolean required;
+ private final String responses;
+
+ public AddressingMetadata(boolean annotationSpecified, boolean enabled, boolean required, String responses)
+ {
+ this.annotationSpecified = annotationSpecified;
+ this.enabled = enabled;
+ this.required = required;
+ if (!"ANONYMOUS".equals(responses) && !"NON_ANONYMOUS".equals(responses) && !"ALL".equals(responses))
+ throw MESSAGES.unsupportedAddressingResponseType(responses);
+ this.responses = responses;
+ }
+
+ public AddressingMetadata(boolean annotationSpecified, boolean enabled, boolean required)
+ {
+ this.annotationSpecified = annotationSpecified;
+ this.enabled = enabled;
+ this.required = required;
+ this.responses = "ALL";
+ }
+
+ public boolean isAnnotationSpecified()
+ {
+ return annotationSpecified;
+ }
+
+ public boolean isEnabled()
+ {
+ return enabled;
+ }
+
+ public boolean isRequired()
+ {
+ return required;
+ }
+
+ public String getResponses()
+ {
+ return responses;
+ }
+}
Property changes on: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/AddressingMetadata.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/MTOMMetadata.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/MTOMMetadata.java (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/MTOMMetadata.java 2014-05-12 17:48:00 UTC (rev 18633)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * 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.
+ *
+ * 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.metadata.j2ee.serviceref;
+
+public final class MTOMMetadata
+{
+ private final boolean annotationSpecified;
+ private final boolean enabled;
+ private final int threshold;
+
+ public MTOMMetadata(boolean annotationSpecified, boolean enabled, int threshold)
+ {
+ this.annotationSpecified = annotationSpecified;
+ this.enabled = enabled;
+ this.threshold = threshold;
+ }
+
+ public boolean isAnnotationSpecified()
+ {
+ return annotationSpecified;
+ }
+
+ public boolean isEnabled()
+ {
+ return enabled;
+ }
+
+ public int getThreshold()
+ {
+ return threshold;
+ }
+}
Property changes on: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/MTOMMetadata.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/RespectBindingMetadata.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/RespectBindingMetadata.java (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/RespectBindingMetadata.java 2014-05-12 17:48:00 UTC (rev 18633)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * 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.
+ *
+ * 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.metadata.j2ee.serviceref;
+
+public final class RespectBindingMetadata
+{
+ private final boolean annotationSpecified;
+ private final boolean enabled;
+
+ public RespectBindingMetadata(boolean annotationSpecified, boolean enabled)
+ {
+ this.annotationSpecified = annotationSpecified;
+ this.enabled = enabled;
+ }
+
+ public boolean isAnnotationSpecified()
+ {
+ return annotationSpecified;
+ }
+
+ public boolean isEnabled()
+ {
+ return enabled;
+ }
+}
Property changes on: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/RespectBindingMetadata.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java 2014-05-10 00:59:38 UTC (rev 18632)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java 2014-05-12 17:48:00 UTC (rev 18633)
@@ -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.
*
@@ -22,7 +22,7 @@
package org.jboss.wsf.spi.metadata.j2ee.serviceref;
import java.io.Serializable;
-import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import javax.xml.namespace.QName;
@@ -36,48 +36,68 @@
*/
public class UnifiedPortComponentRefMetaData implements Serializable
{
- private static final long serialVersionUID = 1L;
- // The parent service-ref
- private UnifiedServiceRefMetaData serviceRefMetaData;
+ private static final long serialVersionUID = -152050329082506952L;
// The required <service-endpoint-interface> element
- private String serviceEndpointInterface;
+ private final String serviceEndpointInterface;
// The optional <port-component-link> element
- private String portComponentLink;
+ private final String portComponentLink;
// The optional <port-qname> element
- private QName portQName;
+ private final QName portQName;
// Arbitrary proxy properties given by <stub-property>
- private List<UnifiedStubPropertyMetaData> stubProperties = new ArrayList<UnifiedStubPropertyMetaData>(2);
+ private final List<UnifiedStubPropertyMetaData> stubProperties;
// The optional JBossWS config-name
- private String configName;
+ private final String configName;
// The optional JBossWS config-file
- private String configFile;
+ private final String configFile;
// The optional <adressing> element
- private boolean addressingAnnotationSpecified;
- private boolean addressingEnabled;
- private boolean addressingRequired;
- private String addressingResponses = "ALL";
+ private final boolean addressingAnnotationSpecified;
+ private final boolean addressingEnabled;
+ private final boolean addressingRequired;
+ private final String addressingResponses;
// The optional <enable-mtom> element
- private boolean mtomEnabled;
+ private final boolean mtomEnabled;
// The optional <mtom-threshold> element
- private int mtomThreshold;
+ private final int mtomThreshold;
// @RespectBinding annotation metadata
- private boolean respectBindingAnnotationSpecified;
- private boolean respectBindingEnabled;
+ private final boolean respectBindingAnnotationSpecified;
+ private final boolean respectBindingEnabled;
- public UnifiedPortComponentRefMetaData(UnifiedServiceRefMetaData serviceRefMetaData)
+ public UnifiedPortComponentRefMetaData(boolean addressingAnnotationSpecified,
+ boolean addressingEnabled,
+ boolean addressingRequired,
+ String addressingResponses,
+ boolean mtomEnabled,
+ int mtomThreshold,
+ boolean respectBindingAnnotationSpecified,
+ boolean respectBindingEnabled,
+ String portComponentLink,
+ String serviceEndpointInterface,
+ QName portQName,
+ List<UnifiedStubPropertyMetaData> stubProps,
+ String configFile,
+ String configName)
{
- this.serviceRefMetaData = serviceRefMetaData;
- }
-
- public UnifiedServiceRefMetaData getServiceRefMetaData()
- {
- return serviceRefMetaData;
- }
-
- public void setAddressingAnnotationSpecified(final boolean addressingAnnotationSpecified)
- {
this.addressingAnnotationSpecified = addressingAnnotationSpecified;
+ this.addressingEnabled = addressingEnabled;
+ this.addressingRequired = addressingRequired;
+ if (!"ANONYMOUS".equals(addressingResponses) && !"NON_ANONYMOUS".equals(addressingResponses) && !"ALL".equals(addressingResponses))
+ throw Messages.MESSAGES.unsupportedAddressingResponseType(addressingResponses);
+ this.addressingResponses = addressingResponses;
+ this.mtomEnabled = mtomEnabled;
+ this.mtomThreshold = mtomThreshold;
+ this.respectBindingAnnotationSpecified = respectBindingAnnotationSpecified;
+ this.respectBindingEnabled = respectBindingEnabled;
+ this.portComponentLink = portComponentLink;
+ this.serviceEndpointInterface = serviceEndpointInterface;
+ this.portQName = portQName;
+ if (stubProps != null && !stubProps.isEmpty()) {
+ this.stubProperties = Collections.unmodifiableList(stubProps);
+ } else {
+ this.stubProperties = Collections.emptyList();
+ }
+ this.configFile = configFile;
+ this.configName = configName;
}
public boolean isAddressingAnnotationSpecified()
@@ -85,65 +105,35 @@
return addressingAnnotationSpecified;
}
- public void setAddressingEnabled(final boolean addressingEnabled) {
- this.addressingEnabled = addressingEnabled;
- }
-
public boolean isAddressingEnabled() {
return this.addressingEnabled;
}
- public void setAddressingRequired(final boolean addressingRequired) {
- this.addressingRequired = addressingRequired;
- }
-
public boolean isAddressingRequired() {
return this.addressingRequired;
}
- public void setAddressingResponses(final String responsesTypes)
- {
- if (!"ANONYMOUS".equals(responsesTypes) && !"NON_ANONYMOUS".equals(responsesTypes) && !"ALL".equals(responsesTypes))
- throw Messages.MESSAGES.unsupportedAddressingResponseType(responsesTypes);
-
- this.addressingResponses = responsesTypes;
- }
-
public String getAddressingResponses() {
return this.addressingResponses;
}
public void setMtomEnabled(final boolean mtomEnabled) {
- this.mtomEnabled = mtomEnabled;
+
}
public boolean isMtomEnabled() {
return this.mtomEnabled;
}
- public void setMtomThreshold(final int mtomThreshold)
- {
- this.mtomThreshold = mtomThreshold;
- }
-
public int getMtomThreshold() {
return this.mtomThreshold;
}
- public void setRespectBindingAnnotationSpecified(final boolean respectBindingAnnotationSpecified)
- {
- this.respectBindingAnnotationSpecified = respectBindingAnnotationSpecified;
- }
-
public boolean isRespectBindingAnnotationSpecified()
{
return respectBindingAnnotationSpecified;
}
- public void setRespectBindingEnabled(final boolean respectBindingEnabled) {
- this.respectBindingEnabled = respectBindingEnabled;
- }
-
public boolean isRespectBindingEnabled() {
return this.respectBindingEnabled;
}
@@ -164,66 +154,31 @@
return portComponentLink;
}
- public void setPortComponentLink(String portComponentLink)
- {
- this.portComponentLink = portComponentLink;
- }
-
public String getServiceEndpointInterface()
{
return serviceEndpointInterface;
}
- public void setServiceEndpointInterface(String serviceEndpointInterface)
- {
- this.serviceEndpointInterface = serviceEndpointInterface;
- }
-
public QName getPortQName()
{
return portQName;
}
- public void setPortQName(QName portQName)
- {
- this.portQName = portQName;
- }
-
public List<UnifiedStubPropertyMetaData> getStubProperties()
{
return stubProperties;
}
- public void setStubProperties(List<UnifiedStubPropertyMetaData> stubProps)
- {
- stubProperties = stubProps;
- }
-
- public void addStubProperty(UnifiedStubPropertyMetaData stubProp)
- {
- stubProperties.add(stubProp);
- }
-
public String getConfigFile()
{
return configFile;
}
- public void setConfigFile(String configFile)
- {
- this.configFile = configFile;
- }
-
public String getConfigName()
{
return configName;
}
- public void setConfigName(String configName)
- {
- this.configName = configName;
- }
-
public boolean matches(String seiName, QName portName)
{
if (seiName == null && portName == null)
Added: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaDataBuilder.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaDataBuilder.java (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaDataBuilder.java 2014-05-12 17:48:00 UTC (rev 18633)
@@ -0,0 +1,159 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * 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.
+ *
+ * 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.metadata.j2ee.serviceref;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import org.jboss.wsf.spi.Messages;
+
+/**
+ * Utility class for building UnifiedPortComponentRefMetaData instances
+ *
+ * @author alessio.soldano(a)jboss.com
+ */
+public class UnifiedPortComponentRefMetaDataBuilder
+{
+ // The required <service-endpoint-interface> element
+ private String serviceEndpointInterface;
+ // The optional <port-component-link> element
+ private String portComponentLink;
+ // The optional <port-qname> element
+ private QName portQName;
+ // Arbitrary proxy properties given by <stub-property>
+ private List<UnifiedStubPropertyMetaData> stubProperties = new ArrayList<UnifiedStubPropertyMetaData>(2);
+ // The optional JBossWS config-name
+ private String configName;
+ // The optional JBossWS config-file
+ private String configFile;
+ // The optional <adressing> element
+ private boolean addressingAnnotationSpecified;
+ private boolean addressingEnabled;
+ private boolean addressingRequired;
+ private String addressingResponses = "ALL";
+ // The optional <enable-mtom> element
+ private boolean mtomEnabled;
+ // The optional <mtom-threshold> element
+ private int mtomThreshold;
+ // @RespectBinding annotation metadata
+ private boolean respectBindingAnnotationSpecified;
+ private boolean respectBindingEnabled;
+
+ public UnifiedPortComponentRefMetaDataBuilder()
+ {
+
+ }
+
+ public UnifiedPortComponentRefMetaData build() {
+ return new UnifiedPortComponentRefMetaData(addressingAnnotationSpecified,
+ addressingEnabled,
+ addressingRequired,
+ addressingResponses,
+ mtomEnabled,
+ mtomThreshold,
+ respectBindingAnnotationSpecified,
+ respectBindingEnabled,
+ portComponentLink,
+ serviceEndpointInterface,
+ portQName,
+ stubProperties,
+ configFile,
+ configName);
+ }
+
+ public void setAddressingAnnotationSpecified(final boolean addressingAnnotationSpecified)
+ {
+ this.addressingAnnotationSpecified = addressingAnnotationSpecified;
+ }
+
+ public void setAddressingEnabled(final boolean addressingEnabled) {
+ this.addressingEnabled = addressingEnabled;
+ }
+
+ public void setAddressingRequired(final boolean addressingRequired) {
+ this.addressingRequired = addressingRequired;
+ }
+
+ public void setAddressingResponses(final String responsesTypes)
+ {
+ if (!"ANONYMOUS".equals(responsesTypes) && !"NON_ANONYMOUS".equals(responsesTypes) && !"ALL".equals(responsesTypes))
+ throw Messages.MESSAGES.unsupportedAddressingResponseType(responsesTypes);
+
+ this.addressingResponses = responsesTypes;
+ }
+
+ public void setMtomEnabled(final boolean mtomEnabled) {
+ this.mtomEnabled = mtomEnabled;
+ }
+
+ public void setMtomThreshold(final int mtomThreshold)
+ {
+ this.mtomThreshold = mtomThreshold;
+ }
+
+ public void setRespectBindingAnnotationSpecified(final boolean respectBindingAnnotationSpecified)
+ {
+ this.respectBindingAnnotationSpecified = respectBindingAnnotationSpecified;
+ }
+
+ public void setRespectBindingEnabled(final boolean respectBindingEnabled) {
+ this.respectBindingEnabled = respectBindingEnabled;
+ }
+
+ public void setPortComponentLink(String portComponentLink)
+ {
+ this.portComponentLink = portComponentLink;
+ }
+
+ public void setServiceEndpointInterface(String serviceEndpointInterface)
+ {
+ this.serviceEndpointInterface = serviceEndpointInterface;
+ }
+
+ public void setPortQName(QName portQName)
+ {
+ this.portQName = portQName;
+ }
+
+ public void setStubProperties(List<UnifiedStubPropertyMetaData> stubProps)
+ {
+ stubProperties = stubProps;
+ }
+
+ public void addStubProperty(UnifiedStubPropertyMetaData stubProp)
+ {
+ stubProperties.add(stubProp);
+ }
+
+ public void setConfigFile(String configFile)
+ {
+ this.configFile = configFile;
+ }
+
+ public void setConfigName(String configName)
+ {
+ this.configName = configName;
+ }
+
+}
Property changes on: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaDataBuilder.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
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-10 00:59:38 UTC (rev 18632)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2014-05-12 17:48:00 UTC (rev 18633)
@@ -29,8 +29,8 @@
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.security.PrivilegedExceptionAction;
-import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -42,8 +42,11 @@
import org.jboss.wsf.spi.serviceref.ServiceRefType;
/**
- * The metadata from service-ref element in web.xml, ejb-jar.xml, and
- * application-client.xml.
+ * The metadata from service-ref element in web.xml, ejb-jar.xml,
+ * application-client.xml and @WebServiceRef annotations.
+ * The class is threadsafe; the information coming from descriptors
+ * only is immutable, while the information that can be overridden
+ * by annotations are stored using volatile references.
*
* @author Thomas.Diesler(a)jboss.org
* @author alessio.soldano(a)jboss.com
@@ -51,141 +54,175 @@
*/
public final class UnifiedServiceRefMetaData implements Serializable
{
- private static final long serialVersionUID = 1L;
- private transient UnifiedVirtualFile vfsRoot;
+ private static final long serialVersionUID = -3140013087984532678L;
+
+ private volatile transient UnifiedVirtualFile vfsRoot;
// Standard properties
// Service reference type - either JAX-RPC or JAXWS
- private ServiceRefType type;
+ private volatile ServiceRefType type; //TODO REMOVE
// The required <service-ref-name> element
- private String serviceRefName;
- // The JAXRPC required <service-interface> element
- private String serviceInterface;
+ private final String serviceRefName;
+ // The <service-interface> element
+ private volatile String serviceInterface;
// service-res-type
- private String serviceRefType;
+ private volatile String serviceRefType;
// The optional <wsdl-file> element
- private String wsdlFile;
+ private volatile String wsdlFile;
+
// The optional <jaxrpc-mapping-file> element
- private String mappingFile;
+ private final String mappingFile;
// The optional <service-qname> element
- private QName serviceQName;
+ private final QName serviceQName;
// The list <port-component-ref> elements
- private List<UnifiedPortComponentRefMetaData> portComponentRefs = new ArrayList<UnifiedPortComponentRefMetaData>(4);
- // The optional <handler> elements. JAX-RPC handlers declared in the standard J2EE1.4 descriptor
- private List<UnifiedHandlerMetaData> handlers = new ArrayList<UnifiedHandlerMetaData>(4);
+ private final List<UnifiedPortComponentRefMetaData> portComponentRefs;
+ // The optional <handler> elements.
+ private final List<UnifiedHandlerMetaData> handlers;
// The optional <handler-chains> elements. JAX-WS handlers declared in the standard JavaEE5 descriptor
- private UnifiedHandlerChainsMetaData handlerChains;
-
+ private final UnifiedHandlerChainsMetaData handlerChains;
// The optional <service-impl-class> element
- private String serviceImplClass;
+ private final String serviceImplClass;
// The optional JBossWS config-name
- private String configName;
+ private final String configName;
// The optional JBossWS config-file
- private String configFile;
+ private final String configFile;
// The optional URL of the actual WSDL to use, <wsdl-override>
- private String wsdlOverride;
+ private final String wsdlOverride;
+
// The optional <handler-chain> element. JAX-WS handler chain declared in the JBoss JavaEE5 descriptor
- private String handlerChain;
+ private volatile String handlerChain;
// @Addressing annotation metadata
- private boolean isAddressingAnnotationSpecified;
- private boolean addressingEnabled;
- private boolean addressingRequired;
- private String addressingResponses = "ALL";
+ private volatile AddressingMetadata addressingMetadata = new AddressingMetadata(false, false, false, "ALL");
// @MTOM annotation metadata
- private boolean isMtomAnnotationSpecified;
- private boolean mtomEnabled;
- private int mtomThreshold;
+ private volatile MTOMMetadata mtomMetadata = new MTOMMetadata(false, false, 0);
// @RespectBinding annotation metadata
- private boolean isRespectBindingAnnotationSpecified;
- private boolean respectBindingEnabled;
+ private volatile RespectBindingMetadata respectBindingMetadata = new RespectBindingMetadata(false, false);
- private Map<QName, String> deployedServiceAddresses = new HashMap<QName, String>();
-
- public UnifiedServiceRefMetaData(UnifiedVirtualFile vfRoot)
+ private final Map<QName, String> deployedServiceAddresses = Collections.synchronizedMap(new HashMap<QName, String>());
+
+ public UnifiedServiceRefMetaData(UnifiedVirtualFile vfsRoot, String serviceRefName)
{
- this.vfsRoot = vfRoot;
+ this(vfsRoot, serviceRefName, null, null, null, null, null, null, null, null, null);
}
- public UnifiedServiceRefMetaData()
+ public UnifiedServiceRefMetaData(UnifiedVirtualFile vfsRoot,
+ String serviceRefName,
+ String mappingFile,
+ QName serviceQName,
+ List<UnifiedPortComponentRefMetaData> portComponentRefs,
+ List<UnifiedHandlerMetaData> handlers,
+ UnifiedHandlerChainsMetaData handlerChains,
+ String serviceImplClass,
+ String configName,
+ String configFile,
+ String wsdlOverride)
{
+ this.vfsRoot = vfsRoot;
+ this.serviceRefName = serviceRefName;
+ this.mappingFile = mappingFile;
+ this.serviceQName = serviceQName;
+ if (portComponentRefs != null && !portComponentRefs.isEmpty()) {
+ this.portComponentRefs = Collections.unmodifiableList(portComponentRefs);
+ } else {
+ this.portComponentRefs = Collections.emptyList();
+ }
+ if (handlers != null && !handlers.isEmpty()) {
+ this.handlers = Collections.unmodifiableList(handlers);
+ } else {
+ this.handlers = Collections.emptyList();
+ }
+ this.handlerChains = handlerChains;
+ this.serviceImplClass = serviceImplClass;
+ this.configName = configName;
+ this.configFile = configFile;
+ this.wsdlOverride = wsdlOverride;
}
+
+
- public void setAddressingAnnotationSpecified(final boolean isAddressingAnnotationSpecified) {
- this.isAddressingAnnotationSpecified = isAddressingAnnotationSpecified;
+ public UnifiedServiceRefMetaData(UnifiedVirtualFile vfsRoot, ServiceRefType type, 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,
+ String wsdlOverride, String handlerChain, AddressingMetadata addressingMetadata, MTOMMetadata mtomMetadata,
+ RespectBindingMetadata respectBindingMetadata)
+ {
+ this.vfsRoot = vfsRoot;
+ this.type = type;
+ this.serviceRefName = serviceRefName;
+ this.serviceInterface = serviceInterface;
+ this.serviceRefType = serviceRefType;
+ this.wsdlFile = wsdlFile;
+ this.mappingFile = mappingFile;
+ this.serviceQName = serviceQName;
+ if (portComponentRefs != null && !portComponentRefs.isEmpty()) {
+ this.portComponentRefs = Collections.unmodifiableList(portComponentRefs);
+ } else {
+ this.portComponentRefs = Collections.emptyList();
+ }
+ if (handlers != null && !handlers.isEmpty()) {
+ this.handlers = Collections.unmodifiableList(handlers);
+ } else {
+ this.handlers = Collections.emptyList();
+ }
+ this.handlerChains = handlerChains;
+ this.serviceImplClass = serviceImplClass;
+ this.configName = configName;
+ this.configFile = configFile;
+ this.wsdlOverride = wsdlOverride;
+ this.handlerChain = handlerChain;
+ this.addressingMetadata = addressingMetadata;
+ this.mtomMetadata = mtomMetadata;
+ this.respectBindingMetadata = respectBindingMetadata;
}
-
+
public boolean isAddressingAnnotationSpecified() {
- return this.isAddressingAnnotationSpecified;
+ return this.addressingMetadata.isAnnotationSpecified();
}
- public void setAddressingEnabled(final boolean addressingEnabled) {
- this.addressingEnabled = addressingEnabled;
- }
-
public boolean isAddressingEnabled() {
- return this.addressingEnabled;
+ return this.addressingMetadata.isEnabled();
}
- public void setAddressingRequired(final boolean addressingRequired) {
- this.addressingRequired = addressingRequired;
- }
-
public boolean isAddressingRequired() {
- return this.addressingRequired;
+ return this.addressingMetadata.isRequired();
}
- public void setAddressingResponses(final String responsesTypes)
- {
- if (!"ANONYMOUS".equals(responsesTypes) && !"NON_ANONYMOUS".equals(responsesTypes) && !"ALL".equals(responsesTypes))
- throw MESSAGES.unsupportedAddressingResponseType(responsesTypes);
-
- this.addressingResponses = responsesTypes;
+ public void setAddressingMedadata(AddressingMetadata addressingMetadata) {
+ this.addressingMetadata = addressingMetadata;
}
public String getAddressingResponses() {
- return this.addressingResponses;
+ return this.addressingMetadata.getResponses();
}
- public void setMtomAnnotationSpecified(final boolean isMtomAnnotationSpecified) {
- this.isMtomAnnotationSpecified = isMtomAnnotationSpecified;
- }
-
public boolean isMtomAnnotationSpecified() {
- return this.isMtomAnnotationSpecified;
+ return this.mtomMetadata.isAnnotationSpecified();
}
- public void setMtomEnabled(final boolean mtomEnabled) {
- this.mtomEnabled = mtomEnabled;
- }
-
public boolean isMtomEnabled() {
- return this.mtomEnabled;
+ return this.mtomMetadata.isEnabled();
}
- public void setMtomThreshold(final int mtomThreshold)
- {
- this.mtomThreshold = mtomThreshold;
+ public int getMtomThreshold() {
+ return this.mtomMetadata.getThreshold();
}
- public int getMtomThreshold() {
- return this.mtomThreshold;
+ public void setMTOMMetadata(MTOMMetadata mtomMetadata) {
+ this.mtomMetadata = mtomMetadata;
}
- public void setRespectBindingAnnotationSpecified(final boolean isRespectBindingAnnotationSpecified) {
- this.isRespectBindingAnnotationSpecified = isRespectBindingAnnotationSpecified;
- }
-
public boolean isRespectBindingAnnotationSpecified() {
- return this.isRespectBindingAnnotationSpecified;
+ return this.respectBindingMetadata.isAnnotationSpecified();
}
- public void setRespectBindingEnabled(final boolean respectBindingEnabled) {
- this.respectBindingEnabled = respectBindingEnabled;
+ public boolean isRespectBindingEnabled() {
+ return this.respectBindingMetadata.isEnabled();
}
- public boolean isRespectBindingEnabled() {
- return this.respectBindingEnabled;
+ public void setRespectBindingMetadata(RespectBindingMetadata respectBindingMetadata) {
+ this.respectBindingMetadata = respectBindingMetadata;
}
public UnifiedVirtualFile getVfsRoot()
@@ -213,21 +250,11 @@
return serviceRefName;
}
- public void setServiceRefName(String serviceRefName)
- {
- this.serviceRefName = serviceRefName;
- }
-
public String getMappingFile()
{
return mappingFile;
}
- public void setMappingFile(String mappingFile)
- {
- this.mappingFile = mappingFile;
- }
-
public URL getMappingLocation()
{
URL mappingURL = null;
@@ -269,21 +296,11 @@
return matchingRef;
}
- public void addPortComponentRef(UnifiedPortComponentRefMetaData pcRef)
- {
- portComponentRefs.add(pcRef);
- }
-
public List<UnifiedHandlerMetaData> getHandlers()
{
return handlers;
}
- public void addHandler(UnifiedHandlerMetaData handler)
- {
- handlers.add(handler);
- }
-
public String getServiceInterface()
{
return serviceInterface;
@@ -299,21 +316,11 @@
return serviceImplClass;
}
- public void setServiceImplClass(String serviceImplClass)
- {
- this.serviceImplClass = serviceImplClass;
- }
-
public QName getServiceQName()
{
return serviceQName;
}
- public void setServiceQName(QName serviceQName)
- {
- this.serviceQName = serviceQName;
- }
-
public String getServiceRefType()
{
return serviceRefType;
@@ -333,9 +340,14 @@
{
this.wsdlFile = wsdlFile;
}
-
+
public URL getWsdlLocation()
{
+ return this.getWsdlLocation(this.wsdlOverride);
+ }
+
+ public URL getWsdlLocation(final String wsdlOverride)
+ {
URL wsdlLocation = null;
if (wsdlOverride != null)
{
@@ -398,41 +410,21 @@
return configFile;
}
- public void setConfigFile(String configFile)
- {
- this.configFile = configFile;
- }
-
public String getConfigName()
{
return configName;
}
- public void setConfigName(String configName)
- {
- this.configName = configName;
- }
-
public String getWsdlOverride()
{
return wsdlOverride;
}
- public void setWsdlOverride(String wsdlOverride)
- {
- this.wsdlOverride = wsdlOverride;
- }
-
public UnifiedHandlerChainsMetaData getHandlerChains()
{
return handlerChains;
}
- public void setHandlerChains(UnifiedHandlerChainsMetaData handlerChains)
- {
- this.handlerChains = handlerChains;
- }
-
public String getHandlerChain()
{
return handlerChain;
@@ -443,9 +435,9 @@
this.handlerChain = handlerChain;
}
- public Map<QName, String> getDeployedServiceAddresses()
+ public String getDeployedServiceAddress(QName serviceQName)
{
- return this.deployedServiceAddresses;
+ return deployedServiceAddresses.get(serviceQName);
}
public void addDeployedServiceAddresses(Map<QName, String> addressMap)
@@ -486,15 +478,15 @@
str.append("\n mappingFile=" + mappingFile);
str.append("\n configName=" + configName);
str.append("\n configFile=" + configFile);
- str.append("\n addressingAnnotationSpecified=" + isAddressingAnnotationSpecified);
- str.append("\n addressingEnabled=" + addressingEnabled);
- str.append("\n addressingRequired=" + addressingRequired);
- str.append("\n addressingResponses=" + addressingResponses);
- str.append("\n mtomAnnotationSpecified=" + isMtomAnnotationSpecified);
- str.append("\n mtomEnabled=" + mtomEnabled);
- str.append("\n mtomThreshold=" + mtomThreshold);
- str.append("\n respectBindingAnnotationSpecified=" + isRespectBindingAnnotationSpecified);
- str.append("\n respectBindingEnabled=" + respectBindingEnabled);
+ str.append("\n addressingAnnotationSpecified=" + addressingMetadata.isAnnotationSpecified());
+ str.append("\n addressingEnabled=" + addressingMetadata.isEnabled());
+ str.append("\n addressingRequired=" + addressingMetadata.isRequired());
+ str.append("\n addressingResponses=" + addressingMetadata.getResponses());
+ str.append("\n mtomAnnotationSpecified=" + mtomMetadata.isAnnotationSpecified());
+ str.append("\n mtomEnabled=" + mtomMetadata.isEnabled());
+ str.append("\n mtomThreshold=" + mtomMetadata.getThreshold());
+ str.append("\n respectBindingAnnotationSpecified=" + respectBindingMetadata.isAnnotationSpecified());
+ str.append("\n respectBindingEnabled=" + respectBindingMetadata.isEnabled());
str.append("\n handlerChains=" + handlerChains);
str.append("\n handlerChain=" + handlerChain);
for (UnifiedHandlerMetaData uhmd : handlers)
@@ -503,8 +495,4 @@
str.append(pcref.toString());
return str.toString();
}
-
-
-
-
}
Added: 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 (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaDataBuilder.java 2014-05-12 17:48:00 UTC (rev 18633)
@@ -0,0 +1,240 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * 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.
+ *
+ * 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.metadata.j2ee.serviceref;
+
+import static org.jboss.wsf.spi.Messages.MESSAGES;
+
+import java.util.ArrayList;
+import java.util.List;
+
+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
+ *
+ * @author alessio.soldano(a)jboss.com
+ */
+public final class UnifiedServiceRefMetaDataBuilder
+{
+ private UnifiedVirtualFile vfsRoot;
+
+ // 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
+ private String serviceInterface;
+ // service-res-type
+ private String serviceRefType;
+ // The optional <wsdl-file> element
+ private String wsdlFile;
+ // The optional <jaxrpc-mapping-file> element
+ private String mappingFile;
+ // The optional <service-qname> element
+ private QName serviceQName;
+ // The list <port-component-ref> elements
+ private List<UnifiedPortComponentRefMetaData> portComponentRefs = new ArrayList<UnifiedPortComponentRefMetaData>(4);
+ // The optional <handler> elements. JAX-RPC handlers declared in the standard J2EE1.4 descriptor
+ private List<UnifiedHandlerMetaData> handlers = new ArrayList<UnifiedHandlerMetaData>(4);
+ // The optional <handler-chains> elements. JAX-WS handlers declared in the standard JavaEE5 descriptor
+ private UnifiedHandlerChainsMetaData handlerChains;
+
+ // The optional <service-impl-class> element
+ private String serviceImplClass;
+ // The optional JBossWS config-name
+ private String configName;
+ // The optional JBossWS config-file
+ private String configFile;
+ // The optional URL of the actual WSDL to use, <wsdl-override>
+ private String wsdlOverride;
+ // The optional <handler-chain> element. JAX-WS handler chain declared in the JBoss JavaEE5 descriptor
+ private String handlerChain;
+ // @Addressing annotation metadata
+ private boolean addressingAnnotationSpecified;
+ private boolean addressingEnabled;
+ private boolean addressingRequired;
+ private String addressingResponses = "ALL";
+ // @MTOM annotation metadata
+ private boolean mtomAnnotationSpecified;
+ private boolean mtomEnabled;
+ private int mtomThreshold;
+ // @RespectBinding annotation metadata
+ private boolean respectBindingAnnotationSpecified;
+ private boolean respectBindingEnabled;
+
+ public UnifiedServiceRefMetaDataBuilder()
+ {
+ }
+
+ public UnifiedServiceRefMetaData build() {
+ return new UnifiedServiceRefMetaData(vfsRoot,
+ type,
+ serviceRefName,
+ serviceInterface,
+ serviceRefType,
+ wsdlFile,
+ mappingFile,
+ serviceQName,
+ portComponentRefs,
+ handlers,
+ handlerChains,
+ serviceImplClass,
+ configName,
+ configFile,
+ wsdlOverride,
+ handlerChain,
+ new AddressingMetadata(addressingAnnotationSpecified, addressingEnabled, addressingRequired, addressingResponses),
+ new MTOMMetadata(mtomAnnotationSpecified, mtomEnabled, mtomThreshold),
+ new RespectBindingMetadata(respectBindingAnnotationSpecified, respectBindingEnabled));
+ }
+
+ public void setAddressingAnnotationSpecified(final boolean addressingAnnotationSpecified) {
+ this.addressingAnnotationSpecified = addressingAnnotationSpecified;
+ }
+
+ public void setAddressingEnabled(final boolean addressingEnabled) {
+ this.addressingEnabled = addressingEnabled;
+ }
+
+ public void setAddressingRequired(final boolean addressingRequired) {
+ this.addressingRequired = addressingRequired;
+ }
+
+ public void setAddressingResponses(final String responsesTypes)
+ {
+ if (!"ANONYMOUS".equals(responsesTypes) && !"NON_ANONYMOUS".equals(responsesTypes) && !"ALL".equals(responsesTypes))
+ throw MESSAGES.unsupportedAddressingResponseType(responsesTypes);
+
+ this.addressingResponses = responsesTypes;
+ }
+
+ public void setMtomAnnotationSpecified(final boolean mtomAnnotationSpecified) {
+ this.mtomAnnotationSpecified = mtomAnnotationSpecified;
+ }
+
+ public void setMtomEnabled(final boolean mtomEnabled) {
+ this.mtomEnabled = mtomEnabled;
+ }
+
+ public void setMtomThreshold(final int mtomThreshold)
+ {
+ this.mtomThreshold = mtomThreshold;
+ }
+
+ public void setRespectBindingAnnotationSpecified(final boolean respectBindingAnnotationSpecified) {
+ this.respectBindingAnnotationSpecified = respectBindingAnnotationSpecified;
+ }
+
+ public void setRespectBindingEnabled(final boolean respectBindingEnabled) {
+ this.respectBindingEnabled = respectBindingEnabled;
+ }
+
+ public void setVfsRoot(UnifiedVirtualFile vfsRoot)
+ {
+ this.vfsRoot = vfsRoot;
+ }
+
+ public void setType(ServiceRefType type)
+ {
+ this.type = type;
+ }
+
+ public String getServiceRefName()
+ {
+ return serviceRefName;
+ }
+
+ public void setServiceRefName(String serviceRefName)
+ {
+ this.serviceRefName = serviceRefName;
+ }
+
+ public void setMappingFile(String mappingFile)
+ {
+ this.mappingFile = mappingFile;
+ }
+
+ public void addPortComponentRef(UnifiedPortComponentRefMetaData pcRef)
+ {
+ portComponentRefs.add(pcRef);
+ }
+
+ public void addHandler(UnifiedHandlerMetaData handler)
+ {
+ handlers.add(handler);
+ }
+
+ public void setServiceInterface(String serviceInterface)
+ {
+ this.serviceInterface = serviceInterface;
+ }
+
+ public void setServiceImplClass(String serviceImplClass)
+ {
+ this.serviceImplClass = serviceImplClass;
+ }
+
+ public void setServiceQName(QName serviceQName)
+ {
+ this.serviceQName = serviceQName;
+ }
+
+ public void setServiceRefType(String serviceResType)
+ {
+ this.serviceRefType = serviceResType;
+ }
+
+ public void setWsdlFile(String wsdlFile)
+ {
+ this.wsdlFile = wsdlFile;
+ }
+
+ public void setConfigFile(String configFile)
+ {
+ this.configFile = configFile;
+ }
+
+ public void setConfigName(String configName)
+ {
+ this.configName = configName;
+ }
+
+ public void setWsdlOverride(String wsdlOverride)
+ {
+ this.wsdlOverride = wsdlOverride;
+ }
+
+ public void setHandlerChains(UnifiedHandlerChainsMetaData handlerChains)
+ {
+ this.handlerChains = handlerChains;
+ }
+
+ public void setHandlerChain(String handlerChain)
+ {
+ this.handlerChain = handlerChain;
+ }
+}
Property changes on: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaDataBuilder.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java 2014-05-10 00:59:38 UTC (rev 18632)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java 2014-05-12 17:48:00 UTC (rev 18633)
@@ -70,7 +70,7 @@
public class JBossWebservicesFactory {
// The URL to the jboss-webservices.xml descriptor
- private URL descriptorURL;
+ private final URL descriptorURL;
public JBossWebservicesFactory(final URL descriptorURL) {
this.descriptorURL = descriptorURL;
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java 2014-05-10 00:59:38 UTC (rev 18632)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java 2014-05-12 17:48:00 UTC (rev 18633)
@@ -84,7 +84,7 @@
public class WebservicesFactory extends AbstractHandlerChainsMetaDataParser
{
// The URL to the webservices.xml descriptor
- private URL descriptorURL;
+ private final URL descriptorURL;
public WebservicesFactory(URL descriptorURL)
{
10 years, 7 months
JBossWS SVN: r18632 - stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-11150/modules/core/src/main/java/org/jboss/ws/core/server.
by jbossws-commits＠lists.jboss.org
Author: klape
Date: 2014-05-09 20:59:38 -0400 (Fri, 09 May 2014)
New Revision: 18632
Modified:
stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-11150/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
Log:
[JBPAPP-11150] Checking endpoint impl CL for loading param types
Modified: stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-11150/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-11150/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2014-05-10 00:58:33 UTC (rev 18631)
+++ stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-11150/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2014-05-10 00:59:38 UTC (rev 18632)
@@ -385,7 +385,17 @@
if (JavaUtils.isPrimitive(paramType) == false)
{
String paramTypeName = paramType.getName();
- paramType = JavaUtils.loadJavaType(paramTypeName);
+ try
+ {
+ paramType = JavaUtils.loadJavaType(paramTypeName);
+ }
+ catch(Exception e)
+ {
+ if(log.isDebugEnabled())
+ log.debug("Failed to load param type from TCCL", e);
+ //Maybe the impl class is somehow using a different CL...
+ paramType = JavaUtils.loadJavaType(paramTypeName, implClass.getClassLoader());
+ }
paramTypes[i] = paramType;
}
}
10 years, 7 months
JBossWS SVN: r18631 - stack/native/branches.
by jbossws-commits＠lists.jboss.org
Author: klape
Date: 2014-05-09 20:58:33 -0400 (Fri, 09 May 2014)
New Revision: 18631
Added:
stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-11150/
Log:
[JBPAPP-11150] Creating one off branch
10 years, 7 months
JBossWS SVN: r18630 - stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/server.
by jbossws-commits＠lists.jboss.org
Author: klape
Date: 2014-05-09 17:52:14 -0400 (Fri, 09 May 2014)
New Revision: 18630
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
Log:
[JBPAPP-11149] Try using ws impl's CL to load param types
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2014-05-09 08:56:49 UTC (rev 18629)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2014-05-09 21:52:14 UTC (rev 18630)
@@ -400,7 +400,17 @@
if (JavaUtils.isPrimitive(paramType) == false)
{
String paramTypeName = paramType.getName();
- paramType = JavaUtils.loadJavaType(paramTypeName);
+ try
+ {
+ paramType = JavaUtils.loadJavaType(paramTypeName);
+ }
+ catch(Exception e)
+ {
+ if(log.isDebugEnabled())
+ log.debug("Failed to load param type from TCCL", e);
+ //Maybe the impl class is somehow using a different CL...
+ paramType = JavaUtils.loadJavaType(paramTypeName, implClass.getClassLoader());
+ }
paramTypes[i] = paramType;
}
}
10 years, 7 months
JBossWS SVN: r18629 - stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-05-09 04:56:49 -0400 (Fri, 09 May 2014)
New Revision: 18629
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFServiceRefStubPropertyConfigurer.java
Log:
Make CXFServiceRefStubPropertyConfigurer fields final
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFServiceRefStubPropertyConfigurer.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFServiceRefStubPropertyConfigurer.java 2014-05-08 10:44:18 UTC (rev 18628)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFServiceRefStubPropertyConfigurer.java 2014-05-09 08:56:49 UTC (rev 18629)
@@ -47,8 +47,8 @@
*/
final class CXFServiceRefStubPropertyConfigurer implements Configurer
{
- private UnifiedServiceRefMetaData serviceRefMD;
- private Configurer delegate;
+ private final UnifiedServiceRefMetaData serviceRefMD;
+ private final Configurer delegate;
public CXFServiceRefStubPropertyConfigurer(UnifiedServiceRefMetaData serviceRefMD, Configurer delegate)
{
10 years, 7 months
JBossWS SVN: r18628 - spi/trunk.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-05-08 06:44:18 -0400 (Thu, 08 May 2014)
New Revision: 18628
Modified:
spi/trunk/pom.xml
Log:
Moving to 3.0.0-SNAPSHOT
Modified: spi/trunk/pom.xml
===================================================================
--- spi/trunk/pom.xml 2014-05-08 10:39:45 UTC (rev 18627)
+++ spi/trunk/pom.xml 2014-05-08 10:44:18 UTC (rev 18628)
@@ -7,7 +7,7 @@
<packaging>jar</packaging>
<description>JBossWS SPI</description>
- <version>2.3.1-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<!-- Parent -->
<parent>
10 years, 7 months
JBossWS SVN: r18627 - spi/branches.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-05-08 06:39:45 -0400 (Thu, 08 May 2014)
New Revision: 18627
Added:
spi/branches/jbossws-spi-2.3.x/
Log:
Branching for jbossws-spi 2.3.x maintenance
10 years, 7 months
JBossWS SVN: r18626 - common/branches/rsearls/src/main/java/org/jboss/ws/common/management.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-05-07 14:28:11 -0400 (Wed, 07 May 2014)
New Revision: 18626
Modified:
common/branches/rsearls/src/main/java/org/jboss/ws/common/management/AbstractServerConfigMBean.java
Log:
[JBWS-3750] added requried intf impls
Modified: common/branches/rsearls/src/main/java/org/jboss/ws/common/management/AbstractServerConfigMBean.java
===================================================================
--- common/branches/rsearls/src/main/java/org/jboss/ws/common/management/AbstractServerConfigMBean.java 2014-05-07 12:16:46 UTC (rev 18625)
+++ common/branches/rsearls/src/main/java/org/jboss/ws/common/management/AbstractServerConfigMBean.java 2014-05-07 18:28:11 UTC (rev 18626)
@@ -58,4 +58,8 @@
boolean isModifySOAPAddress();
void setModifySOAPAddress(boolean flag);
+
+ String getWebServicePath();
+
+ void setWebServicePath(String path);
}
10 years, 7 months
JBossWS SVN: r18625 - projects/wsi-bp-test/trunk.
by jbossws-commits＠lists.jboss.org
Author: rsvoboda(a)redhat.com
Date: 2014-05-07 08:16:46 -0400 (Wed, 07 May 2014)
New Revision: 18625
Modified:
projects/wsi-bp-test/trunk/pom.xml
Log:
Merge of wsi-bp-test-4.3.0.Beta2 branch, upgrade to 4.3.0.Final, remove of jbossws-cxf-shared-tests dependency
Modified: projects/wsi-bp-test/trunk/pom.xml
===================================================================
--- projects/wsi-bp-test/trunk/pom.xml 2014-05-07 10:44:29 UTC (rev 18624)
+++ projects/wsi-bp-test/trunk/pom.xml 2014-05-07 12:16:46 UTC (rev 18625)
@@ -26,20 +26,20 @@
<test.classes.directory>${project.build.directory}/test-classes</test.classes.directory>
<test.resources.directory>${project.build.directory}/test-resources</test.resources.directory>
- <jbossws.cxf.version>4.2.2-SNAPSHOT</jbossws.cxf.version>
- <jbossws.shared.testsuite.version>4.2.0-SNAPSHOT</jbossws.shared.testsuite.version>
+ <jbossws.cxf.version>4.3.0.Final</jbossws.cxf.version>
+ <jbossws.cxf-test-utils.version>4.3.0.CR1</jbossws.cxf-test-utils.version>
<junit.version>4.10</junit.version>
<log4j.version>1.2.14</log4j.version>
<jboss720.version>7.2.0.Final</jboss720.version>
- <wildfly800.version>8.0.0.Beta1-SNAPSHOT</wildfly800.version>
+ <wildfly800.version>8.0.1.Final-SNAPSHOT</wildfly800.version>
<ejb.api.version>1.0.1.Final</ejb.api.version>
<jaxb.api.version>1.0.3.Final</jaxb.api.version>
<jaxws.api.version>2.0.0.Final</jaxws.api.version>
<jsr181.api.version>1.0-MR1</jsr181.api.version>
- <picketlink.version>2.1.4.Final</picketlink.version>
+ <picketlink.version>2.1.7.Final</picketlink.version>
<org.slf4j.version>1.6.1</org.slf4j.version>
</properties>
@@ -53,20 +53,25 @@
<!-- Dependencies -->
<dependencies>
<dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-shared-testsuite</artifactId>
- <version>${jbossws.shared.testsuite.version}</version>
- <scope>test</scope>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-client</artifactId>
+ <version>${jbossws.cxf.version}</version>
</dependency>
- <dependency>
+ <dependency> <!-- needed for bsp11 tests -->
<groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-client</artifactId>
+ <artifactId>jbossws-cxf-server</artifactId>
<version>${jbossws.cxf.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-test-utils</artifactId>
+ <version>${jbossws.cxf-test-utils.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-factories</artifactId>
<version>${jbossws.cxf.version}</version>
</dependency>
@@ -483,8 +488,8 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.wildlfy</groupId>
- <artifactId>wildfly-webservices-server-integration</artifactId>
+ <groupId>org.wildfly</groupId>
+ <artifactId>wildfly-webservices-tests-integration</artifactId>
<version>${jboss.version}</version>
</dependency>
</dependencies>
@@ -584,6 +589,10 @@
</dependency>
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-factories</artifactId>
</dependency>
</dependencies>
10 years, 7 months
JBossWS SVN: r18624 - in stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws: jbws1581/META-INF and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-05-07 06:44:29 -0400 (Wed, 07 May 2014)
New Revision: 18624
Modified:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/endpoint/META-INF/permissions.xml
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1581/META-INF/permissions.xml
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1841/META-INF/permissions.xml
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/permissions.xml
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/serviceref/META-INF/permissions.xml
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/permissions.xml
Log:
[JBWS-3686] Adding createClassloader permission now required due to CXF 3 ProxyClassloader
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/endpoint/META-INF/permissions.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/endpoint/META-INF/permissions.xml 2014-05-07 08:03:27 UTC (rev 18623)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/endpoint/META-INF/permissions.xml 2014-05-07 10:44:29 UTC (rev 18624)
@@ -9,6 +9,10 @@
<name>getClassLoader</name>
</permission>
<permission>
+ <class-name>java.lang.RuntimePermission</class-name>
+ <name>createClassLoader</name>
+ </permission>
+ <permission>
<class-name>javax.xml.ws.WebServicePermission</class-name>
<name>publishEndpoint</name>
</permission>
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1581/META-INF/permissions.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1581/META-INF/permissions.xml 2014-05-07 08:03:27 UTC (rev 18623)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1581/META-INF/permissions.xml 2014-05-07 10:44:29 UTC (rev 18624)
@@ -10,6 +10,10 @@
</permission>
<permission>
<class-name>java.lang.RuntimePermission</class-name>
+ <name>createClassLoader</name>
+ </permission>
+ <permission>
+ <class-name>java.lang.RuntimePermission</class-name>
<name>org.apache.cxf.permission</name>
<actions>resolveUri</actions>
</permission>
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1841/META-INF/permissions.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1841/META-INF/permissions.xml 2014-05-07 08:03:27 UTC (rev 18623)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1841/META-INF/permissions.xml 2014-05-07 10:44:29 UTC (rev 18624)
@@ -10,6 +10,10 @@
</permission>
<permission>
<class-name>java.lang.RuntimePermission</class-name>
+ <name>createClassLoader</name>
+ </permission>
+ <permission>
+ <class-name>java.lang.RuntimePermission</class-name>
<name>org.apache.cxf.permission</name>
<actions>resolveUri</actions>
</permission>
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/permissions.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/permissions.xml 2014-05-07 08:03:27 UTC (rev 18623)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/permissions.xml 2014-05-07 10:44:29 UTC (rev 18624)
@@ -10,6 +10,10 @@
</permission>
<permission>
<class-name>java.lang.RuntimePermission</class-name>
+ <name>createClassLoader</name>
+ </permission>
+ <permission>
+ <class-name>java.lang.RuntimePermission</class-name>
<name>org.apache.cxf.permission</name>
<actions>resolveUri</actions>
</permission>
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/serviceref/META-INF/permissions.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/serviceref/META-INF/permissions.xml 2014-05-07 08:03:27 UTC (rev 18623)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/serviceref/META-INF/permissions.xml 2014-05-07 10:44:29 UTC (rev 18624)
@@ -10,6 +10,10 @@
</permission>
<permission>
<class-name>java.lang.RuntimePermission</class-name>
+ <name>createClassLoader</name>
+ </permission>
+ <permission>
+ <class-name>java.lang.RuntimePermission</class-name>
<name>org.apache.cxf.permission</name>
<actions>resolveUri</actions>
</permission>
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/permissions.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/permissions.xml 2014-05-07 08:03:27 UTC (rev 18623)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/permissions.xml 2014-05-07 10:44:29 UTC (rev 18624)
@@ -10,6 +10,10 @@
</permission>
<permission>
<class-name>java.lang.RuntimePermission</class-name>
+ <name>createClassLoader</name>
+ </permission>
+ <permission>
+ <class-name>java.lang.RuntimePermission</class-name>
<name>org.apache.cxf.permission</name>
<actions>resolveUri</actions>
</permission>
10 years, 7 months