JBossWS SVN: r12920 - in container/jboss60/branches/jbossws-jboss600M4/src/main: resources/jbossws-jboss.deployer/META-INF and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-09-07 11:55:54 -0400 (Tue, 07 Sep 2010)
New Revision: 12920
Modified:
container/jboss60/branches/jbossws-jboss600M4/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java
container/jboss60/branches/jbossws-jboss600M4/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml
Log:
[JBWS-3121] Prevent usage of EJB3.1 beans not linked to a ws endpoint when doing injections and register endpoints only after having computed their address
Modified: container/jboss60/branches/jbossws-jboss600M4/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java
===================================================================
--- container/jboss60/branches/jbossws-jboss600M4/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java 2010-09-07 10:44:38 UTC (rev 12919)
+++ container/jboss60/branches/jbossws-jboss600M4/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java 2010-09-07 15:55:54 UTC (rev 12920)
@@ -45,6 +45,7 @@
import org.jboss.wsf.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.Service;
import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
import org.jboss.wsf.spi.metadata.injection.InjectionMetaData;
@@ -131,20 +132,20 @@
this.log.debug("Building injection meta data for JAXWS EJB3 webservice deployment: " + dep.getSimpleName());
final WebServiceDeployment webServiceDeployment = ASHelper.getRequiredAttachment(unit,
WebServiceDeployment.class);
+ final Service service = dep.getService();
// iterate through all EJB3 endpoints
for (final WebServiceDeclaration container : webServiceDeployment.getServiceEndpoints())
{
- if (ASHelper.isWebServiceBean(container))
+ final String ejbName = container.getComponentName();
+ final Endpoint endpoint = service.getEndpointByName(ejbName);
+ if (endpoint != null && ASHelper.isWebServiceBean(container))
{
- final String ejbName = container.getComponentName();
-
// build EJB 3 injections meta data
final EnvironmentEntriesMetaData ejbEnvEntries = this.getEnvironmentEntries(ejbName, unit);
final InjectionsMetaData injectionsMD = this.buildInjectionsMetaData(ejbEnvEntries, resolvers);
// associate injections meta data with EJB 3 endpoint
- final Endpoint endpoint = dep.getService().getEndpointByName(ejbName);
endpoint.addAttachment(InjectionsMetaData.class, injectionsMD);
}
}
Modified: container/jboss60/branches/jbossws-jboss600M4/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml
===================================================================
--- container/jboss60/branches/jbossws-jboss600M4/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml 2010-09-07 10:44:38 UTC (rev 12919)
+++ container/jboss60/branches/jbossws-jboss600M4/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml 2010-09-07 15:55:54 UTC (rev 12920)
@@ -120,7 +120,7 @@
</bean>
<bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRegistryDeploymentAspect">
- <property name="requires">EndpointName</property>
+ <property name="requires">EndpointName, EndpointAddress</property>
<property name="provides">RegisteredEndpoint</property>
</bean>
14 years, 6 months
JBossWS SVN: r12919 - stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/epr.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-09-07 06:44:38 -0400 (Tue, 07 Sep 2010)
New Revision: 12919
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/epr/NativeEndpointReferenceTestCase.java
Log:
[JBWS-3119] fixing EndpointName WSA EPR serialization
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/epr/NativeEndpointReferenceTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/epr/NativeEndpointReferenceTestCase.java 2010-09-07 09:45:37 UTC (rev 12918)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/epr/NativeEndpointReferenceTestCase.java 2010-09-07 10:44:38 UTC (rev 12919)
@@ -59,7 +59,7 @@
" <ns2:param2 wsa:IsReferenceParameter='true' xmlns:ns2='http://helloservice.org/param2' xmlns:wsa='http://www.w3.org/2005/08/addressing'>World</ns2:param2>" +
" </ReferenceParameters>" +
" <Metadata wsdli:wsdlLocation='http://helloservice.org/wsdl http://localhost:8080/hello?wsdl' xmlns:wsdli='http://www.w3.org/ns/wsdl-instance'>" +
- " <wsam:ServiceName EndpointName='myns:HelloPort' xmlns:myns='http://helloservice.org/wsdl' xmlns:wsam='http://www.w3.org/2007/05/addressing/metadata'>myns:HelloService</wsam:ServiceName>" +
+ " <wsam:ServiceName EndpointName='HelloPort' xmlns:myns='http://helloservice.org/wsdl' xmlns:wsam='http://www.w3.org/2007/05/addressing/metadata'>myns:HelloService</wsam:ServiceName>" +
" <wsam:InterfaceName xmlns:myns='http://helloservice.org/wsdl' xmlns:wsam='http://www.w3.org/2007/05/addressing/metadata'>myns:Hello</wsam:InterfaceName>" +
" </Metadata>" +
"</EndpointReference>";
@@ -102,7 +102,7 @@
assertEquals("wrong text content in ServiceName element", "myns:HelloService", DOMUtils.getTextContent(serviceNameElement));
String endpointNameValue = DOMUtils.getAttributeValue(serviceNameElement, "EndpointName");
assertNotNull("cannot find endpointName attribute value", endpointNameValue);
- assertEquals("wrong endpointName attribute value", endpointNameValue, "myns:HelloPort");
+ assertEquals("wrong endpointName attribute value", endpointNameValue, "HelloPort");
Element interfaceNameElement = (Element)DOMUtils.getFirstChildElement(metadataElement, WSAM_INTERFACE_QNAME);
assertNamespaces(interfaceNameElement);
assertEquals("wrong text content in InterfaceName element", "myns:Hello", DOMUtils.getTextContent(interfaceNameElement));
14 years, 6 months
JBossWS SVN: r12918 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: sergeyb
Date: 2010-09-07 05:45:37 -0400 (Tue, 07 Sep 2010)
New Revision: 12918
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
Log:
[JBWS-2945] Disabling JBWS2942 on AS trunk
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-09-07 09:37:25 UTC (rev 12917)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-09-07 09:45:37 UTC (rev 12918)
@@ -30,7 +30,7 @@
org/jboss/test/ws/jaxws/jbws1797/**
# [JBWS-2945] JAX-WS 2.2 implementation not yet available for CXF stack
-#org/jboss/test/ws/jaxws/jbws2942/**
+org/jboss/test/ws/jaxws/jbws2942/**
org/jboss/test/ws/jaxws/jbws3031/**
org/jboss/test/ws/jaxws/samples/addressing/AddressingStatefulTestCase.*
14 years, 6 months
JBossWS SVN: r12917 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: sergeyb
Date: 2010-09-07 05:37:25 -0400 (Tue, 07 Sep 2010)
New Revision: 12917
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
Log:
[JBWS-2945] Disabling JBWS2937 and EndpointReferenceBuilder test cases on AS 5.x
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-09-07 09:16:36 UTC (rev 12916)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-09-07 09:37:25 UTC (rev 12917)
@@ -31,7 +31,9 @@
# [JBWS-2917] We're using buggy xalan version causing namespaces issues
org/jboss/test/ws/jaxws/jbws2917/**
+org/jboss/test/ws/jaxws/jbws2937/**
org/jboss/test/ws/jaxws/jbws2942/**
+org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.*
# [JBWS-2895] JAX-RPC available from AS 6.0.0.M3
org/jboss/test/ws/jaxrpc/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-09-07 09:16:36 UTC (rev 12916)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-09-07 09:37:25 UTC (rev 12917)
@@ -31,7 +31,9 @@
# [JBWS-2917] We're using buggy xalan version causing namespaces issues
org/jboss/test/ws/jaxws/jbws2917/**
+org/jboss/test/ws/jaxws/jbws2937/**
org/jboss/test/ws/jaxws/jbws2942/**
+org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.*
# [JBWS-2895] JAX-RPC available from AS 6.0.0.M3
org/jboss/test/ws/jaxrpc/**
14 years, 6 months
JBossWS SVN: r12916 - stack/cxf/trunk/modules/addons/transports/http/httpserver.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-09-07 05:16:36 -0400 (Tue, 07 Sep 2010)
New Revision: 12916
Modified:
stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml
Log:
workaround
Modified: stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml
===================================================================
--- stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml 2010-09-07 08:08:07 UTC (rev 12915)
+++ stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml 2010-09-07 09:16:36 UTC (rev 12916)
@@ -87,4 +87,15 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <failIfNoTests>false</failIfNoTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
14 years, 6 months
JBossWS SVN: r12915 - maven/parent/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-09-07 04:08:07 -0400 (Tue, 07 Sep 2010)
New Revision: 12915
Modified:
maven/parent/trunk/pom.xml
Log:
[JBWS-2957] Maven 2.0.11 is actually enough
Modified: maven/parent/trunk/pom.xml
===================================================================
--- maven/parent/trunk/pom.xml 2010-09-06 15:53:59 UTC (rev 12914)
+++ maven/parent/trunk/pom.xml 2010-09-07 08:08:07 UTC (rev 12915)
@@ -195,7 +195,7 @@
<configuration>
<rules>
<requireMavenVersion>
- <version>2.1.0</version>
+ <version>2.0.11</version>
</requireMavenVersion>
<requireJavaVersion>
<version>1.6</version>
14 years, 6 months
JBossWS SVN: r12914 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-09-06 11:53:59 -0400 (Mon, 06 Sep 2010)
New Revision: 12914
Modified:
stack/native/trunk/pom.xml
Log:
Using latest parent
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2010-09-06 15:53:12 UTC (rev 12913)
+++ stack/native/trunk/pom.xml 2010-09-06 15:53:59 UTC (rev 12914)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-parent</artifactId>
- <version>1.0.8.GA</version>
+ <version>1.0.9-SNAPSHOT</version>
</parent>
<!-- Source Control Management -->
14 years, 6 months
JBossWS SVN: r12913 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-09-06 11:53:12 -0400 (Mon, 06 Sep 2010)
New Revision: 12913
Modified:
stack/cxf/trunk/pom.xml
Log:
Use latest parent
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2010-09-06 15:51:32 UTC (rev 12912)
+++ stack/cxf/trunk/pom.xml 2010-09-06 15:53:12 UTC (rev 12913)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-parent</artifactId>
- <version>1.0.8.GA</version>
+ <version>1.0.9-SNAPSHOT</version>
</parent>
<!-- Source Control Management -->
14 years, 6 months
JBossWS SVN: r12912 - maven/parent/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-09-06 11:51:32 -0400 (Mon, 06 Sep 2010)
New Revision: 12912
Modified:
maven/parent/trunk/pom.xml
Log:
[JBWS-2957] Update enforces plugin to require at least Maven 2.1.0 as that's what comes with a maven antrun plugin having Ant 1.7.x or greater (and currently Maven does not support version ranges for plugins...)
Modified: maven/parent/trunk/pom.xml
===================================================================
--- maven/parent/trunk/pom.xml 2010-09-06 15:12:42 UTC (rev 12911)
+++ maven/parent/trunk/pom.xml 2010-09-06 15:51:32 UTC (rev 12912)
@@ -195,7 +195,7 @@
<configuration>
<rules>
<requireMavenVersion>
- <version>2.0.9</version>
+ <version>2.1.0</version>
</requireMavenVersion>
<requireJavaVersion>
<version>1.6</version>
14 years, 6 months
JBossWS SVN: r12911 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: sergeyb
Date: 2010-09-06 11:12:42 -0400 (Mon, 06 Sep 2010)
New Revision: 12911
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
Log:
[JBWS-2945] : Enabling JBWS3022TestCase
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-09-06 15:04:44 UTC (rev 12910)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-09-06 15:12:42 UTC (rev 12911)
@@ -37,7 +37,6 @@
org/jboss/test/ws/jaxrpc/**
# [JBWS-2945] JAX-WS 2.2 implementation not yet available for CXF stack
-org/jboss/test/ws/jaxws/jbws3022/**
org/jboss/test/ws/jaxws/jbws3031/**
org/jboss/test/ws/jaxws/samples/addressing/AddressingStatefulTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-09-06 15:04:44 UTC (rev 12910)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-09-06 15:12:42 UTC (rev 12911)
@@ -37,7 +37,6 @@
org/jboss/test/ws/jaxrpc/**
# [JBWS-2945] JAX-WS 2.2 implementation not yet available for CXF stack
-org/jboss/test/ws/jaxws/jbws3022/**
org/jboss/test/ws/jaxws/jbws3031/**
org/jboss/test/ws/jaxws/samples/addressing/AddressingStatefulTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-09-06 15:04:44 UTC (rev 12910)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-09-06 15:12:42 UTC (rev 12911)
@@ -31,7 +31,6 @@
# [JBWS-2945] JAX-WS 2.2 implementation not yet available for CXF stack
org/jboss/test/ws/jaxws/jbws2942/**
-org/jboss/test/ws/jaxws/jbws3022/**
org/jboss/test/ws/jaxws/jbws3031/**
org/jboss/test/ws/jaxws/samples/addressing/AddressingStatefulTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-09-06 15:04:44 UTC (rev 12910)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-09-06 15:12:42 UTC (rev 12911)
@@ -30,8 +30,7 @@
org/jboss/test/ws/jaxws/jbws1797/**
# [JBWS-2945] JAX-WS 2.2 implementation not yet available for CXF stack
-org/jboss/test/ws/jaxws/jbws2942/**
-org/jboss/test/ws/jaxws/jbws3022/**
+#org/jboss/test/ws/jaxws/jbws2942/**
org/jboss/test/ws/jaxws/jbws3031/**
org/jboss/test/ws/jaxws/samples/addressing/AddressingStatefulTestCase.*
14 years, 6 months