JBossWS SVN: r13297 - spi/tags.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-11-18 09:00:42 -0500 (Thu, 18 Nov 2010)
New Revision: 13297
Added:
spi/tags/jbossws-spi-1.4.1.CR1/
Log:
tagging JBossWS SPI
Copied: spi/tags/jbossws-spi-1.4.1.CR1 (from rev 13296, spi/trunk)
13 years, 6 months
JBossWS SVN: r13295 - in stack/native/trunk: modules/client and 8 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-11-18 08:20:43 -0500 (Thu, 18 Nov 2010)
New Revision: 13295
Modified:
stack/native/trunk/modules/client/pom.xml
stack/native/trunk/modules/core/pom.xml
stack/native/trunk/modules/endorsed/pom.xml
stack/native/trunk/modules/management/pom.xml
stack/native/trunk/modules/resources/pom.xml
stack/native/trunk/modules/services/pom.xml
stack/native/trunk/modules/testsuite/framework-tests/pom.xml
stack/native/trunk/modules/testsuite/native-tests/pom.xml
stack/native/trunk/modules/testsuite/pom.xml
stack/native/trunk/pom.xml
Log:
Updating poms
Modified: stack/native/trunk/modules/client/pom.xml
===================================================================
--- stack/native/trunk/modules/client/pom.xml 2010-11-18 13:14:38 UTC (rev 13294)
+++ stack/native/trunk/modules/client/pom.xml 2010-11-18 13:20:43 UTC (rev 13295)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2010-11-18 13:14:38 UTC (rev 13294)
+++ stack/native/trunk/modules/core/pom.xml 2010-11-18 13:20:43 UTC (rev 13295)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/trunk/modules/endorsed/pom.xml
===================================================================
--- stack/native/trunk/modules/endorsed/pom.xml 2010-11-18 13:14:38 UTC (rev 13294)
+++ stack/native/trunk/modules/endorsed/pom.xml 2010-11-18 13:20:43 UTC (rev 13295)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/trunk/modules/management/pom.xml
===================================================================
--- stack/native/trunk/modules/management/pom.xml 2010-11-18 13:14:38 UTC (rev 13294)
+++ stack/native/trunk/modules/management/pom.xml 2010-11-18 13:20:43 UTC (rev 13295)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/trunk/modules/resources/pom.xml
===================================================================
--- stack/native/trunk/modules/resources/pom.xml 2010-11-18 13:14:38 UTC (rev 13294)
+++ stack/native/trunk/modules/resources/pom.xml 2010-11-18 13:20:43 UTC (rev 13295)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/trunk/modules/services/pom.xml
===================================================================
--- stack/native/trunk/modules/services/pom.xml 2010-11-18 13:14:38 UTC (rev 13294)
+++ stack/native/trunk/modules/services/pom.xml 2010-11-18 13:20:43 UTC (rev 13295)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/trunk/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2010-11-18 13:14:38 UTC (rev 13294)
+++ stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2010-11-18 13:20:43 UTC (rev 13295)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-testsuite</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2010-11-18 13:14:38 UTC (rev 13294)
+++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2010-11-18 13:20:43 UTC (rev 13295)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-testsuite</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2010-11-18 13:14:38 UTC (rev 13294)
+++ stack/native/trunk/modules/testsuite/pom.xml 2010-11-18 13:20:43 UTC (rev 13295)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2010-11-18 13:14:38 UTC (rev 13294)
+++ stack/native/trunk/pom.xml 2010-11-18 13:20:43 UTC (rev 13295)
@@ -18,7 +18,7 @@
<packaging>pom</packaging>
<description>JBossWS Native stack</description>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.1-SNAPSHOT</version>
<!-- Parent -->
<parent>
@@ -46,15 +46,15 @@
<!-- Properties -->
<properties>
- <jbossws.spi.version>1.4.0-SNAPSHOT</jbossws.spi.version>
- <jbossws.common.version>1.4.0-SNAPSHOT</jbossws.common.version>
- <jbossws.framework.version>3.4.0-SNAPSHOT</jbossws.framework.version>
- <jbossws.jboss501.version>3.4.0-SNAPSHOT</jbossws.jboss501.version>
- <jbossws.jboss510.version>3.4.0-SNAPSHOT</jbossws.jboss510.version>
+ <jbossws.spi.version>1.4.1-SNAPSHOT</jbossws.spi.version>
+ <jbossws.common.version>1.4.1-SNAPSHOT</jbossws.common.version>
+ <jbossws.framework.version>3.4.1-SNAPSHOT</jbossws.framework.version>
+ <jbossws.jboss501.version>3.4.1-SNAPSHOT</jbossws.jboss501.version>
+ <jbossws.jboss510.version>3.4.1-SNAPSHOT</jbossws.jboss510.version>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
- <jbossws.jboss600M5.version>3.4.0-SNAPSHOT</jbossws.jboss600M5.version>
+ <jbossws.jboss600M5.version>3.4.1-SNAPSHOT</jbossws.jboss600M5.version>
<jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version>
-->
<!-- END -->
13 years, 6 months
JBossWS SVN: r13294 - in framework/trunk: testsuite/test/java/org and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-11-18 08:14:38 -0500 (Thu, 18 Nov 2010)
New Revision: 13294
Removed:
framework/trunk/testsuite/test/java/org/w3/
Modified:
framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java
Log:
[JBWS-3161] move service ref type detection to the callers logic
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java 2010-11-18 13:09:32 UTC (rev 13293)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java 2010-11-18 13:14:38 UTC (rev 13294)
@@ -44,19 +44,14 @@
{
throw new IllegalStateException("VFSRoot must be provided");
}
- final Type type = this.getServiceRefType(serviceRefMD);
+ if (serviceRefMD.getType() == null)
+ {
+ throw new IllegalStateException("Service reference type must be provided");
+ }
- return this.getBinder(type).createReferenceable(serviceRefMD);
+ return this.getBinder(serviceRefMD.getType()).createReferenceable(serviceRefMD);
}
- private Type getServiceRefType(final UnifiedServiceRefMetaData serviceRefMD)
- {
- final boolean isJAXRPC = serviceRefMD.getMappingFile() != null
- || "javax.xml.rpc.Service".equals(serviceRefMD.getServiceInterface());
-
- return isJAXRPC ? Type.JAXRPC : Type.JAXWS;
- }
-
private ServiceRefBinder getBinder(final Type type)
{
final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
13 years, 6 months
JBossWS SVN: r13293 - common/trunk/src/main/java/org/jboss/wsf/common/serviceref.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-11-18 08:09:32 -0500 (Thu, 18 Nov 2010)
New Revision: 13293
Modified:
common/trunk/src/main/java/org/jboss/wsf/common/serviceref/AbstractServiceObjectFactoryJAXWS.java
Log:
[JBWS-3161] fixing issue
Modified: common/trunk/src/main/java/org/jboss/wsf/common/serviceref/AbstractServiceObjectFactoryJAXWS.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/serviceref/AbstractServiceObjectFactoryJAXWS.java 2010-11-18 13:09:05 UTC (rev 13292)
+++ common/trunk/src/main/java/org/jboss/wsf/common/serviceref/AbstractServiceObjectFactoryJAXWS.java 2010-11-18 13:09:32 UTC (rev 13293)
@@ -24,7 +24,6 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.net.MalformedURLException;
import java.net.URL;
import java.util.Collection;
import java.util.Hashtable;
@@ -39,7 +38,6 @@
import javax.xml.ws.RespectBindingFeature;
import javax.xml.ws.Service;
import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceException;
import javax.xml.ws.WebServiceFeature;
import javax.xml.ws.soap.AddressingFeature;
import javax.xml.ws.soap.MTOMFeature;
@@ -162,10 +160,12 @@
private String getServiceClassName(final UnifiedServiceRefMetaData serviceRefMD)
{
final String serviceImplClassName = serviceRefMD.getServiceImplClass();
- if (serviceImplClassName != null) return serviceImplClassName;
+ if (serviceImplClassName != null)
+ return serviceImplClassName;
final String serviceInterfaceName = serviceRefMD.getServiceInterface();
- if (serviceInterfaceName != null) return serviceInterfaceName;
+ if (serviceInterfaceName != null)
+ return serviceInterfaceName;
return Service.class.getName(); // fallback
}
@@ -388,8 +388,9 @@
List<WebServiceFeature> features = new LinkedList<WebServiceFeature>();
// configure @Addressing feature
- if (serviceRef.isAddressingEnabled())
+ if (serviceRef.isAddressingAnnotationSpecified())
{
+ final boolean enabled = serviceRef.isAddressingEnabled();
final boolean required = serviceRef.isAddressingRequired();
final String refResponses = serviceRef.getAddressingResponses();
AddressingFeature.Responses responses = AddressingFeature.Responses.ALL;
@@ -398,24 +399,26 @@
if ("NON_ANONYMOUS".equals(refResponses))
responses = AddressingFeature.Responses.NON_ANONYMOUS;
- features.add(new AddressingFeature(true, required, responses));
+ features.add(new AddressingFeature(enabled, required, responses));
}
// configure @MTOM feature
- if (serviceRef.isMtomEnabled())
+ if (serviceRef.isMtomAnnotationSpecified())
{
- features.add(new MTOMFeature(true, serviceRef.getMtomThreshold()));
+ final boolean enabled = serviceRef.isMtomEnabled();
+ final int threshold = serviceRef.getMtomThreshold();
+ features.add(new MTOMFeature(enabled, threshold));
}
// configure @RespectBinding feature
- if (serviceRef.isRespectBindingEnabled())
+ if (serviceRef.isRespectBindingAnnotationSpecified())
{
- features.add(new RespectBindingFeature(true));
+ final boolean enabled = serviceRef.isRespectBindingEnabled();
+ features.add(new RespectBindingFeature(enabled));
}
- WebServiceFeature[] wsFeatures = features.size() == 0 ? null : features.toArray(new WebServiceFeature[]
+ return features.size() == 0 ? null : features.toArray(new WebServiceFeature[]
{});
- return wsFeatures;
}
private WebServiceFeature[] getFeatures(final UnifiedPortComponentRefMetaData portComponentRefMD)
13 years, 6 months
JBossWS SVN: r13292 - stack/native/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-11-18 08:09:05 -0500 (Thu, 18 Nov 2010)
New Revision: 13292
Added:
stack/native/branches/jbossws-native-3.4.0/
Log:
[JBWS-3160] Branching jbossws-native 3.4.0
Copied: stack/native/branches/jbossws-native-3.4.0 (from rev 13290, stack/native/trunk)
13 years, 6 months
JBossWS SVN: r13291 - in stack/cxf/trunk: modules/addons and 10 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-11-18 08:07:28 -0500 (Thu, 18 Nov 2010)
New Revision: 13291
Modified:
stack/cxf/trunk/modules/addons/pom.xml
stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml
stack/cxf/trunk/modules/client/pom.xml
stack/cxf/trunk/modules/endorsed/pom.xml
stack/cxf/trunk/modules/management/pom.xml
stack/cxf/trunk/modules/resources/pom.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml
stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/pom.xml
Log:
Updating poms
Modified: stack/cxf/trunk/modules/addons/pom.xml
===================================================================
--- stack/cxf/trunk/modules/addons/pom.xml 2010-11-18 13:03:36 UTC (rev 13290)
+++ stack/cxf/trunk/modules/addons/pom.xml 2010-11-18 13:07:28 UTC (rev 13291)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml
===================================================================
--- stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml 2010-11-18 13:03:36 UTC (rev 13290)
+++ stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml 2010-11-18 13:07:28 UTC (rev 13291)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-addons</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml 2010-11-18 13:03:36 UTC (rev 13290)
+++ stack/cxf/trunk/modules/client/pom.xml 2010-11-18 13:07:28 UTC (rev 13291)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/endorsed/pom.xml
===================================================================
--- stack/cxf/trunk/modules/endorsed/pom.xml 2010-11-18 13:03:36 UTC (rev 13290)
+++ stack/cxf/trunk/modules/endorsed/pom.xml 2010-11-18 13:07:28 UTC (rev 13291)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/management/pom.xml
===================================================================
--- stack/cxf/trunk/modules/management/pom.xml 2010-11-18 13:03:36 UTC (rev 13290)
+++ stack/cxf/trunk/modules/management/pom.xml 2010-11-18 13:07:28 UTC (rev 13291)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/resources/pom.xml
===================================================================
--- stack/cxf/trunk/modules/resources/pom.xml 2010-11-18 13:03:36 UTC (rev 13290)
+++ stack/cxf/trunk/modules/resources/pom.xml 2010-11-18 13:07:28 UTC (rev 13291)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2010-11-18 13:03:36 UTC (rev 13290)
+++ stack/cxf/trunk/modules/server/pom.xml 2010-11-18 13:07:28 UTC (rev 13291)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml 2010-11-18 13:03:36 UTC (rev 13290)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml 2010-11-18 13:07:28 UTC (rev 13291)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2010-11-18 13:03:36 UTC (rev 13290)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2010-11-18 13:07:28 UTC (rev 13291)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2010-11-18 13:03:36 UTC (rev 13290)
+++ stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2010-11-18 13:07:28 UTC (rev 13291)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2010-11-18 13:03:36 UTC (rev 13290)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2010-11-18 13:07:28 UTC (rev 13291)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2010-11-18 13:03:36 UTC (rev 13290)
+++ stack/cxf/trunk/pom.xml 2010-11-18 13:07:28 UTC (rev 13291)
@@ -18,7 +18,7 @@
<packaging>pom</packaging>
<description>JBossWS CXF stack</description>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.1-SNAPSHOT</version>
<!-- Parent -->
<parent>
@@ -46,15 +46,15 @@
<!-- Properties -->
<properties>
- <jbossws.spi.version>1.4.0-SNAPSHOT</jbossws.spi.version>
- <jbossws.common.version>1.4.0-SNAPSHOT</jbossws.common.version>
- <jbossws.framework.version>3.4.0-SNAPSHOT</jbossws.framework.version>
- <jbossws.jboss501.version>3.4.0-SNAPSHOT</jbossws.jboss501.version>
- <jbossws.jboss510.version>3.4.0-SNAPSHOT</jbossws.jboss510.version>
+ <jbossws.spi.version>1.4.1-SNAPSHOT</jbossws.spi.version>
+ <jbossws.common.version>1.4.1-SNAPSHOT</jbossws.common.version>
+ <jbossws.framework.version>3.4.1-SNAPSHOT</jbossws.framework.version>
+ <jbossws.jboss501.version>3.4.1-SNAPSHOT</jbossws.jboss501.version>
+ <jbossws.jboss510.version>3.4.1-SNAPSHOT</jbossws.jboss510.version>
<!-- JBWS-2505 -->
<!-- START -->
<!--
- <jbossws.jboss600M5.version>3.4.0-SNAPSHOT</jbossws.jboss600M5.version>
+ <jbossws.jboss600M5.version>3.4.1-SNAPSHOT</jbossws.jboss600M5.version>
<jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version>
-->
<!-- END -->
13 years, 6 months
JBossWS SVN: r13290 - spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-11-18 08:03:36 -0500 (Thu, 18 Nov 2010)
New Revision: 13290
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java
Log:
[JBWS-3161] extending SPI
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 2010-11-18 12:44:37 UTC (rev 13289)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2010-11-18 13:03:36 UTC (rev 13290)
@@ -43,6 +43,7 @@
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsf.spi.deployment.WritableUnifiedVirtualFile;
import org.jboss.wsf.spi.serviceref.ServiceRefElement;
+import org.jboss.wsf.spi.serviceref.ServiceRefHandler;
import org.jboss.wsf.spi.util.URLLoaderAdapter;
/**
@@ -64,6 +65,8 @@
// Standard properties
+ // Service reference type - either JAX-RPC or JAXWS
+ private ServiceRefHandler.Type type;
// The required <service-ref-name> element
private String serviceRefName;
// The JAXRPC required <service-interface> element
@@ -83,8 +86,6 @@
// The optional <handler-chains> elements. JAX-WS handlers declared in the standard JavaEE5 descriptor
private UnifiedHandlerChainsMetaData handlerChains;
- // JBoss properties
-
// The optional <service-impl-class> element
private String serviceImplClass;
// The optional JBossWS config-name
@@ -98,13 +99,16 @@
// Arbitrary proxy properties given by <call-property>
private List<UnifiedCallPropertyMetaData> callProperties = new ArrayList<UnifiedCallPropertyMetaData>();
// @Addressing annotation metadata
+ private boolean isAddressingAnnotationSpecified;
private boolean addressingEnabled;
private boolean addressingRequired;
private String addressingResponses = "ALL";
// @MTOM annotation metadata
+ private boolean isMtomAnnotationSpecified;
private boolean mtomEnabled;
private int mtomThreshold;
// @RespectBinding annotation metadata
+ private boolean isRespectBindingAnnotationSpecified;
private boolean respectBindingEnabled;
public UnifiedServiceRefMetaData(UnifiedVirtualFile vfRoot)
@@ -116,6 +120,14 @@
{
}
+ public void setAddressingAnnotationSpecified(final boolean isAddressingAnnotationSpecified) {
+ this.isAddressingAnnotationSpecified = isAddressingAnnotationSpecified;
+ }
+
+ public boolean isAddressingAnnotationSpecified() {
+ return this.isAddressingAnnotationSpecified;
+ }
+
public void setAddressingEnabled(final boolean addressingEnabled) {
this.addressingEnabled = addressingEnabled;
}
@@ -144,6 +156,14 @@
return this.addressingResponses;
}
+ public void setMtomAnnotationSpecified(final boolean isMtomAnnotationSpecified) {
+ this.isMtomAnnotationSpecified = isMtomAnnotationSpecified;
+ }
+
+ public boolean isMtomAnnotationSpecified() {
+ return this.isMtomAnnotationSpecified;
+ }
+
public void setMtomEnabled(final boolean mtomEnabled) {
this.mtomEnabled = mtomEnabled;
}
@@ -161,6 +181,14 @@
return this.mtomThreshold;
}
+ public void setRespectBindingAnnotationSpecified(final boolean isRespectBindingAnnotationSpecified) {
+ this.isRespectBindingAnnotationSpecified = isRespectBindingAnnotationSpecified;
+ }
+
+ public boolean isRespectBindingAnnotationSpecified() {
+ return this.isRespectBindingAnnotationSpecified;
+ }
+
public void setRespectBindingEnabled(final boolean respectBindingEnabled) {
this.respectBindingEnabled = respectBindingEnabled;
}
@@ -178,7 +206,17 @@
{
this.vfsRoot = vfsRoot;
}
+
+ public ServiceRefHandler.Type getType()
+ {
+ return type;
+ }
+ public void setType(ServiceRefHandler.Type type)
+ {
+ this.type = type;
+ }
+
public String getServiceRefName()
{
return serviceRefName;
@@ -486,6 +524,7 @@
StringBuilder str = new StringBuilder();
str.append("\nUnifiedServiceRef");
str.append("\n serviceRefName=" + serviceRefName);
+ str.append("\n type=" + type);
str.append("\n serviceInterface=" + serviceInterface);
str.append("\n serviceImplClass=" + serviceImplClass);
str.append("\n serviceRefType=" + serviceRefType);
@@ -496,11 +535,14 @@
str.append("\n configName=" + configName);
str.append("\n configFile=" + configFile);
str.append("\n callProperties=" + callProperties);
+ 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 handlerChains=" + handlerChains);
str.append("\n handlerChain=" + handlerChain);
13 years, 6 months