JBossWS SVN: r14488 - shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-06-07 14:44:46 -0400 (Tue, 07 Jun 2011)
New Revision: 14488
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java
Log:
fixing test
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java 2011-06-07 16:17:21 UTC (rev 14487)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java 2011-06-07 18:44:46 UTC (rev 14488)
@@ -44,7 +44,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(WebServiceContextJSETestCase.class, "jaxws-samples-context.war");
+ return new JBossWSTestSetup(WebServiceContextJSETestCase.class, "jaxws-samples-context.war", !isTargetJBoss6());
}
public void setUp() throws Exception
13 years, 6 months
JBossWS SVN: r14487 - in stack/cxf/trunk/modules/testsuite: cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-07 12:17:21 -0400 (Tue, 07 Jun 2011)
New Revision: 14487
Modified:
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3257] Fixing UsernameDigestTestCase to use new security domain deploy option + enabling tests
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java 2011-06-07 16:01:48 UTC (rev 14486)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java 2011-06-07 16:17:21 UTC (rev 14487)
@@ -35,6 +35,7 @@
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
+import org.jboss.wsf.stack.cxf.security.authentication.callback.UsernameTokenCallback;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
@@ -52,7 +53,30 @@
public static Test suite()
{
- return new JBossWSCXFTestSetup(UsernameDigestTestCase.class, "jaxws-samples-wsse-username-digest-service.sar jaxws-samples-wsse-username-digest.war");
+ JBossWSCXFTestSetup testSetup;
+ if (!isTargetJBoss6())
+ {
+ testSetup = new JBossWSCXFTestSetup(UsernameDigestTestCase.class, "jaxws-samples-wsse-username-digest.war");
+ Map<String, String> authenticationOptions = new HashMap<String, String>();
+ authenticationOptions.put("usersProperties",
+ getResourceFile("jaxws/samples/wsse/username-digest/WEB-INF/jbossws-users.properties").getAbsolutePath());
+ authenticationOptions.put("rolesProperties",
+ getResourceFile("jaxws/samples/wsse/username-digest/WEB-INF/jbossws-roles.properties").getAbsolutePath());
+ authenticationOptions.put("hashAlgorithm", "SHA");
+ authenticationOptions.put("hashEncoding", "BASE64");
+ authenticationOptions.put("hashCharset", "UTF-8");
+ authenticationOptions.put("hashUserPassword", "false");
+ authenticationOptions.put("hashStorePassword", "true");
+ authenticationOptions.put("storeDigestCallback", UsernameTokenCallback.class.getName());
+ authenticationOptions.put("unauthenticatedIdentity", "anonymous");
+ testSetup.addSecurityDomainRequirement("JBossWSDigest", authenticationOptions);
+ }
+ else
+ {
+ testSetup = new JBossWSCXFTestSetup(UsernameDigestTestCase.class,
+ "jaxws-samples-wsse-username-digest-service.sar jaxws-samples-wsse-username-digest.war");
+ }
+ return testSetup;
}
public void testAuthorized() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-06-07 16:01:48 UTC (rev 14486)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-06-07 16:17:21 UTC (rev 14487)
@@ -1048,10 +1048,6 @@
<!-- # [JBAS-9188] Implement support for nested EJBs & WARs in .sar archives -->
<exclude>org/jboss/test/ws/jaxws/jbws1854/**</exclude>
- <!-- # [JBWS-3257] No class available with name 'org.jboss.security.plugins.JaasSecurityDomain' -->
- <exclude>org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationDigestTestCase*</exclude>
-
<!-- # [JBWS-3227] handlers config file not found on classpath -->
<exclude>org/jboss/test/ws/jaxws/jbws3034/**</exclude>
13 years, 6 months
JBossWS SVN: r14486 - in stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws: samples/wssecurity and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-07 12:01:48 -0400 (Tue, 07 Jun 2011)
New Revision: 14486
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java
Log:
[JBWS-3257] Use new option for deploying security domain
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java 2011-06-07 16:01:14 UTC (rev 14485)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java 2011-06-07 16:01:48 UTC (rev 14486)
@@ -56,7 +56,7 @@
public static Test suite() throws Exception
{
- return new JBossWSTestSetup(JBWS1999TestCase.class, "jaxws-jbws1999.war");
+ return new JBossWSTestSetup(JBWS1999TestCase.class, "jaxws-jbws1999.war", !isTargetJBoss6());
}
public void testNoSecurity() throws Exception
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java 2011-06-07 16:01:14 UTC (rev 14485)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java 2011-06-07 16:01:48 UTC (rev 14486)
@@ -59,7 +59,7 @@
public static Test suite() throws Exception
{
- return new JBossWSTestSetup(SimpleDispatchTestCase.class, "jaxws-samples-wssecurity-username.war jaxws-samples-wssecurity-encrypt.war");
+ return new JBossWSTestSetup(SimpleDispatchTestCase.class, "jaxws-samples-wssecurity-username.war jaxws-samples-wssecurity-encrypt.war", !isTargetJBoss6());
}
@Override
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java 2011-06-07 16:01:14 UTC (rev 14485)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java 2011-06-07 16:01:48 UTC (rev 14486)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.samples.wssecurity;
-import java.io.File;
import java.net.URL;
import java.util.Map;
@@ -48,7 +47,7 @@
public static Test suite() throws Exception
{
- return new JBossWSTestSetup(SimpleUsernameTestCase.class, "jaxws-samples-wssecurity-username.war");
+ return new JBossWSTestSetup(SimpleUsernameTestCase.class, "jaxws-samples-wssecurity-username.war", !isTargetJBoss6());
}
@Override
13 years, 6 months
JBossWS SVN: r14485 - in stack/cxf/trunk/modules/testsuite: cxf-spring-tests/src/test/java/org/jboss/wsf/test and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-07 12:01:14 -0400 (Tue, 07 Jun 2011)
New Revision: 14485
Modified:
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationDigestTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java
Log:
[JBWS-3257] Use new option for deploying security domain
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java 2011-06-07 14:33:42 UTC (rev 14484)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java 2011-06-07 16:01:14 UTC (rev 14485)
@@ -52,7 +52,7 @@
public static Test suite()
{
- return new JBossWSCXFTestSetup(UsernameAuthorizationTestCase.class, "jaxws-samples-wsse-username-authorize.war");
+ return new JBossWSCXFTestSetup(UsernameAuthorizationTestCase.class, "jaxws-samples-wsse-username-authorize.war", !isTargetJBoss6());
}
public void testAuthorized() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java 2011-06-07 14:33:42 UTC (rev 14484)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java 2011-06-07 16:01:14 UTC (rev 14485)
@@ -36,11 +36,21 @@
{
super(testClass, archiveList);
}
+
+ public JBossWSCXFTestSetup(Class<?> testClass, String archiveList, boolean requiresDefaultSecurityDomain)
+ {
+ super(testClass, archiveList, requiresDefaultSecurityDomain);
+ }
public JBossWSCXFTestSetup(Test test, String archiveList)
{
super(test, archiveList);
}
+
+ public JBossWSCXFTestSetup(Test test, String archiveList, boolean requiresDefaultSecurityDomain)
+ {
+ super(test, archiveList, requiresDefaultSecurityDomain);
+ }
public JBossWSCXFTestSetup(Test test)
{
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationDigestTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationDigestTestCase.java 2011-06-07 14:33:42 UTC (rev 14484)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationDigestTestCase.java 2011-06-07 16:01:14 UTC (rev 14485)
@@ -22,6 +22,8 @@
package org.jboss.test.ws.jaxws.samples.wsse.policy.jaas;
import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
import javax.xml.namespace.QName;
import javax.xml.ws.BindingProvider;
@@ -30,6 +32,7 @@
import junit.framework.Test;
import org.apache.cxf.ws.security.SecurityConstants;
+import org.jboss.wsf.stack.cxf.security.authentication.callback.UsernameTokenCallback;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
@@ -46,8 +49,30 @@
public static Test suite()
{
- return new JBossWSCXFTestSetup(UsernameAuthorizationDigestTestCase.class,
+ JBossWSCXFTestSetup testSetup;
+ if (!isTargetJBoss6())
+ {
+ testSetup = new JBossWSCXFTestSetup(UsernameAuthorizationDigestTestCase.class, "jaxws-samples-wsse-policy-username-jaas-digest.war");
+ Map<String, String> authenticationOptions = new HashMap<String, String>();
+ authenticationOptions.put("usersProperties",
+ getResourceFile("jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jbossws-users.properties").getAbsolutePath());
+ authenticationOptions.put("rolesProperties",
+ getResourceFile("jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jbossws-roles.properties").getAbsolutePath());
+ authenticationOptions.put("hashAlgorithm", "SHA");
+ authenticationOptions.put("hashEncoding", "BASE64");
+ authenticationOptions.put("hashCharset", "UTF-8");
+ authenticationOptions.put("hashUserPassword", "false");
+ authenticationOptions.put("hashStorePassword", "true");
+ authenticationOptions.put("storeDigestCallback", UsernameTokenCallback.class.getName());
+ authenticationOptions.put("unauthenticatedIdentity", "anonymous");
+ testSetup.addSecurityDomainRequirement("JBossWSDigest", authenticationOptions);
+ }
+ else
+ {
+ testSetup = new JBossWSCXFTestSetup(UsernameAuthorizationDigestTestCase.class,
"jaxws-samples-wsse-policy-username-jaas-digest-service.sar jaxws-samples-wsse-policy-username-jaas-digest.war");
+ }
+ return testSetup;
}
public void test() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase.java 2011-06-07 14:33:42 UTC (rev 14484)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase.java 2011-06-07 16:01:14 UTC (rev 14485)
@@ -45,7 +45,7 @@
public static Test suite()
{
- return new JBossWSCXFTestSetup(UsernameAuthorizationEJBTestCase.class, "jaxws-samples-wsse-policy-username-jaas-ejb.jar");
+ return new JBossWSCXFTestSetup(UsernameAuthorizationEJBTestCase.class, "jaxws-samples-wsse-policy-username-jaas-ejb.jar", !isTargetJBoss6());
}
public void test() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationTestCase.java 2011-06-07 14:33:42 UTC (rev 14484)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationTestCase.java 2011-06-07 16:01:14 UTC (rev 14485)
@@ -46,7 +46,7 @@
public static Test suite()
{
- return new JBossWSCXFTestSetup(UsernameAuthorizationTestCase.class, "jaxws-samples-wsse-policy-username-jaas.war");
+ return new JBossWSCXFTestSetup(UsernameAuthorizationTestCase.class, "jaxws-samples-wsse-policy-username-jaas.war", !isTargetJBoss6());
}
public void test() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java 2011-06-07 14:33:42 UTC (rev 14484)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java 2011-06-07 16:01:14 UTC (rev 14485)
@@ -36,11 +36,21 @@
{
super(testClass, archiveList);
}
+
+ public JBossWSCXFTestSetup(Class<?> testClass, String archiveList, boolean requiresDefaultSecurityDomain)
+ {
+ super(testClass, archiveList, requiresDefaultSecurityDomain);
+ }
public JBossWSCXFTestSetup(Test test, String archiveList)
{
super(test, archiveList);
}
+
+ public JBossWSCXFTestSetup(Test test, String archiveList, boolean requiresDefaultSecurityDomain)
+ {
+ super(test, archiveList, requiresDefaultSecurityDomain);
+ }
public JBossWSCXFTestSetup(Test test)
{
13 years, 6 months
JBossWS SVN: r14484 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-07 10:33:42 -0400 (Tue, 07 Jun 2011)
New Revision: 14484
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-2941] Setting explicit version of org.slf4j dependencies for littleproxy needs
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-06-07 14:18:11 UTC (rev 14483)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-06-07 14:33:42 UTC (rev 14484)
@@ -26,6 +26,8 @@
<wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location>
<hibernate.version>3.2.4.sp1</hibernate.version>
<jboss.javaee.version>5.0.0.GA</jboss.javaee.version>
+ <org.littleshoot.littleproxy.version>0.4</org.littleshoot.littleproxy.version>
+ <org.slf4j.version>1.5.6</org.slf4j.version>
<log4j.output.dir>${project.build.directory}</log4j.output.dir>
</properties>
@@ -115,7 +117,7 @@
<dependency>
<groupId>org.littleshoot</groupId>
<artifactId>littleproxy</artifactId>
- <version>0.4</version>
+ <version>${org.littleshoot.littleproxy.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -127,6 +129,12 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${org.slf4j.version}</version>
+ </dependency>
+
</dependencies>
<!-- Build -->
13 years, 6 months
JBossWS SVN: r14483 - in stack/native/trunk/modules/testsuite: native-tests/scripts and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-06-07 10:18:11 -0400 (Tue, 07 Jun 2011)
New Revision: 14483
Modified:
stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
stack/native/trunk/modules/testsuite/pom.xml
Log:
updating native test excludes - enabling another bunch of tests
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-06-07 14:15:37 UTC (rev 14482)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-06-07 14:18:11 UTC (rev 14483)
@@ -79,6 +79,9 @@
<include name="org/jboss/test/ws/jaxws/epr/*.class" />
<exclude name="org/jboss/test/ws/jaxws/epr/*TestCase.class" />
</fileset>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.logging,org.jboss.ws.native.jbossws-native-core"/>
+ </manifest>
</jar>
<!-- jaxws-fastinfoset -->
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-06-07 14:15:37 UTC (rev 14482)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-06-07 14:18:11 UTC (rev 14483)
@@ -793,38 +793,30 @@
<!-- TODO: implement EJB security integration -->
<exclude>org/jboss/test/ws/jaxws/jbws1991/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase*</exclude>
<!-- TODO: Unexpected element 'class-loading' encountered -->
<exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
<!-- TODO: Classpath visibility issues - investigate -->
<exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
+ <!-- TODO: <security-identity> element parsing is not yet implemented -->
+ <exclude>org/jboss/test/ws/jaxws/jbws2957/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2999/**</exclude>
+
<!-- TODO: EJB3 DD driven deployments -->
<exclude>org/jboss/test/ws/jaxws/jbws1309/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2011/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2182/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2937/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2957/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2999/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/benchmark/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/epr/EndpointReferenceTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxws/endpointReference/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/context/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/dar/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/eardeployment/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/exception/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/advanced/retail/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/securityDomain/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/swaref/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/webservice/**/*EJB3TestCase*</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**/*EJB3TestCase*</exclude>
<exclude>org/jboss/test/ws/management/recording/**</exclude>
@@ -843,6 +835,7 @@
<!-- # [JBWS-3240] Rewrite tests relying on $JBOSS_HOME/server/default/tmp/jbossws folder existence -->
<exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase*</exclude>
<!-- # [JBWS-3246] Resuscitate JSON -->
<exclude>org/jboss/test/ws/jaxws/json/JsonTestCase*</exclude>
13 years, 6 months
JBossWS SVN: r14482 - shared-testsuite/trunk/testsuite/src/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-06-07 10:15:37 -0400 (Tue, 07 Jun 2011)
New Revision: 14482
Modified:
shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxws.xml
Log:
fixing tests - defining deployment dependencies
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-06-07 11:21:35 UTC (rev 14481)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-06-07 14:15:37 UTC (rev 14482)
@@ -553,6 +553,9 @@
<include name="org/jboss/test/ws/jaxws/jbws2074/handler/JavaResourcesHandler.class" />
<include name="org/jboss/test/ws/jaxws/jbws2074/usecase1/service/jaxws-service-handlers.xml" />
</classes>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.logging"/>
+ </manifest>
</war>
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase2.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -562,12 +565,18 @@
<metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase2/META-INF">
<include name="ejb-jar.xml" />
</metainf>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.logging"/>
+ </manifest>
</jar>
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase3.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase3/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws2074/usecase3/service/POJOIface.class" />
<include name="org/jboss/test/ws/jaxws/jbws2074/usecase3/service/POJOImpl.class" />
</classes>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.logging"/>
+ </manifest>
</war>
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase4.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -580,6 +589,9 @@
<metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase4/META-INF">
<include name="ejb-jar.xml" />
</metainf>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.logging"/>
+ </manifest>
</jar>
<jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase1.sar">
<fileset dir="${tests.output.dir}/test-libs">
@@ -824,6 +836,9 @@
<include name="org/jboss/test/ws/jaxws/jbws2634/shared/handlers/TestHandler.class" />
<include name="org/jboss/test/ws/jaxws/jbws2634/webservice/jaxws-handler.xml" />
</classes>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.logging"/>
+ </manifest>
</war>
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2634-ejb3.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -836,6 +851,9 @@
<metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2634/META-INF">
<include name="ejb-jar.xml" />
</metainf>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.logging"/>
+ </manifest>
</jar>
<ear appxml="${tests.output.dir}/test-resources/jaxws/jbws2634/META-INF/application.xml" earfile="${tests.output.dir}/test-libs/jaxws-jbws2634.ear">
<fileset file="${tests.output.dir}/test-libs/jaxws-jbws2634.jar" />
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxws.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxws.xml 2011-06-07 11:21:35 UTC (rev 14481)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxws.xml 2011-06-07 14:15:37 UTC (rev 14482)
@@ -44,6 +44,9 @@
<webinf dir="${tests.output.dir}/test-resources/jaxws/samples/context/WEB-INF">
<include name="jboss-web.xml"/>
</webinf>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.ws.common"/>
+ </manifest>
</war>
<jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-context.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -52,6 +55,9 @@
<metainf dir="${tests.output.dir}/test-resources/jaxws/samples/context/META-INF">
<include name="jboss.xml"/>
</metainf>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.ws.common"/>
+ </manifest>
</jar>
<!-- jaxws-samples-eardeployment -->
@@ -64,6 +70,9 @@
<include name="jboss-web.xml"/>
<include name="wsdl/**"/>
</webinf>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.logging,org.jboss.ws.common"/>
+ </manifest>
</war>
<jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-eardeployment-ejb3.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -72,6 +81,9 @@
<metainf dir="${tests.output.dir}/test-resources/jaxws/samples/eardeployment/WEB-INF">
<include name="wsdl/**"/>
</metainf>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.logging"/>
+ </manifest>
</jar>
<jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-eardeployment.ear">
<fileset dir="${tests.output.dir}/test-libs">
@@ -233,6 +245,9 @@
<metainf dir="${tests.output.dir}/test-resources/jaxws/samples/advanced/retail/META-INF">
<include name="wsdl/*"/>
</metainf>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.logging"/>
+ </manifest>
</jar>
<!-- jaxws-samples-securityDomain -->
@@ -475,6 +490,9 @@
<exclude name="org/jboss/test/ws/management/recording/EndpointWithHandlerImpl.class"/>
<exclude name="org/jboss/test/ws/management/recording/*TestCase.class"/>
</fileset>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.logging"/>
+ </manifest>
</jar>
<jar destfile="${tests.output.dir}/test-libs/management-recording.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -483,6 +501,9 @@
<exclude name="org/jboss/test/ws/management/recording/EndpointImpl.class"/>
<exclude name="org/jboss/test/ws/management/recording/*TestCase.class"/>
</fileset>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.logging"/>
+ </manifest>
</jar>
<!-- saaj-jbws3084 -->
13 years, 6 months
JBossWS SVN: r14480 - spi/tags.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-07 07:18:52 -0400 (Tue, 07 Jun 2011)
New Revision: 14480
Added:
spi/tags/jbossws-spi-2.0.0.Beta3/
Log:
Tagging jbossws-spi-2.0.0.Beta3
13 years, 6 months
JBossWS SVN: r14479 - shared-testsuite/trunk/src/main/java/org/jboss/wsf/test.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-07 07:14:43 -0400 (Tue, 07 Jun 2011)
New Revision: 14479
Modified:
shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java
Log:
[JBWS-3257] Adding option for deploying the jbossws default test security domain
Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java
===================================================================
--- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2011-06-06 16:25:26 UTC (rev 14478)
+++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2011-06-07 11:14:43 UTC (rev 14479)
@@ -50,22 +50,37 @@
{
// provide logging
private static Logger log = Logger.getLogger(JBossWSTestSetup.class);
+
+ private static final String JBOSSWS_SEC_DOMAIN = "JBossWS";
private String[] archives = new String[0];
private ClassLoader originalClassLoader;
private Map<String, Map<String, String>> securityDomains = new HashMap<String, Map<String,String>>();
+ private boolean defaultSecurityDomainRequirement = false;
public JBossWSTestSetup(Class<?> testClass, String archiveList)
{
super(new TestSuite(testClass));
getArchiveArray(archiveList);
}
+
+ public JBossWSTestSetup(Class<?> testClass, String archiveList, boolean requiresDefaultSecurityDomain)
+ {
+ this(testClass, archiveList);
+ setDefaultSecurityDomainRequirement(requiresDefaultSecurityDomain);
+ }
public JBossWSTestSetup(Test test, String archiveList)
{
super(test);
getArchiveArray(archiveList);
}
+
+ public JBossWSTestSetup(Test test, String archiveList, boolean requiresDefaultSecurityDomain)
+ {
+ this(test, archiveList);
+ setDefaultSecurityDomainRequirement(requiresDefaultSecurityDomain);
+ }
public JBossWSTestSetup(Test test)
{
@@ -117,6 +132,20 @@
JBossWSTestHelper.addSecurityDomain(key, securityDomains.get(key));
}
}
+ if (defaultSecurityDomainRequirement)
+ {
+ String usersPropFile = System.getProperty("org.jboss.ws.testsuite.securityDomain.users.propfile");
+ String rolesPropFile = System.getProperty("org.jboss.ws.testsuite.securityDomain.roles.propfile");
+ Map<String, String> authenticationOptions = new HashMap<String, String>();
+ if (usersPropFile != null) {
+ authenticationOptions.put("usersProperties", usersPropFile);
+ }
+ if (rolesPropFile != null) {
+ authenticationOptions.put("rolesProperties", rolesPropFile);
+ }
+ authenticationOptions.put("unauthenticatedIdentity", "anonymous");
+ JBossWSTestHelper.addSecurityDomain(JBOSSWS_SEC_DOMAIN, authenticationOptions);
+ }
List<URL> clientJars = new ArrayList<URL>();
for (int i = 0; i < archives.length; i++)
@@ -175,6 +204,10 @@
JBossWSTestHelper.removeSecurityDomain(key);
}
}
+ if (defaultSecurityDomainRequirement)
+ {
+ JBossWSTestHelper.removeSecurityDomain(JBOSSWS_SEC_DOMAIN);
+ }
}
}
@@ -192,4 +225,9 @@
{
securityDomains.put(securityDomainName, authenticationOptions);
}
+
+ public void setDefaultSecurityDomainRequirement(boolean defaultSecurityDomainRequirement)
+ {
+ this.defaultSecurityDomainRequirement = defaultSecurityDomainRequirement;
+ }
}
13 years, 6 months