JBossWS SVN: r14478 - 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-06 12:25:26 -0400 (Mon, 06 Jun 2011)
New Revision: 14478
Modified:
shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/DeployerJBoss6.java
shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java
Log:
[JBWS-3257] Adding security domain related methods to test deploy facilities
Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/DeployerJBoss6.java
===================================================================
--- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/DeployerJBoss6.java 2011-06-06 16:24:06 UTC (rev 14477)
+++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/DeployerJBoss6.java 2011-06-06 16:25:26 UTC (rev 14478)
@@ -19,6 +19,7 @@
package org.jboss.wsf.test;
import java.net.URL;
+import java.util.Map;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
@@ -59,4 +60,16 @@
{"java.net.URL"});
}
+ @Override
+ public void addSecurityDomain(String name, Map<String, String> authenticationOptions) throws Exception
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void removeSecurityDomain(String name) throws Exception
+ {
+ throw new UnsupportedOperationException();
+ }
+
}
Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
--- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2011-06-06 16:24:06 UTC (rev 14477)
+++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2011-06-06 16:25:26 UTC (rev 14478)
@@ -29,6 +29,7 @@
import java.net.URL;
import java.net.UnknownHostException;
import java.util.Hashtable;
+import java.util.Map;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
@@ -315,4 +316,14 @@
return testResourcesDir;
}
+
+ public static void addSecurityDomain(String name, Map<String,String> authenticationOptions) throws Exception
+ {
+ DEPLOYER.addSecurityDomain(name, authenticationOptions);
+ }
+
+ public static void removeSecurityDomain(String name) throws Exception
+ {
+ DEPLOYER.removeSecurityDomain(name);
+ }
}
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:24:06 UTC (rev 14477)
+++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2011-06-06 16:25:26 UTC (rev 14478)
@@ -26,7 +26,9 @@
import java.net.URL;
import java.net.URLClassLoader;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.StringTokenizer;
import javax.management.MBeanServerConnection;
@@ -49,9 +51,9 @@
// provide logging
private static Logger log = Logger.getLogger(JBossWSTestSetup.class);
- private JBossWSTestHelper delegate = new JBossWSTestHelper();
private String[] archives = new String[0];
private ClassLoader originalClassLoader;
+ private Map<String, Map<String, String>> securityDomains = new HashMap<String, Map<String,String>>();
public JBossWSTestSetup(Class<?> testClass, String archiveList)
{
@@ -72,22 +74,22 @@
public File getArchiveFile(String archive)
{
- return delegate.getArchiveFile(archive);
+ return JBossWSTestHelper.getArchiveFile(archive);
}
public URL getArchiveURL(String archive) throws MalformedURLException
{
- return delegate.getArchiveFile(archive).toURI().toURL();
+ return JBossWSTestHelper.getArchiveFile(archive).toURI().toURL();
}
public File getResourceFile(String resource)
{
- return delegate.getResourceFile(resource);
+ return JBossWSTestHelper.getResourceFile(resource);
}
public URL getResourceURL(String resource) throws MalformedURLException
{
- return delegate.getResourceFile(resource).toURI().toURL();
+ return JBossWSTestHelper.getResourceFile(resource).toURI().toURL();
}
private void getArchiveArray(String archiveList)
@@ -105,8 +107,16 @@
protected void setUp() throws Exception
{
// verify integration target
- String integrationTarget = delegate.getIntegrationTarget();
+ String integrationTarget = JBossWSTestHelper.getIntegrationTarget();
log.debug("Integration target: " + integrationTarget);
+
+ if (!securityDomains.isEmpty())
+ {
+ for (String key : securityDomains.keySet())
+ {
+ JBossWSTestHelper.addSecurityDomain(key, securityDomains.get(key));
+ }
+ }
List<URL> clientJars = new ArrayList<URL>();
for (int i = 0; i < archives.length; i++)
@@ -114,12 +124,12 @@
String archive = archives[i];
try
{
- delegate.deploy(archive);
+ JBossWSTestHelper.deploy(archive);
}
catch (Exception ex)
{
ex.printStackTrace();
- delegate.undeploy(archive);
+ JBossWSTestHelper.undeploy(archive);
}
if (archive.endsWith("-client.jar"))
@@ -151,12 +161,20 @@
for (int i = 0; i < archives.length; i++)
{
String archive = archives[archives.length - i - 1];
- delegate.undeploy(archive);
+ JBossWSTestHelper.undeploy(archive);
}
}
finally
{
Thread.currentThread().setContextClassLoader(originalClassLoader);
+
+ if (!securityDomains.isEmpty())
+ {
+ for (String key : securityDomains.keySet())
+ {
+ JBossWSTestHelper.removeSecurityDomain(key);
+ }
+ }
}
}
@@ -169,4 +187,9 @@
{
return JBossWSTestHelper.getServer();
}
+
+ public void addSecurityDomainRequirement(String securityDomainName, Map<String, String> authenticationOptions)
+ {
+ securityDomains.put(securityDomainName, authenticationOptions);
+ }
}
12 years, 11 months
JBossWS SVN: r14477 - spi/trunk/src/main/java/org/jboss/wsf/spi/deployer.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-06 12:24:06 -0400 (Mon, 06 Jun 2011)
New Revision: 14477
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/deployer/Deployer.java
Log:
[JBWS-3257] Adding security domain related methods
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployer/Deployer.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployer/Deployer.java 2011-06-06 16:04:41 UTC (rev 14476)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployer/Deployer.java 2011-06-06 16:24:06 UTC (rev 14477)
@@ -19,6 +19,7 @@
package org.jboss.wsf.spi.deployer;
import java.net.URL;
+import java.util.Map;
import org.jboss.wsf.spi.SPIView;
@@ -41,4 +42,19 @@
* @throws Exception if some problem occurs
*/
void undeploy(URL archive) throws Exception;
+
+ /**
+ * Adds a new security domain
+ *
+ * @param name
+ * @param authenticationOptions
+ */
+ void addSecurityDomain(String name, Map<String,String> authenticationOptions) throws Exception;
+
+ /**
+ * Removes a security domain
+ *
+ * @param name
+ */
+ void removeSecurityDomain(String name) throws Exception;
}
12 years, 11 months
JBossWS SVN: r14476 - stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-06 12:04:41 -0400 (Mon, 06 Jun 2011)
New Revision: 14476
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
Log:
Adding dependency on Picketbox (AS7)
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2011-06-06 16:01:33 UTC (rev 14475)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2011-06-06 16:04:41 UTC (rev 14476)
@@ -56,6 +56,7 @@
<module name="org.jboss.common-core" />
<module name="org.jboss.logging" />
<module name="org.apache.ws.security" />
+ <module name="org.picketbox" />
<module name="org.springframework.spring" optional="true" />
</dependencies>
</module>
12 years, 11 months
JBossWS SVN: r14475 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-06 12:01:33 -0400 (Mon, 06 Jun 2011)
New Revision: 14475
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreator.java
Log:
[JBWS-3307] Remove dependency on JBossXB in SubjectCreator
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreator.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreator.java 2011-06-06 16:00:20 UTC (rev 14474)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreator.java 2011-06-06 16:01:33 UTC (rev 14475)
@@ -36,7 +36,6 @@
import org.jboss.wsf.spi.security.SecurityDomainContext;
import org.jboss.wsf.stack.cxf.security.authentication.callback.UsernameTokenCallbackHandler;
import org.jboss.wsf.stack.cxf.security.nonce.NonceStore;
-import org.jboss.xb.binding.SimpleTypeBindings;
/**
* Creates Subject instances after having authenticated / authorized the provided
@@ -130,7 +129,7 @@
{
if (created != null)
{
- Calendar cal = SimpleTypeBindings.unmarshalDateTime(created);
+ Calendar cal = unmarshalDateTime(created);
Calendar ref = Calendar.getInstance();
ref.add(Calendar.SECOND, -timestampThreshold);
if (ref.after(cal))
@@ -165,5 +164,148 @@
{
this.decodeNonce = decodeNonce;
}
+
+ private static Calendar unmarshalDateTime(String value)
+ {
+ Calendar cal = Calendar.getInstance();
+ cal.clear();
+ int timeInd = parseDate(value, 0, cal);
+ if (value.charAt(timeInd) != 'T')
+ {
+ throw new IllegalArgumentException(
+ "DateTime value does not follow the format '[-]yyyy-mm-ddThh:mm:ss[.s+][timezone]': expected 'T' but got "
+ + value.charAt(timeInd));
+ }
+
+ int tzStart = parseTime(value, timeInd + 1, cal);
+
+ TimeZone tz = null;
+ if (value.length() > tzStart)
+ {
+ tz = parseTimeZone(value, tzStart);
+ }
+
+ if (tz != null)
+ {
+ cal.setTimeZone(tz);
+ }
+
+ return cal;
+ }
+
+ private static int parseDate(String value, int start, Calendar cal)
+ {
+ if (value.charAt(start) == '-')
+ {
+ ++start;
+ }
+
+ if (!Character.isDigit(value.charAt(start)))
+ {
+ throw new IllegalArgumentException("Date value does not follow the format '-'? yyyy '-' mm '-' dd: " + value);
+ }
+
+ int nextToken = value.indexOf('-', start);
+ if (nextToken == -1 || nextToken - start < 4)
+ {
+ throw new IllegalArgumentException("Date value does not follow the format '-'? yyyy '-' mm '-' dd: " + value);
+ }
+
+ int year = Integer.parseInt(value.substring(start, nextToken));
+
+ start = nextToken + 1;
+ nextToken = value.indexOf('-', start);
+ if (nextToken == -1 || nextToken - start < 2)
+ {
+ throw new IllegalArgumentException("Date value does not follow the format '-'? yyyy '-' mm '-' dd: " + value);
+ }
+
+ int month = Integer.parseInt(value.substring(start, nextToken));
+
+ start = nextToken + 1;
+ nextToken += 3;
+ int day = Integer.parseInt(value.substring(start, nextToken));
+
+ cal.set(Calendar.YEAR, year);
+ cal.set(Calendar.MONTH, month - 1);
+ cal.set(Calendar.DAY_OF_MONTH, day);
+
+ return nextToken;
+ }
+
+ private static int parseTime(String value, int start, Calendar cal)
+ {
+ if (value.charAt(start + 2) != ':' || value.charAt(start + 5) != ':')
+ {
+ throw new IllegalArgumentException("Time value does not follow the format 'hh:mm:ss.[s+]': " + value);
+ }
+
+ int hh = Integer.parseInt(value.substring(start, start + 2));
+ int mm = Integer.parseInt(value.substring(start + 3, start + 5));
+ int ss = Integer.parseInt(value.substring(start + 6, start + 8));
+
+ int millis = 0;
+
+ int x = start + 8;
+
+ if (value.length() > x && value.charAt(x) == '.')
+ {
+ int mul = 100;
+ for (x += 1; x < value.length(); x++)
+ {
+ char c = value.charAt(x);
+
+ if (Character.isDigit(c))
+ {
+ if (mul != 0)
+ {
+ millis += Character.digit(c, 10) * mul;
+ mul = (mul == 1) ? 0 : mul / 10;
+ }
+ }
+ else
+ {
+ break;
+ }
+ }
+ }
+
+ cal.set(Calendar.HOUR_OF_DAY, hh);
+ cal.set(Calendar.MINUTE, mm);
+ cal.set(Calendar.SECOND, ss);
+ cal.set(Calendar.MILLISECOND, millis);
+
+ return x;
+ }
+
+ private static TimeZone parseTimeZone(String value, int start)
+ {
+ TimeZone tz;
+ if (value.charAt(start) == '+' || (value.charAt(start) == '-'))
+ {
+ if (value.length() - start == 6 && Character.isDigit(value.charAt(start + 1))
+ && Character.isDigit(value.charAt(start + 2)) && value.charAt(start + 3) == ':'
+ && Character.isDigit(value.charAt(start + 4)) && Character.isDigit(value.charAt(start + 5)))
+ {
+ tz = TimeZone.getTimeZone("GMT" + value.substring(start));
+ }
+ else
+ {
+ throw new NumberFormatException("Timezone value does not follow the format ([+/-]HH:MM): "
+ + value.substring(start));
+ }
+ }
+ else if (value.charAt(start) == 'Z')
+ {
+ tz = TimeZone.getTimeZone("GMT");
+ }
+ else
+ {
+ throw new NumberFormatException("Timezone value does not follow the format ([+/-]HH:MM): "
+ + value.substring(start));
+ }
+ return tz;
+ }
+
}
12 years, 11 months
JBossWS SVN: r14474 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-06 12:00:20 -0400 (Mon, 06 Jun 2011)
New Revision: 14474
Added:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SecurityActions.java
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreator.java
Log:
[JBWS-3302][JBWS-3257] Setup TCCL before trying digest based authentication to allow PicketBox seeing JBWS classes on AS7
Added: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SecurityActions.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SecurityActions.java (rev 0)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SecurityActions.java 2011-06-06 16:00:20 UTC (rev 14474)
@@ -0,0 +1,82 @@
+/*
+ * 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.security.authentication;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 22-Feb-2011
+ *
+ */
+class SecurityActions
+{
+ /**
+ * Get context classloader.
+ *
+ * @return the current context classloader
+ */
+ static ClassLoader getContextClassLoader()
+ {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm == null)
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ else
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
+ public ClassLoader run()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+ }
+ }
+
+ /**
+ * Set context classloader.
+ *
+ * @param classLoader the classloader
+ */
+ static void setContextClassLoader(final ClassLoader classLoader)
+ {
+ if (System.getSecurityManager() == null)
+ {
+ Thread.currentThread().setContextClassLoader(classLoader);
+ }
+ else
+ {
+ AccessController.doPrivileged(new PrivilegedAction<Object>()
+ {
+ public Object run()
+ {
+ Thread.currentThread().setContextClassLoader(classLoader);
+ return null;
+ }
+ });
+ }
+ }
+
+}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreator.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreator.java 2011-06-06 12:54:39 UTC (rev 14473)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreator.java 2011-06-06 16:00:20 UTC (rev 14474)
@@ -23,6 +23,7 @@
import java.security.Principal;
import java.util.Calendar;
+import java.util.TimeZone;
import javax.security.auth.Subject;
import javax.security.auth.callback.CallbackHandler;
@@ -30,6 +31,8 @@
import org.apache.cxf.common.security.SimplePrincipal;
import org.jboss.logging.Logger;
import org.jboss.security.auth.callback.CallbackHandlerPolicyContextHandler;
+import org.jboss.ws.common.utils.DelegateClassLoader;
+import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
import org.jboss.wsf.spi.security.SecurityDomainContext;
import org.jboss.wsf.stack.cxf.security.authentication.callback.UsernameTokenCallbackHandler;
import org.jboss.wsf.stack.cxf.security.nonce.NonceStore;
@@ -84,12 +87,22 @@
try
{
- if (ctx.isValid(principal, password, subject) == false)
+ ClassLoader tccl = SecurityActions.getContextClassLoader();
+ //allow PicketBox to see jbossws modules' classes
+ SecurityActions.setContextClassLoader(new DelegateClassLoader(ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader(), tccl));
+ try
{
- String msg = "Authentication failed, principal=" + principal.getName();
- log.error(msg);
- throw new SecurityException(msg);
+ if (ctx.isValid(principal, password, subject) == false)
+ {
+ String msg = "Authentication failed, principal=" + principal.getName();
+ log.error(msg);
+ throw new SecurityException(msg);
+ }
}
+ finally
+ {
+ SecurityActions.setContextClassLoader(tccl);
+ }
}
finally
{
12 years, 11 months
JBossWS SVN: r14473 - in stack/native/branches/jbossws-native-3.1.2/modules: testsuite and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-06-06 08:54:39 -0400 (Mon, 06 Jun 2011)
New Revision: 14473
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/HTTPMessageImpl.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/test-excludes-jboss510.txt
Log:
[JBPAPP-6593] always cache stream before connection is closed
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/HTTPMessageImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/HTTPMessageImpl.java 2011-06-06 10:32:10 UTC (rev 14472)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/HTTPMessageImpl.java 2011-06-06 12:54:39 UTC (rev 14473)
@@ -21,6 +21,8 @@
*/
package org.jboss.ws.core;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -32,8 +34,10 @@
import javax.xml.transform.stream.StreamSource;
import org.jboss.util.NotImplementedException;
+import org.jboss.ws.WSException;
import org.jboss.ws.core.soap.XMLFragment;
import org.jboss.ws.core.soap.attachment.MimeConstants;
+import org.jboss.wsf.common.IOUtils;
/**
* A generic HTTP message
@@ -49,9 +53,24 @@
public HTTPMessageImpl(MimeHeaders mimeHeaders, InputStream inputStream)
{
this.mimeHeaders = mimeHeaders;
- this.xmlFragment = new XMLFragment(new StreamSource(inputStream));
+ this.xmlFragment = new XMLFragment(new StreamSource(cache(inputStream)));
}
+ private static InputStream cache(final InputStream is)
+ {
+ try
+ {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
+ IOUtils.copyStream(baos, is);
+ byte[] bytes = baos.toByteArray();
+ return new ByteArrayInputStream(bytes);
+ }
+ catch (IOException e)
+ {
+ throw new WSException(e);
+ }
+ }
+
public HTTPMessageImpl(Source source)
{
this.mimeHeaders = new MimeHeaders();
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/test-excludes-jboss510.txt 2011-06-06 10:32:10 UTC (rev 14472)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/test-excludes-jboss510.txt 2011-06-06 12:54:39 UTC (rev 14473)
@@ -7,6 +7,3 @@
# [JBWS-2217] Fix BPEL jaxrpc samples
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
-# [JBPAPP-6593]:java.io.IOException: stream is closed issue in jboss-remoting-2.5.4.SP1
-org/jboss/test/ws/jaxws/jbws1807/JBWS1807TestCase.*
-org/jboss/test/ws/jaxws/samples/httpbinding/*TestCase.*
12 years, 11 months
JBossWS SVN: r14472 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-06 06:32:10 -0400 (Mon, 06 Jun 2011)
New Revision: 14472
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-2941] Adding exclusions to remov log depndency clashes
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-06-06 08:50:54 UTC (rev 14471)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-06-06 10:32:10 UTC (rev 14472)
@@ -116,6 +116,16 @@
<groupId>org.littleshoot</groupId>
<artifactId>littleproxy</artifactId>
<version>0.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
12 years, 11 months
JBossWS SVN: r14471 - stack/native/trunk/modules/dist/src/main/scripts.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-06 04:50:54 -0400 (Mon, 06 Jun 2011)
New Revision: 14471
Modified:
stack/native/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml
Log:
Add helper classes to bin dist
Modified: stack/native/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/native/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml 2011-06-06 08:50:24 UTC (rev 14470)
+++ stack/native/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml 2011-06-06 08:50:54 UTC (rev 14471)
@@ -96,6 +96,7 @@
<includes>
<include>ant-import/**</include>
<include>java/org/jboss/test/ws/console/**</include>
+ <include>java/org/jboss/test/helper/**</include>
<include>java/org/jboss/test/ws/jaxrpc/samples/**</include>
<include>java/org/jboss/test/ws/jaxws/samples/**</include>
<include>java/org/jboss/test/ws/jaxws/smoke/**</include>
12 years, 11 months
JBossWS SVN: r14470 - stack/cxf/trunk/modules/dist/src/main/scripts.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-06 04:50:24 -0400 (Mon, 06 Jun 2011)
New Revision: 14470
Modified:
stack/cxf/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml
Log:
Add helper classes to bin dist
Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml 2011-06-06 07:02:52 UTC (rev 14469)
+++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml 2011-06-06 08:50:24 UTC (rev 14470)
@@ -94,6 +94,7 @@
<unpackOptions>
<includes>
<include>ant-import/**</include>
+ <include>java/org/jboss/test/helper/**</include>
<include>java/org/jboss/test/ws/console/**</include>
<include>java/org/jboss/test/ws/jaxrpc/samples/**</include>
<include>java/org/jboss/test/ws/jaxws/samples/**</include>
12 years, 11 months
JBossWS SVN: r14469 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-06 03:02:52 -0400 (Mon, 06 Jun 2011)
New Revision: 14469
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-2941] Enabling tests
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-06-04 10:37:17 UTC (rev 14468)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-06-06 07:02:52 UTC (rev 14469)
@@ -112,6 +112,11 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.littleshoot</groupId>
+ <artifactId>littleproxy</artifactId>
+ <version>0.4</version>
+ </dependency>
</dependencies>
<!-- Build -->
@@ -651,12 +656,6 @@
<execution>
<id>default-testCompile</id>
<phase>test-compile</phase>
- <configuration>
- <testExcludes>
- <!-- # [JBWS-2941] HTTP Proxy authentication for JBossWS Web Service clients -->
- <exclude>org/jboss/test/ws/jaxws/cxf/httpproxy/**</exclude>
- </testExcludes>
- </configuration>
<goals>
<goal>testCompile</goal>
</goals>
@@ -806,12 +805,6 @@
<execution>
<id>default-testCompile</id>
<phase>test-compile</phase>
- <configuration>
- <testExcludes>
- <!-- # [JBWS-2941] HTTP Proxy authentication for JBossWS Web Service clients -->
- <exclude>org/jboss/test/ws/jaxws/cxf/httpproxy/**</exclude>
- </testExcludes>
- </configuration>
<goals>
<goal>testCompile</goal>
</goals>
@@ -925,8 +918,6 @@
<exclude>org/jboss/test/ws/jaxws/samples/securityDomain/**</exclude>
<!-- @SecurityDomain missing -->
<exclude>org/jboss/test/ws/jaxws/samples/wsseEJB/EjbEndpointImpl*</exclude>
- <!-- # [JBWS-2941] HTTP Proxy authentication for JBossWS Web Service clients -->
- <exclude>org/jboss/test/ws/jaxws/cxf/httpproxy/**</exclude>
</testExcludes>
</configuration>
<goals>
@@ -1055,9 +1046,6 @@
<!-- # [JBWS-3249] Restore UsernameAuthorizationCustomFileTestCase on AS7 -->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase*</exclude>
- <!-- # [JBWS-2941] HTTP Proxy authentication for JBossWS Web Service clients -->
- <exclude>org/jboss/test/ws/jaxws/cxf/httpproxy/**</exclude>
-
<!-- # [JBWS-3306] No XPathFactory implementation found by a JAXWS client on AS7 -->
<exclude>org/jboss/test/ws/jaxws/samples/exception/ExceptionServletTestCase*</exclude>
12 years, 11 months