JBossWS SVN: r14498 - 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-09 08:57:25 -0400 (Thu, 09 Jun 2011)
New Revision: 14498
Modified:
stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
stack/native/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3246] resuscitate JSON tests - make sure @org.jboss.ws.annotation.JsonEncoding is visible in deployment
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-08 11:03:32 UTC (rev 14497)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-06-09 12:57:25 UTC (rev 14498)
@@ -122,6 +122,9 @@
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/json/JsonEndpoint.class" />
</classes>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/>
+ </manifest>
</war>
<!-- jaxws-jaxbintros -->
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-06-08 11:03:32 UTC (rev 14497)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-06-09 12:57:25 UTC (rev 14498)
@@ -838,9 +838,6 @@
<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>
-
<!-- # [JBWS-3271] -->
<exclude>org/jboss/test/ws/jaxws/jbws1815/JBWS1815TestCase*</exclude>
<exclude>org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase*</exclude>
13 years, 7 months
JBossWS SVN: r14497 - in stack/cxf/trunk/modules: client/src/main/java/org/jboss/wsf/stack/cxf/client/util and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-08 07:03:32 -0400 (Wed, 08 Jun 2011)
New Revision: 14497
Removed:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/DelegateClassLoader.java
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java
stack/cxf/trunk/modules/client/src/test/java/org/jboss/wsf/stack/cxf/client/ProviderImplTest.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/HelloWorldImpl.java
Log:
Use DelegateClassLoader from jbossws-common
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java 2011-06-08 11:00:17 UTC (rev 14496)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java 2011-06-08 11:03:32 UTC (rev 14497)
@@ -42,8 +42,8 @@
import org.apache.cxf.BusFactory;
import org.apache.cxf.jaxws.ServiceImpl;
import org.jboss.logging.Logger;
+import org.jboss.ws.common.utils.DelegateClassLoader;
import org.jboss.wsf.stack.cxf.client.configuration.JBossWSBusFactory;
-import org.jboss.wsf.stack.cxf.client.util.DelegateClassLoader;
import org.w3c.dom.Element;
/**
Deleted: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/DelegateClassLoader.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/DelegateClassLoader.java 2011-06-08 11:00:17 UTC (rev 14496)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/DelegateClassLoader.java 2011-06-08 11:03:32 UTC (rev 14497)
@@ -1,145 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.stack.cxf.client.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.security.SecureClassLoader;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.NoSuchElementException;
-
-/**
- * A delegate classloader
- *
- * @author alessio.soldano(a)jboss.com
- *
- */
-public class DelegateClassLoader extends SecureClassLoader
-{
- private ClassLoader delegate;
-
- private ClassLoader parent;
-
- public DelegateClassLoader(final ClassLoader delegate, final ClassLoader parent)
- {
- super(parent);
- this.delegate = delegate;
- this.parent = parent;
- }
-
- /** {@inheritDoc} */
- @Override
- public Class<?> loadClass(final String className) throws ClassNotFoundException
- {
- if (parent != null)
- {
- try
- {
- return parent.loadClass(className);
- }
- catch (ClassNotFoundException cnfe)
- {
- //NOOP, use delegate
- }
- }
- return delegate.loadClass(className);
- }
-
- /** {@inheritDoc} */
- @Override
- public URL getResource(final String name)
- {
- URL url = null;
- if (parent != null)
- {
- url = parent.getResource(name);
- }
- return (url == null) ? delegate.getResource(name) : url;
- }
-
- /** {@inheritDoc} */
- @Override
- public Enumeration<URL> getResources(final String name) throws IOException
- {
- final ArrayList<Enumeration<URL>> foundResources = new ArrayList<Enumeration<URL>>();
-
- foundResources.add(delegate.getResources(name));
- if (parent != null)
- {
- foundResources.add(parent.getResources(name));
- }
-
- return new Enumeration<URL>()
- {
- private int position = foundResources.size() - 1;
-
- public boolean hasMoreElements()
- {
- while (position >= 0)
- {
- if (foundResources.get(position).hasMoreElements())
- {
- return true;
- }
- position--;
- }
- return false;
- }
-
- public URL nextElement()
- {
- while (position >= 0)
- {
- try
- {
- return (foundResources.get(position)).nextElement();
- }
- catch (NoSuchElementException e)
- {
- }
- position--;
- }
- throw new NoSuchElementException();
- }
- };
- }
-
- /** {@inheritDoc} */
- @Override
- public InputStream getResourceAsStream(final String name)
- {
- URL foundResource = getResource(name);
- if (foundResource != null)
- {
- try
- {
- return foundResource.openStream();
- }
- catch (IOException e)
- {
- }
- }
- return null;
- }
-}
\ No newline at end of file
Modified: stack/cxf/trunk/modules/client/src/test/java/org/jboss/wsf/stack/cxf/client/ProviderImplTest.java
===================================================================
--- stack/cxf/trunk/modules/client/src/test/java/org/jboss/wsf/stack/cxf/client/ProviderImplTest.java 2011-06-08 11:00:17 UTC (rev 14496)
+++ stack/cxf/trunk/modules/client/src/test/java/org/jboss/wsf/stack/cxf/client/ProviderImplTest.java 2011-06-08 11:03:32 UTC (rev 14497)
@@ -34,8 +34,8 @@
import junit.framework.TestCase;
+import org.jboss.ws.common.utils.DelegateClassLoader;
import org.jboss.wsf.stack.cxf.client.ProviderImpl.DelegateEndpointImpl;
-import org.jboss.wsf.stack.cxf.client.util.DelegateClassLoader;
import org.w3c.dom.Element;
/**
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2011-06-08 11:00:17 UTC (rev 14496)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2011-06-08 11:03:32 UTC (rev 14497)
@@ -32,11 +32,11 @@
import org.jboss.ws.api.binding.BindingCustomization;
import org.jboss.ws.common.integration.AbstractDeploymentAspect;
import org.jboss.ws.common.integration.WSConstants;
+import org.jboss.ws.common.utils.DelegateClassLoader;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.ResourceResolver;
import org.jboss.wsf.stack.cxf.client.configuration.JBossWSBusFactory;
-import org.jboss.wsf.stack.cxf.client.util.DelegateClassLoader;
import org.jboss.wsf.stack.cxf.configuration.BusHolder;
import org.jboss.wsf.stack.cxf.configuration.NonSpringBusHolder;
import org.jboss.wsf.stack.cxf.configuration.SpringBusHolder;
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/HelloWorldImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/HelloWorldImpl.java 2011-06-08 11:00:17 UTC (rev 14496)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/HelloWorldImpl.java 2011-06-08 11:03:32 UTC (rev 14497)
@@ -38,7 +38,7 @@
ClassLoader cl = Thread.currentThread().getContextClassLoader();
//JBWS-3223
//use check on class to avoid dependency declaration in MANIFEST for AS7
- if (cl.getClass().getName().equals("org.jboss.wsf.stack.cxf.client.util.DelegateClassLoader")) {
+ if (cl.getClass().getName().equals("org.jboss.ws.common.utils.DelegateClassLoader")) {
cl = cl.getParent();
}
return cl.toString() + cl.hashCode();
13 years, 7 months
JBossWS SVN: r14496 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-08 07:00:17 -0400 (Wed, 08 Jun 2011)
New Revision: 14496
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java
Log:
Reduce to INFO level the log message on Spring not available at deploy time
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2011-06-08 10:45:29 UTC (rev 14495)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2011-06-08 11:00:17 UTC (rev 14496)
@@ -76,7 +76,7 @@
}
else
{
- log.warn("Spring not available, skipping check for user provided jbossws-cxf.xml / cxf.xml configuration files.");
+ log.info("Spring not available, skipping check for user provided jbossws-cxf.xml / cxf.xml configuration files.");
generateMetadataFromDeployment(dep);
}
}
13 years, 7 months
JBossWS SVN: r14495 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-08 06:45:29 -0400 (Wed, 08 Jun 2011)
New Revision: 14495
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3257] Set system props required for deploying security domain when running ForkedMode tests too
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-06-08 10:45:02 UTC (rev 14494)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-06-08 10:45:29 UTC (rev 14495)
@@ -393,6 +393,14 @@
<value>${project.build.directory}</value>
</property>
<property>
+ <name>org.jboss.ws.testsuite.securityDomain.users.propfile</name>
+ <value>${project.build.directory}/test-classes/jbossws-users.properties</value>
+ </property>
+ <property>
+ <name>org.jboss.ws.testsuite.securityDomain.roles.propfile</name>
+ <value>${project.build.directory}/test-classes/jbossws-roles.properties</value>
+ </property>
+ <property>
<name>org.jboss.ws.wsse.keyStore</name>
<value>${test.resources.directory}/jaxws/samples/wssecurity/wsse.keystore</value>
</property>
13 years, 7 months
JBossWS SVN: r14494 - shared-testsuite/trunk/testsuite/src/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-08 06:45:02 -0400 (Wed, 08 Jun 2011)
New Revision: 14494
Modified:
shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
Log:
[JBWS-3257] Set system props required for deploying security domain when running bin dist too
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2011-06-08 10:11:33 UTC (rev 14493)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2011-06-08 10:45:02 UTC (rev 14494)
@@ -327,6 +327,7 @@
<include name="jndi.properties"/>
<include name="tst.policy"/>
<include name="log4j.xml"/>
+ <include name="jbossws-*.properties"/>
</fileset>
<filterset>
<filter token="jboss.bind.address" value="${node0}"/>
@@ -447,6 +448,8 @@
<sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/>
<sysproperty key="jmx.authentication.username" value="${jmx.authentication.username}"/>
<sysproperty key="jmx.authentication.password" value="${jmx.authentication.password}"/>
+ <sysproperty key="org.jboss.ws.testsuite.securityDomain.users.propfile" value="${tests.output.dir}/test-classes/jbossws-users.properties"/>
+ <sysproperty key="org.jboss.ws.testsuite.securityDomain.roles.propfile" value="${tests.output.dir}/test-classes/jbossws-roles.properties"/>
<sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/wsse.keystore"/>
<sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/wsse.truststore"/>
<sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/>
@@ -509,6 +512,8 @@
-->
<!-- HTTPS hostname wrong: should be <localhost> -->
<sysproperty key="org.jboss.security.ignoreHttpsHost" value="true"/>
+ <sysproperty key="org.jboss.ws.testsuite.securityDomain.users.propfile" value="${tests.output.dir}/test-classes/jbossws-users.properties"/>
+ <sysproperty key="org.jboss.ws.testsuite.securityDomain.roles.propfile" value="${tests.output.dir}/test-classes/jbossws-roles.properties"/>
<sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/wsse.keystore"/>
<sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/wsse.truststore"/>
<sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/>
13 years, 7 months
JBossWS SVN: r14493 - stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-client/main.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-08 06:11:33 -0400 (Wed, 08 Jun 2011)
New Revision: 14493
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml
Log:
[JBWS-3309] Also export classes, to avoid classloading issues
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml 2011-06-08 09:23:03 UTC (rev 14492)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml 2011-06-08 10:11:33 UTC (rev 14493)
@@ -31,7 +31,7 @@
<dependencies>
<!-- JAXB API + REF IMPL -->
<module name="javax.xml.bind.api" export="true"/>
- <module name="com.sun.xml.bind" services="export"/>
+ <module name="com.sun.xml.bind" export="true" services="export"/>
<module name="javax.xml.ws.api" />
<!-- JBossWS API -->
<module name="org.jboss.ws.api" export="true" />
13 years, 7 months
JBossWS SVN: r14492 - stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-client/main.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-08 05:23:03 -0400 (Wed, 08 Jun 2011)
New Revision: 14492
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml
Log:
[JBWS-3309] Re-export com.sun.xml.bind service
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml 2011-06-08 09:07:35 UTC (rev 14491)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml 2011-06-08 09:23:03 UTC (rev 14492)
@@ -31,7 +31,7 @@
<dependencies>
<!-- JAXB API + REF IMPL -->
<module name="javax.xml.bind.api" export="true"/>
- <module name="com.sun.xml.bind" services="import"/>
+ <module name="com.sun.xml.bind" services="export"/>
<module name="javax.xml.ws.api" />
<!-- JBossWS API -->
<module name="org.jboss.ws.api" export="true" />
13 years, 7 months
JBossWS SVN: r14491 - in stack/native/trunk/modules/testsuite: native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988 and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-08 05:07:35 -0400 (Wed, 08 Jun 2011)
New Revision: 14491
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2116/CertAuthTestCase.java
stack/native/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3257][JBWS-3308] Updating tests & exclusions
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase.java 2011-06-08 08:27:54 UTC (rev 14490)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase.java 2011-06-08 09:07:35 UTC (rev 14491)
@@ -21,8 +21,9 @@
*/
package org.jboss.test.ws.jaxws.jbws1988;
-import java.io.File;
import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
import javax.xml.namespace.QName;
import javax.xml.ws.BindingProvider;
@@ -47,7 +48,30 @@
public static Test suite() throws Exception
{
- return new JBossWSTestSetup(UsernameAuthTestCase.class, "jaxws-jbws1988-config.sar jaxws-jbws1988.jar");
+ JBossWSTestSetup testSetup;
+ if (!isTargetJBoss6())
+ {
+ testSetup = new JBossWSTestSetup(UsernameAuthTestCase.class, "jaxws-jbws1988.jar");
+ Map<String, String> authenticationOptions = new HashMap<String, String>();
+ authenticationOptions.put("usersProperties",
+ getResourceFile("jaxws/jbws1988/META-INF/jbossws-users.properties").getAbsolutePath());
+ authenticationOptions.put("rolesProperties",
+ getResourceFile("jaxws/jbws1988/META-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", "org.jboss.ws.extensions.security.auth.callback.UsernameTokenCallback");
+ authenticationOptions.put("unauthenticatedIdentity", "anonymous");
+ testSetup.addSecurityDomainRequirement("JBossWSDigest", authenticationOptions);
+ }
+ else
+ {
+ testSetup = new JBossWSTestSetup(UsernameAuthTestCase.class,
+ "jaxws-jbws1988-config.sar jaxws-jbws1988.jar");
+ }
+ return testSetup;
}
public void testAuth() throws Exception
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2116/CertAuthTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2116/CertAuthTestCase.java 2011-06-08 08:27:54 UTC (rev 14490)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2116/CertAuthTestCase.java 2011-06-08 09:07:35 UTC (rev 14491)
@@ -22,6 +22,8 @@
package org.jboss.test.ws.jaxws.jbws2116;
import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
import javax.xml.namespace.QName;
import javax.xml.ws.BindingProvider;
@@ -52,7 +54,24 @@
public static Test suite() throws Exception
{
- return new JBossWSTestSetup(CertAuthTestCase.class, "jaxws-jbws2116-config.sar jaxws-jbws2116.jar");
+ JBossWSTestSetup testSetup;
+ if (!isTargetJBoss6())
+ {
+ testSetup = new JBossWSTestSetup(CertAuthTestCase.class, "jaxws-jbws2116.jar");
+ Map<String, String> authenticationOptions = new HashMap<String, String>();
+ authenticationOptions.put("rolesProperties",
+ getResourceFile("jaxws/jbws2116/META-INF/jbossws-roles.properties").getAbsolutePath());
+ authenticationOptions.put("KeyStoreURL", "jaxws/jbws2116/META-INF/keystore.jks");
+ authenticationOptions.put("KeyStorePass", "password");
+ authenticationOptions.put("unauthenticatedIdentity", "anonymous");
+ testSetup.addSecurityDomainRequirement("JBossWSCert", authenticationOptions);
+ }
+ else
+ {
+ testSetup = new JBossWSTestSetup(CertAuthTestCase.class,
+ "jaxws-jbws2116-config.sar jaxws-jbws2116.jar");
+ }
+ return testSetup;
}
protected void setUp() throws Exception
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-06-08 08:27:54 UTC (rev 14490)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-06-08 09:07:35 UTC (rev 14491)
@@ -793,6 +793,7 @@
<!-- TODO: implement EJB security integration -->
<exclude>org/jboss/test/ws/jaxws/jbws1991/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1988/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase*</exclude>
<!-- TODO: Unexpected element 'class-loading' encountered -->
@@ -848,8 +849,7 @@
<!-- JAXR not available -->
<exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
- <!-- # [JBWS-3257] No class available with name 'org.jboss.security.plugins.JaasSecurityDomain' -->
- <exclude>org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase*</exclude>
+ <!-- # [JBWS-3308] Extends AS7 RemoteDeployer for supporting deployment of different security domains -->
<exclude>org/jboss/test/ws/jaxws/jbws2116/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude>
13 years, 7 months
JBossWS SVN: r14490 - shared-testsuite/trunk/testsuite/src/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-08 04:27:54 -0400 (Wed, 08 Jun 2011)
New Revision: 14490
Modified:
shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
Log:
Add jboss-annotations-api_1.1_spec* to classpath in bin distro testsuite
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2011-06-07 19:22:23 UTC (rev 14489)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2011-06-08 08:27:54 UTC (rev 14490)
@@ -214,6 +214,9 @@
<fileset dir="${jboss.home}/modules/javax/servlet/api/main/">
<include name="jboss-servlet-api_3.0_spec-*.jar"/>
</fileset>
+ <fileset dir="${jboss.home}/modules/javax/annotation/api/main/">
+ <include name="jboss-annotations-api_1.1_spec-*.jar"/>
+ </fileset>
</path>
<!--
13 years, 7 months
JBossWS SVN: r14489 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-06-07 15:22:23 -0400 (Tue, 07 Jun 2011)
New Revision: 14489
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
enabling bunch of tests
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-06-07 18:44:46 UTC (rev 14488)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-06-07 19:22:23 UTC (rev 14489)
@@ -979,6 +979,10 @@
<!--# [JBAS-8363] Virtual host issue in JBossWeb-->
<exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*</exclude>
+ <!-- # [JBAS-9188] Implement support for nested EJBs & WARs in .sar archives -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1854/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/jmstransport/**</exclude>
+
<!--# Seems MSFT interop. endpoints are down :(-->
<exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**</exclude>
@@ -1012,24 +1016,16 @@
<exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2934/**</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/jbws3026/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/benchmark/**</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/eardeployment/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase*</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/webservice/**/EJB3Bean*</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**/*EJB3TestCase*</exclude>
<exclude>org/jboss/test/ws/management/recording/**</exclude>
<exclude>org/jboss/test/ws/jaxws/cxf/bus/*EJB3*</exclude>
- <exclude>org/jboss/test/ws/jaxws/cxf/jbws3060/*EJB3*</exclude>
<exclude>org/jboss/test/ws/jaxws/cxf/logging/**</exclude>
<exclude>org/jboss/test/ws/projectGenerator/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase*</exclude>
@@ -1045,9 +1041,6 @@
<!-- # [JBWS-3225] jbossws console not yet available -->
<exclude>org/jboss/test/ws/console/**</exclude>
- <!-- # [JBAS-9188] Implement support for nested EJBs & WARs in .sar archives -->
- <exclude>org/jboss/test/ws/jaxws/jbws1854/**</exclude>
-
<!-- # [JBWS-3227] handlers config file not found on classpath -->
<exclude>org/jboss/test/ws/jaxws/jbws3034/**</exclude>
13 years, 7 months