JBossWS SVN: r18882 - stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-08-28 07:07:14 -0400 (Thu, 28 Aug 2014)
New Revision: 18882
Modified:
stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/pom.xml
Log:
[JBWS-3773] Enabling test
Modified: stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/pom.xml 2014-08-28 11:01:12 UTC (rev 18881)
+++ stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/pom.xml 2014-08-28 11:07:14 UTC (rev 18882)
@@ -707,9 +707,6 @@
<!--There is no jbossws-cxf-jaspi installed in as720-->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/Jaspi*TestCase*</exclude>
- <!-- [JBWS-3773][CXF-5602] HttpServletRequestSnapshot is not created for requests with WSA ReplyTo prop set -->
- <exclude>org/jboss/test/ws/jaxws/cxf/jbws3773/**</exclude>
-
<!-- [WELD-1328] @WebServiceRef injection not working w/ Weld 1.x -->
<exclude>org/jboss/test/ws/jaxws/cxf/jbws3679/**</exclude>
</excludes>
10 years, 4 months
JBossWS SVN: r18881 - stack/cxf/branches.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-08-28 07:01:12 -0400 (Thu, 28 Aug 2014)
New Revision: 18881
Added:
stack/cxf/branches/jbossws-cxf-5.0.0.Beta1/
Log:
Branching for jbossws-cxf-5.0.0.Beta1 release
10 years, 4 months
JBossWS SVN: r18880 - stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-08-28 06:00:13 -0400 (Thu, 28 Aug 2014)
New Revision: 18880
Modified:
stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java
Log:
Fix error message check on AS 720
Modified: stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java 2014-08-28 09:45:49 UTC (rev 18879)
+++ stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java 2014-08-28 10:00:13 UTC (rev 18880)
@@ -69,7 +69,7 @@
assertEquals(500, c.getResponseCode());
String error = IOUtils.readAndCloseStream(c.getErrorStream());
c.disconnect();
- assertTrue(error.contains("Could not instantiate ClientServlet2"));
+ assertTrue(error.contains("Could not instantiate ClientServlet2") || error.contains("Error instantiating servlet class org.jboss.test.ws.jaxws.jbws2307.ClientServlet2"));
} finally {
JBossWSTestHelper.undeploy(DeploymentArchives.CLIENT_2);
}
10 years, 4 months
JBossWS SVN: r18879 - in stack/cxf/branches/jbossws-cxf-4.3.x: modules/dist and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-08-28 05:45:49 -0400 (Thu, 28 Aug 2014)
New Revision: 18879
Modified:
stack/cxf/branches/jbossws-cxf-4.3.x/modules/dist/pom.xml
stack/cxf/branches/jbossws-cxf-4.3.x/modules/dist/src/main/distro/build-deploy.xml
stack/cxf/branches/jbossws-cxf-4.3.x/modules/dist/src/main/distro/build.xml
stack/cxf/branches/jbossws-cxf-4.3.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/pom.xml
stack/cxf/branches/jbossws-cxf-4.3.x/pom.xml
Log:
Fixed 810 ASIL
Modified: stack/cxf/branches/jbossws-cxf-4.3.x/modules/dist/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.x/modules/dist/pom.xml 2014-08-28 09:28:31 UTC (rev 18878)
+++ stack/cxf/branches/jbossws-cxf-4.3.x/modules/dist/pom.xml 2014-08-28 09:45:49 UTC (rev 18879)
@@ -140,6 +140,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-wildfly810-server-integration</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss</groupId>
<artifactId>jandex</artifactId>
</dependency>
@@ -244,8 +249,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.wildfly</groupId>
- <artifactId>wildfly-webservices-tests-integration</artifactId>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-wildfly810-tests-integration</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: stack/cxf/branches/jbossws-cxf-4.3.x/modules/dist/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.x/modules/dist/src/main/distro/build-deploy.xml 2014-08-28 09:28:31 UTC (rev 18878)
+++ stack/cxf/branches/jbossws-cxf-4.3.x/modules/dist/src/main/distro/build-deploy.xml 2014-08-28 09:45:49 UTC (rev 18879)
@@ -177,7 +177,7 @@
<target name="undeploy-wildfly810" depends="target-wildfly810,init" description="Remove jbossws from wildfly810">
<fail message="Not available: ${wildfly810.available.file}" unless="wildfly810.available"/>
- <macro-undeploy-jbossws-modules targetdir="${wildfly810.home}/modules/system/layers/base" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/>
+ <macro-undeploy-jbossws-modules targetdir="${wildfly810.home}/modules/system/layers/base" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/>
</target>
<!-- ================================================================== -->
Modified: stack/cxf/branches/jbossws-cxf-4.3.x/modules/dist/src/main/distro/build.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.x/modules/dist/src/main/distro/build.xml 2014-08-28 09:28:31 UTC (rev 18878)
+++ stack/cxf/branches/jbossws-cxf-4.3.x/modules/dist/src/main/distro/build.xml 2014-08-28 09:45:49 UTC (rev 18879)
@@ -73,11 +73,11 @@
<property name="deploy.structure" value="${output.dir}/deploy-${jbossws.integration.target}"/>
<property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/>
- <condition property="remote.port" value="8080" else="4447">
- <isset property="jbossws.integration.wildfly80x"/>
+ <condition property="remote.port" value="4447" else="8080">
+ <isset property="jbossws.integration.jboss72x"/>
</condition>
- <condition property="remote.protocol" value="http-remoting" else="remote">
- <isset property="jbossws.integration.wildfly80x"/>
+ <condition property="remote.protocol" value="remote" else="http-remoting">
+ <isset property="jbossws.integration.jboss72x"/>
</condition>
</target>
Modified: stack/cxf/branches/jbossws-cxf-4.3.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2014-08-28 09:28:31 UTC (rev 18878)
+++ stack/cxf/branches/jbossws-cxf-4.3.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2014-08-28 09:45:49 UTC (rev 18879)
@@ -106,7 +106,7 @@
</dependencySet>
- <dependencySet>
+<!-- <dependencySet>
<outputDirectory>deploy-artifacts/lib</outputDirectory>
<unpack>false</unpack>
<includes>
@@ -115,7 +115,7 @@
<outputFileNameMapping>jbossws-wildfly810-tests-integration.jar</outputFileNameMapping>
<scope>provided</scope>
<useProjectArtifact>false</useProjectArtifact>
- </dependencySet>
+ </dependencySet> -->
<dependencySet>
<outputDirectory>deploy-artifacts/lib</outputDirectory>
Modified: stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/pom.xml 2014-08-28 09:28:31 UTC (rev 18878)
+++ stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/pom.xml 2014-08-28 09:45:49 UTC (rev 18879)
@@ -821,9 +821,8 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.wildfly</groupId>
- <artifactId>wildfly-webservices-tests-integration</artifactId>
- <version>${jboss.version}</version>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-wildfly810-tests-integration</artifactId>
</dependency>
<!-- LittleProxy depencency declared in this profile as other profiles require different exclusions -->
<dependency>
@@ -887,6 +886,10 @@
<!-- # [JBWS-3620] Authentication failures w/ Undertow -->
<exclude>org/jboss/test/ws/jaxws/cxf/httpauth/HelloDigestTestCase*</exclude>
+ <!-- [JBWS-3686] Restore WSTrustActAsTestCase and WSTrustOnBehalfOfTestCase -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustActAsTestCase.*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustOnBehalfOfTestCase.*</exclude>
+
<!-- Manually setup KDC before run this test-->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude>
</excludes>
Modified: stack/cxf/branches/jbossws-cxf-4.3.x/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.x/pom.xml 2014-08-28 09:28:31 UTC (rev 18878)
+++ stack/cxf/branches/jbossws-cxf-4.3.x/pom.xml 2014-08-28 09:45:49 UTC (rev 18879)
@@ -62,14 +62,15 @@
<properties>
<jbossws.api.version>1.0.2.Final</jbossws.api.version>
<jbossws.spi.version>2.3.0.Final</jbossws.spi.version>
- <jbossws.common.version>2.3.0.Final</jbossws.common.version>
+ <jbossws.common.version>2.3.1-SNAPSHOT</jbossws.common.version>
<jbossws.common.tools.version>1.2.0.Final</jbossws.common.tools.version>
<jbossws.jboss720.version>4.3.0.Final</jbossws.jboss720.version>
<jbossws.wildfly800.version>4.3.0.Final</jbossws.wildfly800.version>
+ <jbossws.wildfly810.version>4.3.1-SNAPSHOT</jbossws.wildfly810.version>
<jbossws.native.version>4.2.0.Final</jbossws.native.version>
<jboss720.version>7.2.0.Final</jboss720.version>
<wildfly800.version>8.0.0.Final</wildfly800.version>
- <wildfly810.version>8.1.0.Final-SNAPSHOT</wildfly810.version>
+ <wildfly810.version>8.1.0.Final</wildfly810.version>
<ejb.api.version>1.0.2.Final</ejb.api.version>
<cxf.version>2.7.12</cxf.version>
<cxf.asm.version>3.3.1</cxf.asm.version>
@@ -160,11 +161,16 @@
<version>${jbossws.wildfly800.version}</version>
</dependency>
<dependency>
- <groupId>org.wildfly</groupId>
- <artifactId>wildfly-webservices-tests-integration</artifactId>
- <version>${wildfly810.version}</version>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-wildfly810-server-integration</artifactId>
+ <version>${jbossws.wildfly810.version}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-wildfly810-tests-integration</artifactId>
+ <version>${jbossws.wildfly810.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.ws.projects</groupId>
<artifactId>jaxws-jboss-httpserver-httpspi</artifactId>
<version>${jaxws-jboss-httpserver-httpspi.version}</version>
10 years, 4 months
JBossWS SVN: r18878 - in container/wildfly81/branches/jbossws-wildfly810-4.3.x: server-integration/src/main/java/org/jboss/as/webservices/deployers and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-08-28 05:28:31 -0400 (Thu, 28 Aug 2014)
New Revision: 18878
Added:
container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/deployers/WebContextAnnotationInfo.java
container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/deployers/WebContextAnnotationInformationFactory.java
Modified:
container/wildfly81/branches/jbossws-wildfly810-4.3.x/
container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSIntegrationProcessorJAXWS_POJO.java
container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/deployers/WebServiceAnnotationProcessor.java
container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/metadata/model/AbstractDeployment.java
container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/util/ASHelper.java
Log:
[JBWS-3809] svn merge -r 18858:18859 https://svn.jboss.org/repos/jbossws/container/wildfly81/branches/jbossws-... .
Property changes on: container/wildfly81/branches/jbossws-wildfly810-4.3.x
___________________________________________________________________
Modified: svn:mergeinfo
- /container/wildfly81/branches/jbossws-wildfly810:18650-18651
+ /container/wildfly81/branches/jbossws-wildfly810:18650-18651,18859
Modified: container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSIntegrationProcessorJAXWS_POJO.java
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSIntegrationProcessorJAXWS_POJO.java 2014-08-28 09:27:33 UTC (rev 18877)
+++ container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSIntegrationProcessorJAXWS_POJO.java 2014-08-28 09:28:31 UTC (rev 18878)
@@ -26,8 +26,10 @@
import static org.jboss.as.webservices.util.ASHelper.getEndpointName;
import static org.jboss.as.webservices.util.ASHelper.getJBossWebMetaData;
import static org.jboss.as.webservices.util.ASHelper.getJaxwsDeployment;
+import static org.jboss.as.webservices.util.ASHelper.getJBossWebserviceMetaDataPortComponent;
import static org.jboss.as.webservices.util.ASHelper.getRequiredAttachment;
import static org.jboss.as.webservices.util.ASHelper.isJaxwsEndpoint;
+import static org.jboss.as.webservices.util.ASHelper.getWebserviceMetadataEJBEndpoint;
import static org.jboss.as.webservices.util.WSAttachmentKeys.JMS_ENDPOINT_METADATA_KEY;
import static org.jboss.as.webservices.util.WebMetaDataHelper.getServlets;
@@ -49,6 +51,7 @@
import org.jboss.as.server.deployment.DeploymentUnit;
import org.jboss.as.server.deployment.DeploymentUnitProcessingException;
import org.jboss.as.server.deployment.annotation.CompositeIndex;
+import org.jboss.as.webservices.metadata.model.EJBEndpoint;
import org.jboss.as.webservices.metadata.model.JAXWSDeployment;
import org.jboss.as.webservices.metadata.model.POJOEndpoint;
import org.jboss.jandex.ClassInfo;
@@ -56,8 +59,10 @@
import org.jboss.metadata.web.spec.ServletMappingMetaData;
import org.jboss.metadata.web.spec.ServletMetaData;
import org.jboss.msc.service.ServiceName;
+import org.jboss.ws.api.annotation.WebContext;
import org.jboss.wsf.spi.metadata.jms.JMSEndpointMetaData;
import org.jboss.wsf.spi.metadata.jms.JMSEndpointsMetaData;
+import org.jboss.ws.common.utils.UrlPatternUtils;
/**
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
@@ -119,28 +124,62 @@
for (EEModuleClassDescription classDescription : classDescriptionMap.values()) {
ClassInfo classInfo = null;
String serviceName = null;
- final ClassAnnotationInformation<WebService, WebServiceAnnotationInfo> annotationInfo = classDescription
+ String urlPattern = null;
+
+ // #1 Override serviceName with the explicit urlPattern from port-component/port-component-uri in jboss-webservices.xml
+ EJBEndpoint ejbEndpoint = getWebserviceMetadataEJBEndpoint(jaxwsDeployment, classDescription.getClassName());
+ if (ejbEndpoint != null) {
+ urlPattern = UrlPatternUtils.getUrlPatternByPortComponentURI(
+ getJBossWebserviceMetaDataPortComponent(unit, ejbEndpoint.getName()));
+ }
+
+ // #2 Override serviceName with @WebContext.urlPattern
+ if (urlPattern == null) {
+ final ClassAnnotationInformation<WebContext, WebContextAnnotationInfo> annotationWebContext =
+ classDescription.getAnnotationInformation(WebContext.class);
+ if (annotationWebContext != null) {
+ WebContextAnnotationInfo wsInfo = annotationWebContext.getClassLevelAnnotations().get(0);
+ if (wsInfo != null && wsInfo.getUrlPattern().length() > 0) {
+ urlPattern = wsInfo.getUrlPattern();
+ }
+ }
+ }
+
+ // #3 use serviceName declared in a class annotation
+ if (urlPattern == null) {
+ final ClassAnnotationInformation<WebService, WebServiceAnnotationInfo> annotationInfo = classDescription
.getAnnotationInformation(WebService.class);
- if (annotationInfo != null) {
- WebServiceAnnotationInfo wsInfo = annotationInfo.getClassLevelAnnotations().get(0);
- serviceName = wsInfo.getServiceName();
- classInfo = (ClassInfo)wsInfo.getTarget();
+ if (annotationInfo != null) {
+ WebServiceAnnotationInfo wsInfo = annotationInfo.getClassLevelAnnotations().get(0);
+ serviceName = wsInfo.getServiceName();
+ classInfo = (ClassInfo)wsInfo.getTarget();
+
+ urlPattern = UrlPatternUtils.getUrlPattern(classInfo.name().local(), serviceName);
+ if (jaxwsDeployment.contains(urlPattern)){
+ urlPattern = UrlPatternUtils.getUrlPattern(classInfo.name().local(), serviceName, wsInfo.getName());
+ }
+ }
+
+ final ClassAnnotationInformation<WebServiceProvider, WebServiceProviderAnnotationInfo> annotationProviderInfo = classDescription
+ .getAnnotationInformation(WebServiceProvider.class);
+ if (annotationProviderInfo != null) {
+ WebServiceProviderAnnotationInfo wsInfo = annotationProviderInfo.getClassLevelAnnotations().get(0);
+ serviceName = wsInfo.getServiceName();
+ classInfo = (ClassInfo)wsInfo.getTarget();
+ }
}
- final ClassAnnotationInformation<WebServiceProvider, WebServiceProviderAnnotationInfo> annotationProviderInfo = classDescription
- .getAnnotationInformation(WebServiceProvider.class);
- if (annotationProviderInfo != null) {
- WebServiceProviderAnnotationInfo wsInfo = annotationProviderInfo.getClassLevelAnnotations().get(0);
- serviceName = wsInfo.getServiceName();
- classInfo = (ClassInfo)wsInfo.getTarget();
- }
+
if (classInfo != null) {
final String endpointClassName = classDescription.getClassName();
final ComponentDescription pojoComponent = createComponentDescription(unit, endpointClassName,
endpointClassName, endpointClassName);
final ServiceName pojoViewName = registerView(pojoComponent, endpointClassName);
+ if (urlPattern == null) {
+ urlPattern = UrlPatternUtils.getUrlPattern(classInfo.name().local(), serviceName);
+ }
// register POJO endpoint
- final String urlPattern = getUrlPattern(classInfo, serviceName);
- jaxwsDeployment.addEndpoint(new POJOEndpoint(endpointClassName, pojoViewName, urlPattern));
+ jaxwsDeployment.addEndpoint(new POJOEndpoint(endpointClassName,
+ pojoViewName, UrlPatternUtils.getUrlPattern(urlPattern)));
}
}
@@ -165,10 +204,6 @@
return false;
}
- private static String getUrlPattern(ClassInfo clazz, String serviceName) {
- return "/" + (!serviceName.equals("") ? serviceName : clazz.name().local());
- }
-
private static String getUrlPattern(final String servletName, final DeploymentUnit unit) {
final JBossWebMetaData jbossWebMD = getJBossWebMetaData(unit);
for (final ServletMappingMetaData servletMappingMD : jbossWebMD.getServletMappings()) {
Copied: container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/deployers/WebContextAnnotationInfo.java (from rev 18859, container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WebContextAnnotationInfo.java)
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/deployers/WebContextAnnotationInfo.java (rev 0)
+++ container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/deployers/WebContextAnnotationInfo.java 2014-08-28 09:28:31 UTC (rev 18878)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, 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.as.webservices.deployers;
+
+/**
+ * User: rsearls
+ * Date: 7/17/14
+ */
+public class WebContextAnnotationInfo {
+ private final String authMethod;
+ private final String contextRoot;
+ private final boolean secureWSDLAccess;
+ private final String transportGuarantee;
+ private final String urlPattern;
+ private final String virtualHost;
+
+ public WebContextAnnotationInfo(final String authMethod, final String contextRoot, final boolean secureWSDLAccess, final String transportGuarantee, final String urlPattern, final String virtualHost) {
+
+ this.authMethod = authMethod;
+ this.contextRoot = contextRoot;
+ this.secureWSDLAccess = secureWSDLAccess;
+ this.transportGuarantee = transportGuarantee;
+ this.urlPattern = urlPattern;
+ this.virtualHost = virtualHost;
+
+ }
+
+ public String getAuthMethod() {
+ return authMethod;
+ }
+
+ public String getContextRoot() {
+ return contextRoot;
+ }
+
+ public boolean isSecureWSDLAccess() {
+ return secureWSDLAccess;
+ }
+
+ public String getTransportGuarantee() {
+ return transportGuarantee;
+ }
+
+ public String getUrlPattern() {
+ return urlPattern;
+ }
+
+ public String getVirtualHost() {
+ return virtualHost;
+ }
+
+}
Copied: container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/deployers/WebContextAnnotationInformationFactory.java (from rev 18859, container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WebContextAnnotationInformationFactory.java)
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/deployers/WebContextAnnotationInformationFactory.java (rev 0)
+++ container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/deployers/WebContextAnnotationInformationFactory.java 2014-08-28 09:28:31 UTC (rev 18878)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2014, Red Hat Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.as.webservices.deployers;
+
+import org.jboss.ws.api.annotation.WebContext;
+
+import org.jboss.as.ee.metadata.ClassAnnotationInformationFactory;
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationValue;
+import org.jboss.metadata.property.PropertyReplacer;
+
+/**
+ * User: rsearls
+ * Date: 7/17/14
+ */
+public class WebContextAnnotationInformationFactory extends
+ ClassAnnotationInformationFactory<WebContext, WebContextAnnotationInfo> {
+
+ protected WebContextAnnotationInformationFactory() {
+ super(org.jboss.ws.api.annotation.WebContext.class, null);
+ }
+
+ @Override
+ protected WebContextAnnotationInfo fromAnnotation(final AnnotationInstance annotationInstance, final boolean replacement) {
+ String authMethodValue = asString(annotationInstance, "authMethod");
+ String contextRootValue = asString(annotationInstance, "contextRoot");
+ boolean secureWSDLAccessValue = asBoolean(annotationInstance, "secureWSDLAccessValue");
+ String transportGuaranteeValue = asString(annotationInstance, "transportGuarantee");
+ String urlPatternValue = asString(annotationInstance, "urlPattern");
+ String virtualHostValue = asString(annotationInstance, "virtualHost");
+ return new WebContextAnnotationInfo(authMethodValue, contextRootValue,
+ secureWSDLAccessValue, transportGuaranteeValue, urlPatternValue, virtualHostValue);
+ }
+
+ private String asString(final AnnotationInstance annotation, String property) {
+ AnnotationValue value = annotation.value(property);
+ return value == null ? "" : value.asString();
+ }
+
+ private boolean asBoolean(final AnnotationInstance annotation, String property) {
+ AnnotationValue value = annotation.value(property);
+ return value == null ? false : Boolean.getBoolean(value.asString());
+ }
+}
Modified: container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/deployers/WebServiceAnnotationProcessor.java
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/deployers/WebServiceAnnotationProcessor.java 2014-08-28 09:27:33 UTC (rev 18877)
+++ container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/deployers/WebServiceAnnotationProcessor.java 2014-08-28 09:28:31 UTC (rev 18878)
@@ -36,6 +36,8 @@
import org.jboss.as.server.deployment.DeploymentUnitProcessingException;
import org.jboss.as.server.deployment.DeploymentUnitProcessor;
import org.jboss.as.server.deployment.annotation.CompositeIndex;
+import org.jboss.metadata.property.PropertyReplacers;
+
/**
* @author <a href="mailto:ema@redhat.com">Jim Ma</a>
*/
@@ -48,6 +50,7 @@
List<ClassAnnotationInformationFactory> factories = new ArrayList<ClassAnnotationInformationFactory>();
factories.add(new WebServiceAnnotationInformationFactory());
factories.add(new WebServiceProviderAnnotationInformationFactory());
+ factories.add(new WebContextAnnotationInformationFactory());
this.factories = Collections.unmodifiableList(factories);
}
@@ -56,12 +59,13 @@
final EEModuleDescription eeModuleDescription = deploymentUnit.getAttachment(Attachments.EE_MODULE_DESCRIPTION);
final CompositeIndex index = deploymentUnit.getAttachment(org.jboss.as.server.deployment.Attachments.COMPOSITE_ANNOTATION_INDEX);
+ final Boolean replacement = deploymentUnit.getAttachment(org.jboss.as.ee.structure.Attachments.ANNOTATION_PROPERTY_REPLACEMENT);
if (index == null || eeModuleDescription == null) {
return;
}
for (final ClassAnnotationInformationFactory factory : factories) {
- final Map<String, ClassAnnotationInformation<?, ?>> data = factory.createAnnotationInformation(index, false);
+ final Map<String, ClassAnnotationInformation<?, ?>> data = factory.createAnnotationInformation(index, replacement);
for (Map.Entry<String, ClassAnnotationInformation<?, ?>> entry : data.entrySet()) {
EEModuleClassDescription clazz = eeModuleDescription.addOrGetLocalClassDescription(entry.getKey());
clazz.addAnnotationInformation(entry.getValue());
Modified: container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/metadata/model/AbstractDeployment.java
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/metadata/model/AbstractDeployment.java 2014-08-28 09:27:33 UTC (rev 18877)
+++ container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/metadata/model/AbstractDeployment.java 2014-08-28 09:28:31 UTC (rev 18878)
@@ -64,4 +64,7 @@
}
}
+ public boolean contains(String urlPattern) {
+ return urlPatternToClassMapping.keySet().contains((urlPattern));
+ }
}
Modified: container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/util/ASHelper.java
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/util/ASHelper.java 2014-08-28 09:27:33 UTC (rev 18877)
+++ container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/util/ASHelper.java 2014-08-28 09:28:31 UTC (rev 18878)
@@ -28,6 +28,7 @@
import static org.jboss.as.webservices.util.DotNames.WEB_SERVICE_ANNOTATION;
import static org.jboss.as.webservices.util.DotNames.WEB_SERVICE_PROVIDER_ANNOTATION;
import static org.jboss.as.webservices.util.WSAttachmentKeys.JAXWS_ENDPOINTS_KEY;
+import static org.jboss.as.webservices.util.WSAttachmentKeys.JBOSS_WEBSERVICES_METADATA_KEY;
import java.lang.reflect.Modifier;
import java.util.Collections;
@@ -68,6 +69,8 @@
import org.jboss.msc.service.ServiceName;
import org.jboss.ws.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.metadata.webservices.JBossPortComponentMetaData;
+import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
/**
* JBoss AS integration helper class.
@@ -297,6 +300,51 @@
}
/**
+ * Return a named port-component from the jboss-webservices.xml
+ * @param unit
+ * @param name
+ * @return
+ */
+ public static JBossPortComponentMetaData getJBossWebserviceMetaDataPortComponent(
+ final DeploymentUnit unit, final String name) {
+
+ if (name != null) {
+ final JBossWebservicesMetaData jbossWebserviceMetaData = unit.getAttachment(JBOSS_WEBSERVICES_METADATA_KEY);
+
+ if (jbossWebserviceMetaData != null) {
+ JBossPortComponentMetaData[] portComponent = jbossWebserviceMetaData.getPortComponents();
+
+ if (portComponent != null) {
+ for (JBossPortComponentMetaData component : portComponent) {
+ if (name.equals(component.getEjbName())) {
+ return component;
+ }
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Returns an EJBEndpoint based upon fully qualified classname.
+ * @param jaxwsDeployment
+ * @param className
+ * @return
+ */
+ public static EJBEndpoint getWebserviceMetadataEJBEndpoint(final JAXWSDeployment jaxwsDeployment,
+ final String className) {
+
+ java.util.List<EJBEndpoint> ejbEndpointList = jaxwsDeployment.getEjbEndpoints();
+ for (EJBEndpoint ejbEndpoint : ejbEndpointList) {
+ if (className.equals(ejbEndpoint.getClassName())) {
+ return ejbEndpoint;
+ }
+ }
+ return null;
+ }
+
+ /**
* Returns context root associated with webservice deployment.
*
* If there's application.xml descriptor provided defining nested web module, then context root defined there will be
10 years, 4 months
JBossWS SVN: r18877 - container/wildfly81/branches/jbossws-wildfly810-4.3.x.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-08-28 05:27:33 -0400 (Thu, 28 Aug 2014)
New Revision: 18877
Modified:
container/wildfly81/branches/jbossws-wildfly810-4.3.x/pom.xml
Log:
Use correct jbossws-common
Modified: container/wildfly81/branches/jbossws-wildfly810-4.3.x/pom.xml
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810-4.3.x/pom.xml 2014-08-28 09:26:25 UTC (rev 18876)
+++ container/wildfly81/branches/jbossws-wildfly810-4.3.x/pom.xml 2014-08-28 09:27:33 UTC (rev 18877)
@@ -52,7 +52,7 @@
<properties>
<jbossws.api.version>1.0.2.Final</jbossws.api.version>
<jbossws.spi.version>2.3.0.Final</jbossws.spi.version>
- <jbossws.common.version>2.3.0.Final</jbossws.common.version>
+ <jbossws.common.version>2.3.1-SNAPSHOT</jbossws.common.version>
<jboss.msc.version>1.2.2.Final</jboss.msc.version>
<wildfly.version>8.1.0.Final</wildfly.version>
<wildfly.security-manager.version>1.0.0.Final</wildfly.security-manager.version>
10 years, 4 months
JBossWS SVN: r18876 - in common/branches/jbossws-common-2.3.x: src/main/java/org/jboss/ws/common/deployment and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-08-28 05:26:25 -0400 (Thu, 28 Aug 2014)
New Revision: 18876
Added:
common/branches/jbossws-common-2.3.x/src/main/java/org/jboss/ws/common/utils/UrlPatternUtils.java
Modified:
common/branches/jbossws-common-2.3.x/
common/branches/jbossws-common-2.3.x/src/main/java/org/jboss/ws/common/deployment/URLPatternDeploymentAspect.java
Log:
[JBWS-3809] svn merge -r 18807:18808 https://svn.jboss.org/repos/jbossws/common/trunk .
Property changes on: common/branches/jbossws-common-2.3.x
___________________________________________________________________
Modified: svn:mergeinfo
- /common/branches/asoldano:14028-14056
/common/branches/ropalka:16964-17003
/common/branches/ropalka_JBWS-3550:16756
+ /common/branches/asoldano:14028-14056
/common/branches/ropalka:16964-17003
/common/branches/ropalka_JBWS-3550:16756
/common/trunk:18808
Modified: common/branches/jbossws-common-2.3.x/src/main/java/org/jboss/ws/common/deployment/URLPatternDeploymentAspect.java
===================================================================
--- common/branches/jbossws-common-2.3.x/src/main/java/org/jboss/ws/common/deployment/URLPatternDeploymentAspect.java 2014-08-28 09:12:21 UTC (rev 18875)
+++ common/branches/jbossws-common-2.3.x/src/main/java/org/jboss/ws/common/deployment/URLPatternDeploymentAspect.java 2014-08-28 09:26:25 UTC (rev 18876)
@@ -24,13 +24,9 @@
import static org.jboss.ws.common.integration.WSHelper.isEjbEndpoint;
import static org.jboss.ws.common.integration.WSHelper.isJseEndpoint;
-import java.util.StringTokenizer;
-
-import javax.jws.WebService;
-
-import org.jboss.ws.api.annotation.WebContext;
import org.jboss.ws.common.Messages;
import org.jboss.ws.common.integration.AbstractDeploymentAspect;
+import org.jboss.ws.common.utils.UrlPatternUtils;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.HttpEndpoint;
@@ -58,14 +54,11 @@
if (urlPattern == null)
{
urlPattern = getExplicitPattern(dep, ep);
- if (urlPattern == null)
+ if (urlPattern == null) {
urlPattern = ep.getShortName();
-
+ }
// Always prefix with '/'
- if (urlPattern.startsWith("/") == false)
- urlPattern = "/" + urlPattern;
-
- httpEp.setURLPattern(urlPattern);
+ httpEp.setURLPattern(UrlPatternUtils.getUrlPattern(urlPattern));
}
}
}
@@ -90,64 +83,30 @@
if (appMetaData != null && appMetaData.getBeanByEjbName(ep.getShortName()) != null && isEjbEndpoint(ep))
{
EJBMetaData bmd = appMetaData.getBeanByEjbName(ep.getShortName());
- urlPattern = bmd.getPortComponentURI();
- if (urlPattern != null)
- {
- String contextRoot = dep.getService().getContextRoot();
-
- if (urlPattern.startsWith("/") == false)
- urlPattern = "/" + urlPattern;
-
- StringTokenizer st = new StringTokenizer(urlPattern, "/");
- if (st.countTokens() > 1 && urlPattern.startsWith(contextRoot + "/"))
- {
- urlPattern = urlPattern.substring(contextRoot.length());
- }
- }
+ urlPattern = UrlPatternUtils.getUrlPatternByPortComponentURI(bmd.getPortComponentURI(),
+ dep.getService().getContextRoot());
}
// #3 For EJB use @WebContext.urlPattern
if (urlPattern == null)
{
- Class<?> beanClass = ep.getTargetBeanClass();
- WebContext anWebContext = (WebContext)beanClass.getAnnotation(WebContext.class);
- if (anWebContext != null && anWebContext.urlPattern().length() > 0)
- {
- urlPattern = anWebContext.urlPattern();
- }
-
+ urlPattern = UrlPatternUtils.getUrlPatternByWebContext(ep.getTargetBeanClass());
}
// #4 Use @WebService
if (urlPattern == null)
{
- Class<?> beanClass = ep.getTargetBeanClass();
- WebService webServiceAnnotation = (WebService)beanClass.getAnnotation(WebService.class);
- if (webServiceAnnotation != null)
- {
- String name = webServiceAnnotation.name();
- urlPattern = !isEmpty(name) ? name : beanClass.getSimpleName();
- String serviceName = webServiceAnnotation.serviceName();
- if (!isEmpty(serviceName))
- {
- urlPattern = serviceName + "/" + urlPattern;
- }
- }
+ urlPattern = UrlPatternUtils.getUrlPatternByWebService(ep.getTargetBeanClass());
}
// TODO: WebServiceProvider ???
// #5 Use simple class name
if (urlPattern == null)
{
- Class<?> beanClass = ep.getTargetBeanClass();
- urlPattern = beanClass.getSimpleName();
+ urlPattern = UrlPatternUtils.getUrlPatternByClassname(ep.getTargetBeanClass());
}
return urlPattern;
}
- private static boolean isEmpty(final String s) {
- return s == null || s.length() == 0;
- }
-
}
Copied: common/branches/jbossws-common-2.3.x/src/main/java/org/jboss/ws/common/utils/UrlPatternUtils.java (from rev 18808, common/trunk/src/main/java/org/jboss/ws/common/utils/UrlPatternUtils.java)
===================================================================
--- common/branches/jbossws-common-2.3.x/src/main/java/org/jboss/ws/common/utils/UrlPatternUtils.java (rev 0)
+++ common/branches/jbossws-common-2.3.x/src/main/java/org/jboss/ws/common/utils/UrlPatternUtils.java 2014-08-28 09:26:25 UTC (rev 18876)
@@ -0,0 +1,108 @@
+package org.jboss.ws.common.utils;
+
+import org.jboss.ws.api.annotation.WebContext;
+import org.jboss.wsf.spi.metadata.webservices.JBossPortComponentMetaData;
+
+import javax.jws.WebService;
+import java.util.StringTokenizer;
+
+/**
+ * Shared rules for ws endpoint urlPattern generation,
+ * also a single point for the rules.
+ *
+ * User: rsearls
+ * Date: 7/21/14
+ */
+public class UrlPatternUtils {
+
+ public static String getUrlPatternByClassname(Class<?> beanClass){
+ return beanClass.getSimpleName();
+ }
+
+
+ public static String getUrlPatternByWebServiceProvider(Class<?> beanClass){
+ return null;
+ }
+
+
+ public static String getUrlPatternByWebService(Class<?> beanClass){
+ String urlPattern = null;
+ WebService webServiceAnnotation = (WebService)beanClass.getAnnotation(WebService.class);
+ if (webServiceAnnotation != null)
+ {
+ String name = webServiceAnnotation.name();
+ urlPattern = !isEmpty(name) ? name : beanClass.getSimpleName();
+ String serviceName = webServiceAnnotation.serviceName();
+ if (!isEmpty(serviceName))
+ {
+ urlPattern = serviceName + "/" + urlPattern;
+ }
+ }
+ return urlPattern;
+ }
+
+
+ public static String getUrlPatternByWebContext(Class<?> beanClass){
+ WebContext anWebContext = (WebContext)beanClass.getAnnotation(WebContext.class);
+ if (anWebContext != null && anWebContext.urlPattern().length() > 0)
+ {
+ return anWebContext.urlPattern();
+ }
+ return null;
+ }
+
+ public static String getUrlPatternByPortComponentURI (String urlPattern, String contextRoot) {
+
+ if (urlPattern != null)
+ {
+ urlPattern = getUrlPattern(urlPattern);
+
+ if (contextRoot != null) {
+ StringTokenizer st = new StringTokenizer(urlPattern, "/");
+ if (st.countTokens() > 1 && urlPattern.startsWith(contextRoot + "/")) {
+ urlPattern = urlPattern.substring(contextRoot.length());
+ }
+ }
+ }
+ return urlPattern;
+ }
+
+
+ public static String getUrlPatternByPortComponentURI (JBossPortComponentMetaData portComponent) {
+ String urlPattern = null;
+ if (portComponent != null) {
+ String portComponentURI = portComponent.getPortComponentURI();
+ if (portComponentURI != null && portComponentURI.length() > 0) {
+ urlPattern = portComponentURI;
+ }
+ }
+ return urlPattern;
+ }
+
+
+ public static String getUrlPattern(String classBasename, String serviceName, String name) {
+ String urlPattern = !isEmpty(name) ? name : classBasename;
+ if (!isEmpty(serviceName)) {
+ urlPattern = serviceName + "/" + urlPattern;
+ }
+ return urlPattern;
+ }
+
+
+ public static String getUrlPattern(String classBasename, String serviceName) {
+ return "/" + (!serviceName.equals("") ? serviceName : classBasename);
+ }
+
+
+ public static String getUrlPattern(String urlPattern) {
+ if (urlPattern.startsWith("/") == false)
+ urlPattern = "/" + urlPattern;
+
+ return urlPattern;
+ }
+
+ private static boolean isEmpty(final String s) {
+ return s == null || s.length() == 0;
+ }
+
+}
10 years, 4 months
JBossWS SVN: r18875 - in container/wildfly81/branches/jbossws-wildfly810-4.3.x: server-integration and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-08-28 05:12:21 -0400 (Thu, 28 Aug 2014)
New Revision: 18875
Modified:
container/wildfly81/branches/jbossws-wildfly810-4.3.x/
container/wildfly81/branches/jbossws-wildfly810-4.3.x/pom.xml
container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/
container/wildfly81/branches/jbossws-wildfly810-4.3.x/tests-integration/
Log:
svn merge -r 18649:18651 https://svn.jboss.org/repos/jbossws/container/wildfly81/branches/jbossws-... .
Property changes on: container/wildfly81/branches/jbossws-wildfly810-4.3.x
___________________________________________________________________
Added: svn:ignore
+ .project
.classpath
.settings
Added: svn:mergeinfo
+ /container/wildfly81/branches/jbossws-wildfly810:18650-18651
Modified: container/wildfly81/branches/jbossws-wildfly810-4.3.x/pom.xml
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810-4.3.x/pom.xml 2014-08-28 09:09:43 UTC (rev 18874)
+++ container/wildfly81/branches/jbossws-wildfly810-4.3.x/pom.xml 2014-08-28 09:12:21 UTC (rev 18875)
@@ -53,25 +53,25 @@
<jbossws.api.version>1.0.2.Final</jbossws.api.version>
<jbossws.spi.version>2.3.0.Final</jbossws.spi.version>
<jbossws.common.version>2.3.0.Final</jbossws.common.version>
- <jboss.msc.version>1.2.0.Final</jboss.msc.version>
+ <jboss.msc.version>1.2.2.Final</jboss.msc.version>
<wildfly.version>8.1.0.Final</wildfly.version>
<wildfly.security-manager.version>1.0.0.Final</wildfly.security-manager.version>
- <marshalling.river.version>1.4.3.Final</marshalling.river.version>
- <remote.naming.version>2.0.0.Final</remote.naming.version>
+ <marshalling.river.version>1.4.5.Final</marshalling.river.version>
+ <remote.naming.version>2.0.1.Final</remote.naming.version>
<javax.mail.version>1.5.1</javax.mail.version>
- <ejb.client.version>2.0.0.Final</ejb.client.version>
+ <ejb.client.version>2.0.1.Final</ejb.client.version>
<ejb3.ext.api.version>2.1.0</ejb3.ext.api.version>
<jboss.common.core.version>2.2.22.GA</jboss.common.core.version>
<javassist.version>3.18.1-GA</javassist.version>
<xerces.version>2.9.1-jbossas-2</xerces.version>
- <remoting.version>4.0.0.Final</remoting.version>
+ <remoting.version>4.0.3.Final</remoting.version>
<remoting.jmx.version>2.0.0.Final</remoting.jmx.version>
<jbossxb.version>2.0.3.GA</jbossxb.version>
<hornetq.version>2.4.1.Final</hornetq.version>
- <xnio.version>3.2.0.Final</xnio.version>
+ <xnio.version>3.2.2.Final</xnio.version>
<jboss.jaxws.api.version>2.0.2.Final</jboss.jaxws.api.version>
<jboss.logging.tools.version>1.2.0.Final</jboss.logging.tools.version>
- <junit.version>4.10</junit.version>
+ <junit.version>4.11</junit.version>
</properties>
<dependencyManagement>
Property changes on: container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration
___________________________________________________________________
Added: svn:ignore
+ target
.settings
.project
.classpath
Property changes on: container/wildfly81/branches/jbossws-wildfly810-4.3.x/tests-integration
___________________________________________________________________
Added: svn:ignore
+ target
.settings
.project
.classpath
10 years, 4 months
JBossWS SVN: r18874 - in container/wildfly81/branches/jbossws-wildfly810-4.3.x: server-integration and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-08-28 05:09:43 -0400 (Thu, 28 Aug 2014)
New Revision: 18874
Modified:
container/wildfly81/branches/jbossws-wildfly810-4.3.x/pom.xml
container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/pom.xml
container/wildfly81/branches/jbossws-wildfly810-4.3.x/tests-integration/pom.xml
Log:
Fixing versions
Modified: container/wildfly81/branches/jbossws-wildfly810-4.3.x/pom.xml
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810-4.3.x/pom.xml 2014-08-28 08:56:26 UTC (rev 18873)
+++ container/wildfly81/branches/jbossws-wildfly810-4.3.x/pom.xml 2014-08-28 09:09:43 UTC (rev 18874)
@@ -35,7 +35,7 @@
<description>JBossWS WildFly 8.1.0.Final Integration Parent</description>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-wildfly810-parent</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>4.3.1-SNAPSHOT</version>
<packaging>pom</packaging>
<scm>
@@ -51,10 +51,10 @@
<properties>
<jbossws.api.version>1.0.2.Final</jbossws.api.version>
- <jbossws.spi.version>3.0.0-SNAPSHOT</jbossws.spi.version>
+ <jbossws.spi.version>2.3.0.Final</jbossws.spi.version>
<jbossws.common.version>2.3.0.Final</jbossws.common.version>
<jboss.msc.version>1.2.0.Final</jboss.msc.version>
- <wildfly.version>8.1.0.CR2</wildfly.version>
+ <wildfly.version>8.1.0.Final</wildfly.version>
<wildfly.security-manager.version>1.0.0.Final</wildfly.security-manager.version>
<marshalling.river.version>1.4.3.Final</marshalling.river.version>
<remote.naming.version>2.0.0.Final</remote.naming.version>
Modified: container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/pom.xml
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/pom.xml 2014-08-28 08:56:26 UTC (rev 18873)
+++ container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/pom.xml 2014-08-28 09:09:43 UTC (rev 18874)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-wildfly810-parent</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>4.3.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: container/wildfly81/branches/jbossws-wildfly810-4.3.x/tests-integration/pom.xml
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810-4.3.x/tests-integration/pom.xml 2014-08-28 08:56:26 UTC (rev 18873)
+++ container/wildfly81/branches/jbossws-wildfly810-4.3.x/tests-integration/pom.xml 2014-08-28 09:09:43 UTC (rev 18874)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-wildfly810-parent</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>4.3.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
10 years, 4 months
JBossWS SVN: r18873 - container/wildfly81/branches.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-08-28 04:56:26 -0400 (Thu, 28 Aug 2014)
New Revision: 18873
Added:
container/wildfly81/branches/jbossws-wildfly810-4.3.x/
Log:
Creating initial wildfly81 integration layer for JBossWS 4.3.x branch (copying from rev 18648)
10 years, 4 months