JBossWS SVN: r19539 - spi/trunk/src/main/java/org/jboss/wsf/spi/management.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2015-03-09 13:38:52 -0400 (Mon, 09 Mar 2015)
New Revision: 19539
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/management/EndpointRegistry.java
Log:
[JBWS-3877] EndpointRegistry cleanup
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/management/EndpointRegistry.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/management/EndpointRegistry.java 2015-03-09 16:08:15 UTC (rev 19538)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/management/EndpointRegistry.java 2015-03-09 17:38:52 UTC (rev 19539)
@@ -48,10 +48,4 @@
/** True is an endpoint for that name is registered */
boolean isRegistered(ObjectName epName);
-
- /** Register an endpoint */
- void register(Endpoint endpoint);
-
- /** Unregister an endpoint */
- void unregister(Endpoint endpoint);
}
9 years, 10 months
JBossWS SVN: r19538 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2015-03-09 12:08:15 -0400 (Mon, 09 Mar 2015)
New Revision: 19538
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
Prevent usage of -Djboss.bind.address with -Pfast (wildfly-maven-plugin + arquillian can't handle that)
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2015-03-09 14:16:20 UTC (rev 19537)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2015-03-09 16:08:15 UTC (rev 19538)
@@ -541,6 +541,27 @@
<runOrder>balanced</runOrder>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>checkNoBindAddress</id>
+ <phase>initialize</phase>
+ <goals><goal>run</goal></goals>
+ <configuration>
+ <tasks>
+ <fail message="'fast' profile only supports 'jboss.bind.address' property set to 'localhost'">
+ <condition>
+ <not>
+ <equals arg1="${jboss.bind.address}" arg2="localhost"/>
+ </not>
+ </condition>
+ </fail>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
9 years, 10 months
JBossWS SVN: r19537 - in stack/cxf/trunk/modules/testsuite: shared-tests/src/test/etc and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2015-03-09 10:16:20 -0400 (Mon, 09 Mar 2015)
New Revision: 19537
Modified:
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/arquillian.xml
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/arquillian.xml
Log:
[JBWS-3668] fix arquillian.xml in shared and spring testsuites to allow -Djboss.bind.address usage
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/arquillian.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/arquillian.xml 2015-03-09 08:50:21 UTC (rev 19536)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/arquillian.xml 2015-03-09 14:16:20 UTC (rev 19537)
@@ -6,9 +6,11 @@
<container qualifier="jboss" default="true">
<configuration>
<property name="jbossHome">${jboss.home}</property>
- <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m -Djboss.socket.binding.port-offset=${port-offset.cxf-spring-tests.jboss} -Djavax.wsdl.factory.WSDLFactory=com.ibm.wsdl.factory.WSDLFactoryImpl</property>
+ <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m -Djboss.socket.binding.port-offset=${port-offset.cxf-spring-tests.jboss} ${additionalJvmArgs}</property>
<property name="serverConfig">jbws-testsuite-spring-default.xml</property>
<property name="allowConnectingToRunningServer">true</property>
+ <property name="managementAddress">${jboss.bind.address:localhost}</property>
+ <property name="jbossArguments">${jbossArguments}</property>
<property name="managementPort">${add_int(port-offset.cxf-spring-tests.jboss,9990)}</property>
<!-- AS7-4070 -->
<property name="waitForPorts">${add_int(port-offset.cxf-spring-tests.jboss,8787)} ${add_int(port-offset.cxf-spring-tests.jboss,9990)}</property>
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/arquillian.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/arquillian.xml 2015-03-09 08:50:21 UTC (rev 19536)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/arquillian.xml 2015-03-09 14:16:20 UTC (rev 19537)
@@ -6,9 +6,11 @@
<container qualifier="jboss" default="true">
<configuration>
<property name="jbossHome">${jboss.home}</property>
- <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m -Djboss.socket.binding.port-offset=${port-offset.shared-tests.jboss} -Djavax.wsdl.factory.WSDLFactory=com.ibm.wsdl.factory.WSDLFactoryImpl</property>
+ <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m -Djboss.socket.binding.port-offset=${port-offset.shared-tests.jboss} ${additionalJvmArgs}</property>
<property name="serverConfig">jbws-testsuite-shared-default.xml</property>
<property name="allowConnectingToRunningServer">true</property>
+ <property name="managementAddress">${jboss.bind.address:localhost}</property>
+ <property name="jbossArguments">${jbossArguments}</property>
<property name="managementPort">${add_int(port-offset.shared-tests.jboss,9990)}</property>
<!-- AS7-4070 -->
<property name="waitForPorts">${add_int(port-offset.shared-tests.jboss,8787)} ${add_int(port-offset.shared-tests.jboss,9990)}</property>
@@ -18,9 +20,11 @@
<container qualifier="default-config-tests" mode="manual">
<configuration>
<property name="jbossHome">${jboss.home}</property>
- <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=${port-offset.shared-tests.default-config-tests} -Djavax.wsdl.factory.WSDLFactory=com.ibm.wsdl.factory.WSDLFactoryImpl</property>
+ <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=${port-offset.shared-tests.default-config-tests} ${additionalJvmArgs}</property>
<property name="serverConfig">jbws-testsuite-shared-default-config-tests.xml</property>
<property name="allowConnectingToRunningServer">true</property>
+ <property name="managementAddress">${jboss.bind.address:localhost}</property>
+ <property name="jbossArguments">${jbossArguments}</property>
<property name="managementPort">${add_int(port-offset.shared-tests.default-config-tests,9990)}</property>
<!-- AS7-4070 -->
<property name="waitForPorts">${add_int(port-offset.shared-tests.default-config-tests,8787)} ${add_int(port-offset.shared-tests.default-config-tests,9990)}</property>
@@ -30,9 +34,11 @@
<container qualifier="address-rewrite" mode="manual">
<configuration>
<property name="jbossHome">${jboss.home}</property>
- <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms32m -Xmx256m -XX:MaxPermSize=96m -Djboss.socket.binding.port-offset=${port-offset.shared-tests.address-rewrite} -Djavax.wsdl.factory.WSDLFactory=com.ibm.wsdl.factory.WSDLFactoryImpl</property>
+ <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms32m -Xmx256m -XX:MaxPermSize=96m -Djboss.socket.binding.port-offset=${port-offset.shared-tests.address-rewrite} ${additionalJvmArgs}</property>
<property name="serverConfig">jbws-testsuite-shared-address-rewrite.xml</property>
<property name="allowConnectingToRunningServer">true</property>
+ <property name="managementAddress">${jboss.bind.address:localhost}</property>
+ <property name="jbossArguments">${jbossArguments}</property>
<property name="managementPort">${add_int(port-offset.shared-tests.address-rewrite,9990)}</property>
<!-- AS7-4070 -->
<property name="waitForPorts">${add_int(port-offset.shared-tests.address-rewrite,8787)} ${add_int(port-offset.shared-tests.address-rewrite,9990)}</property>
9 years, 10 months
JBossWS SVN: r19536 - in stack/cxf/trunk/modules/testsuite/shared-tests/src/test: resources/jaxws/samples/securityDomain and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: jim.ma
Date: 2015-03-09 04:50:21 -0400 (Mon, 09 Mar 2015)
New Revision: 19536
Added:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl2.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/securityDomain/jboss-ejb3.xml
Modified:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpoint.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java
Log:
Add more tests for [WFLY-2129][WFLY-3988][WFLY-4289]
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpoint.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpoint.java 2015-03-06 20:18:55 UTC (rev 19535)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpoint.java 2015-03-09 08:50:21 UTC (rev 19536)
@@ -21,6 +21,7 @@
*/
package org.jboss.test.ws.jaxws.samples.securityDomain;
+import javax.jws.Oneway;
import javax.jws.WebMethod;
import javax.jws.WebParam;
import javax.jws.WebResult;
@@ -37,7 +38,11 @@
@WebResult(targetNamespace = "http://org.jboss.ws/securityDomain", partName = "return")
public String echoForAll(@WebParam(name = "arg0", partName = "arg0") String arg0);
+ @Oneway
@WebMethod
+ public void helloOneWay(@WebParam(name = "arg0", partName = "arg0")String arg0);
+
+ @WebMethod
@WebResult(targetNamespace = "http://org.jboss.ws/securityDomain", partName = "return")
public String echo(@WebParam(name = "arg0", partName = "arg0") String arg0);
@@ -45,4 +50,8 @@
@WebResult(targetNamespace = "http://org.jboss.ws/securityDomain", partName = "return")
public String restrictedEcho(@WebParam(name = "arg0", partName = "arg0") String arg0);
+ @WebMethod
+ @WebResult(targetNamespace = "http://org.jboss.ws/securityDomain", partName = "return")
+ public String defaultAccess(@WebParam(name = "arg0", partName = "arg0") String arg0);
+
}
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.java 2015-03-06 20:18:55 UTC (rev 19535)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.java 2015-03-09 08:50:21 UTC (rev 19536)
@@ -25,6 +25,7 @@
import javax.annotation.security.RolesAllowed;
import javax.annotation.security.PermitAll;
import javax.ejb.Stateless;
+import javax.jws.Oneway;
import javax.jws.WebMethod;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
@@ -66,9 +67,14 @@
log.info(input);
return input;
}
-
@RolesAllowed("friend")
+ @Oneway
@WebMethod
+ public void helloOneWay(String input) {
+ log.info(input);
+ }
+ @RolesAllowed("friend")
+ @WebMethod
public String echo(String input)
{
log.info(input);
Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl2.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl2.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl2.java 2015-03-09 08:50:21 UTC (rev 19536)
@@ -0,0 +1,91 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, 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.test.ws.jaxws.samples.securityDomain;
+
+import javax.annotation.security.DeclareRoles;
+import javax.annotation.security.RolesAllowed;
+import javax.annotation.security.PermitAll;
+import javax.ejb.Stateless;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.jws.soap.SOAPBinding.Style;
+
+import org.jboss.ejb3.annotation.SecurityDomain;
+import org.jboss.logging.Logger;
+import org.jboss.ws.api.annotation.AuthMethod;
+import org.jboss.ws.api.annotation.TransportGuarantee;
+import org.jboss.ws.api.annotation.WebContext;
+
+@Stateless(name = "SecureEndpoint")
+@SOAPBinding(style = Style.RPC)
+@WebService
+(
+ name = "SecureEndpoint",
+ serviceName = "SecureEndpointService2",
+ targetNamespace = "http://org.jboss.ws/securityDomain"
+)
+@WebContext
+(
+ contextRoot="/jaxws-securityDomain2",
+ urlPattern="/authz",
+ authMethod = AuthMethod.BASIC,
+ transportGuarantee = TransportGuarantee.NONE,
+ secureWSDLAccess = false
+)
+@SecurityDomain("JBossWSSecurityDomainTest")
+public class SecureEndpointImpl2
+{
+ // Provide logging
+ private static Logger log = Logger.getLogger(SecureEndpointImpl2.class);
+
+ @WebMethod
+ @PermitAll
+ public String echoForAll(String input)
+ {
+ log.info(input);
+ return input;
+ }
+
+ @RolesAllowed("friend")
+ @WebMethod
+ public String echo(String input)
+ {
+ log.info(input);
+ return input;
+ }
+
+ @RolesAllowed("royal")
+ @WebMethod
+ public String restrictedEcho(String input)
+ {
+ log.info(input);
+ return input;
+ }
+
+ @WebMethod
+ public String defaultAccess(String input)
+ {
+ log.info(input);
+ return input;
+ }
+}
\ No newline at end of file
Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl2.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java 2015-03-06 20:18:55 UTC (rev 19535)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java 2015-03-09 08:50:21 UTC (rev 19536)
@@ -21,19 +21,24 @@
*/
package org.jboss.test.ws.jaxws.samples.securityDomain;
+import java.io.File;
import java.net.URL;
import javax.xml.namespace.QName;
import javax.xml.ws.BindingProvider;
import javax.xml.ws.Service;
+import org.jboss.arquillian.container.test.api.Deployer;
import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
import org.jboss.arquillian.container.test.api.RunAsClient;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.test.api.ArquillianResource;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestHelper;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -51,14 +56,19 @@
*
* @author alessio.soldano(a)jboss.com
* @author <a href="mailto:richard.opalka@jboss.org">Richard Opalka</a>
+ * @author <a href="mailto:ema@redhat.com">Jim Ma</a>
*/
@RunWith(Arquillian.class)
public class SecurityDomainTestCase extends JBossWSTest
{
+ private final static String DEPLOYMENT1 = "jaxws-samples-securityDomain";
+ private final static String DEPLOYMENT2 = "jaxws-samples-securityDomain2";
@ArquillianResource
private URL baseURL;
+ @ArquillianResource
+ Deployer deployer;
- @Deployment(name="jaxws-samples-securityDomain", testable = false)
+ @Deployment(name= DEPLOYMENT1, testable = false)
public static JavaArchive createDeployment() {
JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-samples-securityDomain.jar");
archive
@@ -66,6 +76,15 @@
.addClass(org.jboss.test.ws.jaxws.samples.securityDomain.SecureEndpointImpl.class);
return archive;
}
+ @Deployment(name= DEPLOYMENT2, testable = false)
+ public static JavaArchive createDeployment2() {
+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-samples-securityDomain2.jar");
+ archive
+ .addManifest()
+ .addClass(org.jboss.test.ws.jaxws.samples.securityDomain.SecureEndpointImpl2.class)
+ .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/securityDomain/jboss-ejb3.xml"), "jboss-ejb3.xml");
+ return archive;
+ }
private SecureEndpoint getAuthzPort() throws Exception
{
@@ -76,6 +95,7 @@
@Test
@RunAsClient
+ @OperateOnDeployment(DEPLOYMENT1)
public void testUnauthenticated() throws Exception
{
SecureEndpoint port1 = getAuthzPort();
@@ -110,9 +130,18 @@
@Test
@RunAsClient
+ @OperateOnDeployment(DEPLOYMENT1)
public void testUnauthorized() throws Exception
{
SecureEndpoint port2 = getAuthzPort();
+ try {
+ port2.restrictedEcho("Hello");
+ fail("Authentication exception expected!");
+ } catch (Exception e) {
+ //expected web layer exception
+ assertTrue(e.getMessage().contains("Could not send Message"));
+ assertTrue("Exception Cause message: " + e.getCause().getMessage(), e.getCause().getMessage().contains("401: Unauthorized"));
+ }
((BindingProvider)port2).getRequestContext().put(BindingProvider.USERNAME_PROPERTY, "john");
((BindingProvider)port2).getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, "bar");
try {
@@ -123,9 +152,12 @@
assertTrue("Exception message: " + e.getMessage(), e.getMessage().contains("not allowed"));
}
}
+
+
@Test
@RunAsClient
+ @OperateOnDeployment(DEPLOYMENT1)
public void testAuthorizedAccess() throws Exception
{
SecureEndpoint port = getAuthzPort();
@@ -144,6 +176,7 @@
@Test
@RunAsClient
+ @OperateOnDeployment(DEPLOYMENT1)
public void testUndeclaredRole() throws Exception
{
SecureEndpoint port = getAuthzPort();
@@ -174,5 +207,74 @@
assertTrue("Exception Cause message: " + e.getCause().getMessage(), e.getCause().getMessage().contains("403: Forbidden"));
}
}
+ @Test
+ @RunAsClient
+ @OperateOnDeployment(DEPLOYMENT1)
+ @Ignore(value="Wait for [WFLY-2129][WFLY-3988] merge")
+ public void testOneWay() throws Exception
+ {
+ //test unthenticated
+ SecureEndpoint port2 = getAuthzPort();
+ try
+ {
+ port2.helloOneWay("Hello");
+ fail("Authentication exception expected!");
+ }
+ catch (Exception e)
+ {
+ //expected web layer exception
+ assertTrue(e.getMessage().contains("Could not send Message"));
+ assertTrue("Exception Cause message: " + e.getCause().getMessage(), e.getCause().getMessage().contains("401: Unauthorized"));
+ }
+ ((BindingProvider)port2).getRequestContext().put(BindingProvider.USERNAME_PROPERTY, "bob");
+ ((BindingProvider)port2).getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, "foo");
+ try {
+ port2.helloOneWay("Hello");
+ fail("Authorization exception expected!");
+ } catch (Exception e) {
+ //expected weblayer layer authorization exception
+ assertTrue("Unexpected cause: " + e.getCause().getMessage(), e.getCause().getMessage().contains("403: Forbidden"));
+ }
+
+ ((BindingProvider)port2).getRequestContext().put(BindingProvider.USERNAME_PROPERTY, "john");
+ ((BindingProvider)port2).getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, "bar");
+ port2.helloOneWay("Hello");
+ }
+
+ @Test
+ @RunAsClient
+ @OperateOnDeployment(DEPLOYMENT2)
+ @Ignore(value="Wait for [WFLY-2129][WFLY-3988] merge")
+ public void testEjbSecurityAuth() throws Exception
+ {
+ URL wsdlURL = new URL(baseURL + "/jaxws-securityDomain2/authz?wsdl");
+ QName serviceName = new QName("http://org.jboss.ws/securityDomain", "SecureEndpointService2");
+ SecureEndpoint port = Service.create(wsdlURL, serviceName).getPort(SecureEndpoint.class);
+ try {
+ port.echoForAll("Hello");
+ fail("Authorization exception expected!");
+ } catch (Exception e) {
+ //expected web layer exception
+ assertTrue(e.getMessage().contains("Could not send Message"));
+ assertTrue("Exception Cause message: " + e.getCause().getMessage(), e.getCause().getMessage().contains("401: Unauthorized"));
+ }
+ ((BindingProvider)port).getRequestContext().put(BindingProvider.USERNAME_PROPERTY, "bob");
+ ((BindingProvider)port).getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, "foo");
+ port.echoForAll("Hello");
+ try {
+ port.restrictedEcho("Hello");
+ fail("Authorization exception expected!");
+ } catch (Exception e) {
+ //expected EJB3 layer authorization exception
+ assertTrue("Exception message: " + e.getMessage(), e.getMessage().contains("not allowed"));
+ }
+
+ ((BindingProvider)port).getRequestContext().put(BindingProvider.USERNAME_PROPERTY, "kate");
+ ((BindingProvider)port).getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, "theprincess");
+ assertEquals("Greetings", port.echoForAll("Greetings"));
+ assertEquals("Greetings", port.echo("Greetings"));
+ assertEquals("Greetings", port.restrictedEcho("Greetings"));
+ assertEquals("Greetings", port.defaultAccess("Greetings"));
+ }
}
\ No newline at end of file
Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/securityDomain/jboss-ejb3.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/securityDomain/jboss-ejb3.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/securityDomain/jboss-ejb3.xml 2015-03-09 08:50:21 UTC (rev 19536)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss:jboss
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:jboss="http://www.jboss.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:s="urn:security:1.1"
+ version="3.1" impl-version="2.0">
+ <assembly-descriptor>
+ <s:security>
+ <ejb-name>*</ejb-name>
+ <s:missing-method-permissions-deny-access>false</s:missing-method-permissions-deny-access>
+ </s:security>
+ </assembly-descriptor>
+</jboss:jboss>
+
+
\ No newline at end of file
Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/securityDomain/jboss-ejb3.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
9 years, 10 months
JBossWS SVN: r19535 - in stack/cxf/trunk: modules/server and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2015-03-06 15:18:55 -0500 (Fri, 06 Mar 2015)
New Revision: 19535
Modified:
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/pom.xml
Log:
[JBWS-3876] Fixing build with JDK 1.8
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2015-03-06 16:14:36 UTC (rev 19534)
+++ stack/cxf/trunk/modules/server/pom.xml 2015-03-06 20:18:55 UTC (rev 19535)
@@ -251,6 +251,10 @@
<artifactId>jboss-jms-api_1.1_spec</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.security.jacc</groupId>
+ <artifactId>jboss-jacc-api_1.5_spec</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2015-03-06 16:14:36 UTC (rev 19534)
+++ stack/cxf/trunk/pom.xml 2015-03-06 20:18:55 UTC (rev 19535)
@@ -110,6 +110,7 @@
<arquillian.version>1.1.7.Final</arquillian.version>
<arquillian-wildfly-container.version>1.0.0.Alpha5</arquillian-wildfly-container.version>
<jaspi.api.version>1.0.0.Alpha1</jaspi.api.version>
+ <jacc.api.version>1.0.0.Final</jacc.api.version>
<javax.inject.version>1</javax.inject.version>
</properties>
@@ -1131,6 +1132,11 @@
<artifactId>jboss-jaspi-api_1.1_spec</artifactId>
<version>${jaspi.api.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.security.jacc</groupId>
+ <artifactId>jboss-jacc-api_1.5_spec</artifactId>
+ <version>${jacc.api.version}</version>
+ </dependency>
<!-- jboss provided -->
<dependency>
9 years, 10 months
JBossWS SVN: r19534 - api/trunk/src/main/java/org/jboss/ws/api/util.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2015-03-06 11:14:36 -0500 (Fri, 06 Mar 2015)
New Revision: 19534
Modified:
api/trunk/src/main/java/org/jboss/ws/api/util/DOMUtils.java
Log:
[JBWS-3876] Fix api build with JDK 1.8
Modified: api/trunk/src/main/java/org/jboss/ws/api/util/DOMUtils.java
===================================================================
--- api/trunk/src/main/java/org/jboss/ws/api/util/DOMUtils.java 2015-03-06 16:10:42 UTC (rev 19533)
+++ api/trunk/src/main/java/org/jboss/ws/api/util/DOMUtils.java 2015-03-06 16:14:36 UTC (rev 19534)
@@ -207,7 +207,7 @@
return (attrVal != null ? new Integer(attrVal) : null);
}
- /** Get the attributes as Map<QName, String>
+ /** Get the attributes as Map<QName, String>
*/
public static Map<QName, String> getAttributes(Element el)
{
9 years, 10 months
JBossWS SVN: r19533 - in spi/trunk/src/main/java/org/jboss/wsf/spi: security and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2015-03-06 11:10:42 -0500 (Fri, 06 Mar 2015)
New Revision: 19533
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesMetaData.java
spi/trunk/src/main/java/org/jboss/wsf/spi/security/SecurityDomainContext.java
Log:
[JBWS-3876] Fix spi build with JDK 1.8
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java 2015-03-06 14:18:52 UTC (rev 19532)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java 2015-03-06 16:10:42 UTC (rev 19533)
@@ -158,8 +158,6 @@
/**
* set the wsdlPort for this PortComponentMetaData. This is deprecated, the proper wsdlPort
* should be provided when creating a new instance.
- *
- * @return
*/
@Deprecated
public void setWsdlPort(QName wsdlPort)
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesMetaData.java 2015-03-06 14:18:52 UTC (rev 19532)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesMetaData.java 2015-03-06 16:10:42 UTC (rev 19533)
@@ -30,7 +30,7 @@
* XML Binding root element for <code>webservices.xml</code>
*
* @author Thomas.Diesler(a)jboss.org
- * @autor alessio.soldano(a)jboss.com
+ * @author alessio.soldano(a)jboss.com
* @since 15-April-2004
*/
public class WebservicesMetaData
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/security/SecurityDomainContext.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/security/SecurityDomainContext.java 2015-03-06 14:18:52 UTC (rev 19532)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/security/SecurityDomainContext.java 2015-03-06 16:10:42 UTC (rev 19533)
@@ -62,7 +62,7 @@
* environment Principal belongs.
*
* @param principal the caller principal as known in the operation environment.
- * @param roles The Set<Principal> for the application domain roles that the
+ * @param roles The <code>Set<java.security.Principal></code> for the application domain roles that the
* principal is to be validated against.
* @return true if the principal has at least one of the roles in the roles set,
* false otherwise.
@@ -73,7 +73,7 @@
/**
* Return the set of domain roles the principal has been assigned.
*
- * @return The Set<Principal> for the application domain roles that the principal has been assigned.
+ * @return The <code>Set<java.security.Principal></code> for the application domain roles that the principal has been assigned.
*/
public Set<Principal> getUserRoles(Principal principal);
9 years, 10 months
JBossWS SVN: r19532 - stack/cxf/trunk.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2015-03-06 09:18:52 -0500 (Fri, 06 Mar 2015)
New Revision: 19532
Removed:
stack/cxf/trunk/build.xml
Log:
Removing legacy build.xml (not used anymore)
Deleted: stack/cxf/trunk/build.xml
===================================================================
--- stack/cxf/trunk/build.xml 2015-03-06 14:01:24 UTC (rev 19531)
+++ stack/cxf/trunk/build.xml 2015-03-06 14:18:52 UTC (rev 19532)
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2014, Red Hat, Inc., 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.
- -->
-
-<project basedir="." name="JBossWS-CXF">
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
- <property name="stack.dir" value="${basedir}"/>
- <property name="dist.dir" value="${stack.dir}/modules/dist"/>
- <property name="dist.distro.dir" value="${dist.dir}/src/main/distro"/>
- <property name="dist.output.dir" value="${dist.dir}/target"/>
- <property name="stack.output.dir" value="${stack.dir}/target"/>
- <property name="stack.modules.dir" value="${stack.dir}/modules"/>
- <property name="stack.client.dir" value="${stack.modules.dir}/client"/>
- <property name="stack.server.dir" value="${stack.modules.dir}/server"/>
- <property name="stack.resources.dir" value="${stack.dir}/modules/resources/src/main/resources"/>
- <property name="deploy.artifacts.dir" value="${dist.output.dir}/assembly/deploy-artifacts"/>
-
- <import file="${dist.distro.dir}/build-setup.xml"/>
- <import file="${dist.distro.dir}/build-deploy.xml"/>
- <import file="${stack.resources.dir}/resources/jbossws-deploy-macros.xml"/>
-
- <property name="jbossws.default.modules.conf" value="${stack.resources.dir}/resources/modules-deploy.conf"/>
- <property name="target.properties.file" value="${basedir}/target.properties"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="os-init">
- <condition property="ext" value=".bat">
- <not>
- <os family="unix"/>
- </not>
- </condition>
- <property name="ext" value=""/>
- <property name="mvn" value="mvn${ext}"/>
- </target>
-
- <target name="mvn-settings" depends="os-init">
- <property name="maven.opts" value=""/>
- <!-- Loads the properties from the effective maven settings -->
- <mkdir dir="${dist.output.dir}"/>
- <exec dir="${basedir}" executable="${mvn}" failonerror="true">
- <arg value="-Doutput=${dist.output.dir}/effective-settings.xml"/>
- <arg line="${maven.opts} help:effective-settings"/>
- </exec>
- <xmlproperty file="${dist.output.dir}/effective-settings.xml" keeproot="false"/>
- <condition property="wildfly800.home" value="${profiles.profile.properties.wildfly800.home}">
- <isset property="profiles.profile.properties.wildfly800.home"/>
- </condition>
- <condition property="wildfly810.home" value="${profiles.profile.properties.wildfly810.home}">
- <isset property="profiles.profile.properties.wildfly810.home"/>
- </condition>
- <condition property="wildfly820.home" value="${profiles.profile.properties.wildfly820.home}">
- <isset property="profiles.profile.properties.wildfly820.home"/>
- </condition>
- <condition property="wildfly900.home" value="${profiles.profile.properties.wildfly900.home}">
- <isset property="profiles.profile.properties.wildfly900.home"/>
- </condition>
-
-
- <fail message="Application server home not set, wildfly800.home=value, wildfly810.home=value, wildfly820.home=value or wildfly900.home to set">
- <condition>
- <and>
- <not>
- <isset property="wildfly800.home"/>
- </not>
- <not>
- <isset property="wildfly810.home"/>
- </not>
- <not>
- <isset property="wildfly820.home"/>
- </not>
- <not>
- <isset property="wildfly900.home"/>
- </not>
- </and>
- </condition>
- </fail>
-
- <echo/>
- <echo message="wildfly800.home=${wildfly800.home}"/>
- <echo message="wildfly810.home=${wildfly810.home}"/>
- <echo message="wildfly820.home=${wildfly820.home}"/>
- <echo message="wildfly900.home=${wildfly900.home}"/>
- </target>
-
- <target name="init" depends="mvn-settings,prepare,os-init">
- <xmlproperty file="${stack.dir}/pom.xml"/>
- <property name="version.id" value="${project.version}"/>
-
- <echo message="version.id=${version.id}"/>
- <echo message="integration.target=${jbossws.integration.target}"/>
-
- <fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/>
- <property name="deploy.structure" value="${dist.output.dir}/deploy-${jbossws.integration.target}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Distribution -->
- <!-- ================================================================== -->
-
- <target name="prepare-deploy" depends="prepare,os-init">
-
- <!-- Use a system property to overwrite the empty default value -->
- <property name="maven.opts" value=""/>
-
- <echo/>
- <echo message="${mvn} ${maven.opts} -Pdist -Dno-testsuite install"/>
- <echo/>
-
- <delete dir="${deploy.artifacts.dir}"/>
- <exec dir="${basedir}" executable="${mvn}" failonerror="true">
- <arg line="${maven.opts} -Pdist -Dno-testsuite install"/>
- </exec>
- </target>
-
- <target name="build-bin-dist" depends="prepare,os-init,makedir" description="Build the binary distribution">
-
- <!-- Use a system property to overwrite the empty default value -->
- <property name="maven.opts" value=""/>
- <echo/>
- <echo message="${mvn} ${maven.opts} -Pdist -Dbindist -Dno-testsuite install"/>
- <echo/>
-
- <delete dir="${dist.output.dir}/jbossws-cxf-bin-dist"/>
- <exec dir="${basedir}" executable="${mvn}" failonerror="true">
- <arg line="${maven.opts} -Pdist -Dbindist -Dno-testsuite install"/>
- </exec>
-
- <zip destfile="${stack.output.dir}/jbossws-cxf-bin-dist.zip">
- <zipfileset
- dir="${dist.output.dir}/assembly/jbossws-cxf-bin-dist"
- includes="build/ deploy/ docs/ tests/ build.xml ant.properties.example"
- prefix="jbossws-cxf-bin-dist"/>
- </zip>
- </target>
-
- <target name="build-src-dist" depends="prepare,os-init,makedir" description="Build the source distribution">
-
- <!-- Use a system property to overwrite the empty default value -->
- <property name="maven.opts" value=""/>
- <echo/>
- <echo message="${mvn} ${maven.opts} -Pdist -Dsrcdist -Dno-testsuite install"/>
- <echo/>
-
- <delete dir="${dist.output.dir}/jbossws-cxf-src-dist"/>
- <exec dir="${basedir}" executable="${mvn}" failonerror="true">
- <arg line="${maven.opts} -Pdist -Dsrcdist -Dno-testsuite install"/>
- </exec>
-
- <zip destfile="${stack.output.dir}/jbossws-cxf-src-dist.zip">
- <zipfileset
- dir="${dist.output.dir}/assembly/jbossws-cxf-src-dist"
- includes="modules/ src/ eclipse/ build.xml pom.xml profiles.xml.example .classpath .project"
- prefix="jbossws-cxf-src-dist"/>
- </zip>
- </target>
-
-
- <target name="check.exist">
- <available file="${stack.output.dir}" property="file.exists" value="true" />
- </target>
-
- <target name="makedir" depends="check.exist" unless="file.exists">
- <mkdir dir="${stack.output.dir}" />
- </target>
-
-</project>
9 years, 10 months
JBossWS SVN: r19531 - in stack/cxf/trunk/modules: dist/src/main/scripts and 2 other directories.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2015-03-06 09:01:24 -0500 (Fri, 06 Mar 2015)
New Revision: 19531
Modified:
stack/cxf/trunk/modules/dist/pom.xml
stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/trunk/modules/test-utils/pom.xml
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
Make all 'dist' module dependencies have provided scope, so that they do not leak into other modules depending on it. Move 'dist' module dependency from 'test-utils' to 'testsuite' module to allow for simple 'mvn clean install' command to run while keeping proper modules ordering when using -T option.
Modified: stack/cxf/trunk/modules/dist/pom.xml
===================================================================
--- stack/cxf/trunk/modules/dist/pom.xml 2015-03-06 10:27:08 UTC (rev 19530)
+++ stack/cxf/trunk/modules/dist/pom.xml 2015-03-06 14:01:24 UTC (rev 19531)
@@ -20,30 +20,35 @@
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-client</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-jaspi</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-transports-undertow</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-transports-udp</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-server</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -56,30 +61,37 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- OpenSAML -->
<dependency>
@@ -90,17 +102,19 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jandex</artifactId>
+ <scope>provided</scope>
</dependency>
<!--junit-->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-depchain</artifactId>
<type>pom</type>
- <scope>test</scope>
+ <scope>provided</scope>
</dependency>
</dependencies>
@@ -229,6 +243,7 @@
<artifactId>jbossws-cxf-resources</artifactId>
<version>${project.version}</version>
<classifier>wildfly800</classifier>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
@@ -250,6 +265,7 @@
<artifactId>jbossws-cxf-resources</artifactId>
<version>${project.version}</version>
<classifier>wildfly810</classifier>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
@@ -271,6 +287,7 @@
<artifactId>jbossws-cxf-resources</artifactId>
<version>${project.version}</version>
<classifier>wildfly820</classifier>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
@@ -292,6 +309,7 @@
<artifactId>jbossws-cxf-resources</artifactId>
<version>${project.version}</version>
<classifier>wildfly900</classifier>
+ <scope>provided</scope>
</dependency>
</dependencies>
</profile>
Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2015-03-06 10:27:08 UTC (rev 19530)
+++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2015-03-06 14:01:24 UTC (rev 19531)
@@ -80,6 +80,7 @@
<include>org.apache.httpcomponents:httpclient:jar</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <scope>provided</scope>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
@@ -122,6 +123,7 @@
<include>org.jboss.ws.cxf:jbossws-cxf-resources:jar:*</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping>
+ <scope>provided</scope>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
@@ -132,6 +134,7 @@
<includes>
<include>org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec:jar</include>
</includes>
+ <scope>provided</scope>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
<dependencySet>
@@ -141,6 +144,7 @@
<includes>
<include>org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_spec:jar</include>
</includes>
+ <scope>provided</scope>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
Modified: stack/cxf/trunk/modules/test-utils/pom.xml
===================================================================
--- stack/cxf/trunk/modules/test-utils/pom.xml 2015-03-06 10:27:08 UTC (rev 19530)
+++ stack/cxf/trunk/modules/test-utils/pom.xml 2015-03-06 14:01:24 UTC (rev 19531)
@@ -37,13 +37,6 @@
<artifactId>jboss-logging</artifactId>
<scope>provided</scope>
</dependency>
- <dependency> <!-- dependency to dist module to ensure proper testsuite ordering when running with -T option -->
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-dist</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2015-03-06 10:27:08 UTC (rev 19530)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2015-03-06 14:01:24 UTC (rev 19531)
@@ -56,6 +56,13 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency> <!-- dependency to dist module to ensure proper testsuite ordering when running with -T option -->
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-dist</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-common</artifactId>
9 years, 10 months
JBossWS SVN: r19530 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2015-03-06 05:27:08 -0500 (Fri, 06 Mar 2015)
New Revision: 19530
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
removing unused property
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2015-03-05 15:17:02 UTC (rev 19529)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2015-03-06 10:27:08 UTC (rev 19530)
@@ -310,7 +310,6 @@
<org.jboss.security.ignoreHttpsHost>true</org.jboss.security.ignoreHttpsHost>
<jboss.home>${jboss.home}</jboss.home>
<jbossws.integration.target>${jbossws.integration.target}</jbossws.integration.target>
- <test.disable.deployment>false</test.disable.deployment>
<log4j.output.dir>${log4j.output.dir}</log4j.output.dir>
<appclient.output.dir>${appclient.output.dir}</appclient.output.dir>
<org.jboss.ws.testsuite.securityDomain.users.propfile>${project.build.directory}/test-classes/jbossws-users.properties</org.jboss.ws.testsuite.securityDomain.users.propfile>
@@ -352,7 +351,6 @@
<org.jboss.security.ignoreHttpsHost>true</org.jboss.security.ignoreHttpsHost>
<jboss.home>${jboss.home}</jboss.home>
<jbossws.integration.target>${jbossws.integration.target}</jbossws.integration.target>
- <test.disable.deployment>false</test.disable.deployment>
<log4j.output.dir>${log4j.output.dir}</log4j.output.dir>
<appclient.output.di>${appclient.output.dir}</appclient.output.di>
<org.jboss.ws.testsuite.securityDomain.users.propfile>${project.build.directory}/test-classes/jbossws-users.properties</org.jboss.ws.testsuite.securityDomain.users.propfile>
9 years, 10 months