JBossWS SVN: r7171 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-26 08:31:46 -0400 (Mon, 26 May 2008)
New Revision: 7171
Modified:
stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
[JBAS-5387] EJB21 name not bound
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-26 12:26:55 UTC (rev 7170)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-26 12:31:46 UTC (rev 7171)
@@ -48,9 +48,6 @@
org/jboss/test/ws/jaxrpc/jbws1762/**
org/jboss/test/ws/jaxws/jbws1762/**
-# [JBAS-5387] EJB21 name not bound
-org/jboss/test/ws/jaxrpc/jbws331/**
-
# [JBAS-5388] JBossXBRuntimeException: Missing value for the required attribute
org/jboss/test/ws/jaxrpc/jbws720/**
16 years, 7 months
JBossWS SVN: r7170 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-05-26 08:26:55 -0400 (Mon, 26 May 2008)
New Revision: 7170
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
Log:
[JBWS-1907] Preventing NPE
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2008-05-26 11:46:34 UTC (rev 7169)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2008-05-26 12:26:55 UTC (rev 7170)
@@ -100,7 +100,7 @@
SecurityStore securityStore = new SecurityStore(configuration.getKeyStoreURL(), configuration.getKeyStoreType(), configuration.getKeyStorePassword(),
configuration.getKeyPasswords(), configuration.getTrustStoreURL(), configuration.getTrustStoreType(), configuration.getTrustStorePassword());
NonceFactory factory = Util.loadFactory(NonceFactory.class, configuration.getNonceFactory(), DefaultNonceFactory.class);
- SecurityDecoder decoder = new SecurityDecoder(securityStore, factory, configuration.getTimestampVerification(), config.getAuthenticate());
+ SecurityDecoder decoder = new SecurityDecoder(securityStore, factory, configuration.getTimestampVerification(), config == null ? null : config.getAuthenticate());
decoder.decode(message.getSOAPPart(), secHeaderElement);
16 years, 7 months
JBossWS SVN: r7169 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-05-26 07:46:34 -0400 (Mon, 26 May 2008)
New Revision: 7169
Modified:
stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
[JBWS-1907][JBWS-2116] Re-enable tests
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt 2008-05-26 11:43:02 UTC (rev 7168)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt 2008-05-26 11:46:34 UTC (rev 7169)
@@ -27,6 +27,3 @@
# [JBWS-2175] wsconsume cannot run with jaxws-api from build output
org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.*
-
-# [JBWS-1907] Authorization based on certificate used for wsse signature
-org/jboss/test/ws/jaxws/jbws2116/**
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-26 11:43:02 UTC (rev 7168)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-26 11:46:34 UTC (rev 7169)
@@ -37,6 +37,3 @@
# [JBWS-2175] wsconsume cannot run with jaxws-api from build output
org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.*
-
-# [JBWS-1907] Authorization based on certificate used for wsse signature
-org/jboss/test/ws/jaxws/jbws2116/**
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-05-26 11:43:02 UTC (rev 7168)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-05-26 11:46:34 UTC (rev 7169)
@@ -20,6 +20,3 @@
# [JBWS-2175] wsconsume cannot run with jaxws-api from build output
org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.*
-
-# [JBWS-1907] Authorization based on certificate used for wsse signature
-org/jboss/test/ws/jaxws/jbws2116/**
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-05-26 11:43:02 UTC (rev 7168)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-05-26 11:46:34 UTC (rev 7169)
@@ -34,6 +34,3 @@
# [JBWS-2175] wsconsume cannot run with jaxws-api from build output
org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.*
-
-# [JBWS-1907] Authorization based on certificate used for wsse signature
-org/jboss/test/ws/jaxws/jbws2116/**
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-26 11:43:02 UTC (rev 7168)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-26 11:46:34 UTC (rev 7169)
@@ -74,6 +74,3 @@
# [EJBTHREE-1377] Callback objects are improperly setup - ServiceRefMetaData.getServiceInterface() returns null
org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.*
-
-# [JBWS-1907] Authorization based on certificate used for wsse signature
-org/jboss/test/ws/jaxws/jbws2116/**
16 years, 7 months
JBossWS SVN: r7168 - stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2116/META-INF.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-05-26 07:43:02 -0400 (Mon, 26 May 2008)
New Revision: 7168
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2116/META-INF/jboss-wsse-server.xml
Log:
[JBWS-2116][JBWS-1907] Adding authentication tag to the test config
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2116/META-INF/jboss-wsse-server.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2116/META-INF/jboss-wsse-server.xml 2008-05-26 11:41:28 UTC (rev 7167)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2116/META-INF/jboss-wsse-server.xml 2008-05-26 11:43:02 UTC (rev 7168)
@@ -12,5 +12,8 @@
<requires>
<signature/>
</requires>
+ <authenticate>
+ <signatureCertAuth certificatePrincipal="org.jboss.security.auth.certs.SubjectCNMapping"/>
+ </authenticate>
</config>
</jboss-ws-security>
\ No newline at end of file
16 years, 7 months
JBossWS SVN: r7167 - in stack/native/trunk/modules: core/src/main/java/org/jboss/ws/extensions/security/element and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-05-26 07:41:28 -0400 (Mon, 26 May 2008)
New Revision: 7167
Added:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/ReceiveX509Certificate.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsse/Authenticate.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsse/SignatureCertAuth.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsse/UsernameAuth.java
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/KeyResolver.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityDecoder.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/element/Signature.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsse/Config.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java
stack/native/trunk/modules/core/src/main/resources/schema/jboss-ws-security_1_0.xsd
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SunInteropTestCase.java
Log:
[JBWS-1907][JBWS-652] JAAS certificate auth support for wsse
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/KeyResolver.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/KeyResolver.java 2008-05-26 11:24:42 UTC (rev 7166)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/KeyResolver.java 2008-05-26 11:41:28 UTC (rev 7167)
@@ -94,7 +94,7 @@
return resolveX509IssuerSerial(issuerSerial);
}
- throw new NotImplementedException("Currently only DirectReference is supported!");
+ throw new NotImplementedException("Currently only DirectReference, KeyIdentifier and X509IssuerSerial are supported!");
}
private BinarySecurityToken resolveDirectReference(DirectReference direct) throws WSSecurityException
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityDecoder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityDecoder.java 2008-05-26 11:24:42 UTC (rev 7166)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityDecoder.java 2008-05-26 11:41:28 UTC (rev 7167)
@@ -37,11 +37,13 @@
import org.jboss.ws.extensions.security.nonce.NonceFactory;
import org.jboss.ws.extensions.security.operation.DecryptionOperation;
import org.jboss.ws.extensions.security.operation.ReceiveUsernameOperation;
+import org.jboss.ws.extensions.security.operation.ReceiveX509Certificate;
import org.jboss.ws.extensions.security.operation.RequireEncryptionOperation;
import org.jboss.ws.extensions.security.operation.RequireOperation;
import org.jboss.ws.extensions.security.operation.RequireSignatureOperation;
import org.jboss.ws.extensions.security.operation.SignatureVerificationOperation;
import org.jboss.ws.extensions.security.operation.TimestampVerificationOperation;
+import org.jboss.ws.metadata.wsse.Authenticate;
import org.jboss.ws.metadata.wsse.TimestampVerification;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -65,17 +67,20 @@
private SecurityStore store;
private TimestampVerification timestampVerification;
+
+ private Authenticate authenticate;
private HashSet<String> signedIds = new HashSet<String>();
private HashSet<String> encryptedIds = new HashSet<String>();
- public SecurityDecoder(SecurityStore store, NonceFactory nonceFactory, TimestampVerification timestampVerification)
+ public SecurityDecoder(SecurityStore store, NonceFactory nonceFactory, TimestampVerification timestampVerification, Authenticate authenticate)
{
org.apache.xml.security.Init.init();
this.store = store;
this.nonceFactory = nonceFactory;
this.timestampVerification = timestampVerification;
+ this.authenticate = authenticate;
}
/**
@@ -85,9 +90,9 @@
* @param SecurityStore the security store that contains key and trust information
* @param now The timestamp to use as the current time when validating a message expiration
*/
- public SecurityDecoder(SecurityStore store, Calendar now, NonceFactory nonceFactory, TimestampVerification timestampVerification)
+ public SecurityDecoder(SecurityStore store, Calendar now, NonceFactory nonceFactory, TimestampVerification timestampVerification, Authenticate authenticate)
{
- this(store, nonceFactory, timestampVerification);
+ this(store, nonceFactory, timestampVerification, authenticate);
this.now = now;
}
@@ -118,10 +123,13 @@
operation.process(message, timestamp);
}
- for (Token token : header.getTokens())
+ if (authenticate == null || authenticate.isUsernameAuth())
{
- if (token instanceof UsernameToken)
- new ReceiveUsernameOperation(header, store, (nonceFactory != null ? nonceFactory.getStore() : null)).process(message, token);
+ for (Token token : header.getTokens())
+ {
+ if (token instanceof UsernameToken)
+ new ReceiveUsernameOperation(header, store, (nonceFactory != null ? nonceFactory.getStore() : null)).process(message, token);
+ }
}
signedIds.clear();
@@ -135,9 +143,12 @@
// If this list gets much larger it should probably be a hash lookup
if (process instanceof Signature)
{
- Collection<String> ids = signatureVerifier.process(message, process);
+ Signature signature = (Signature)process;
+ Collection<String> ids = signatureVerifier.process(message, signature);
if (ids != null)
signedIds.addAll(ids);
+ if (authenticate != null && authenticate.isSignatureCertAuth())
+ new ReceiveX509Certificate(authenticate.getSignatureCertAuth().getCertificatePrincipal()).process(message, signature.getSecurityToken());
}
else if (process instanceof EncryptedKey)
{
@@ -146,6 +157,8 @@
encryptedIds.addAll(ids);
}
}
+
+
}
public void verify(List<RequireOperation> requireOperations) throws WSSecurityException
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2008-05-26 11:24:42 UTC (rev 7166)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2008-05-26 11:41:28 UTC (rev 7167)
@@ -100,7 +100,7 @@
SecurityStore securityStore = new SecurityStore(configuration.getKeyStoreURL(), configuration.getKeyStoreType(), configuration.getKeyStorePassword(),
configuration.getKeyPasswords(), configuration.getTrustStoreURL(), configuration.getTrustStoreType(), configuration.getTrustStorePassword());
NonceFactory factory = Util.loadFactory(NonceFactory.class, configuration.getNonceFactory(), DefaultNonceFactory.class);
- SecurityDecoder decoder = new SecurityDecoder(securityStore, factory, configuration.getTimestampVerification());
+ SecurityDecoder decoder = new SecurityDecoder(securityStore, factory, configuration.getTimestampVerification(), config.getAuthenticate());
decoder.decode(message.getSOAPPart(), secHeaderElement);
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/element/Signature.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/element/Signature.java 2008-05-26 11:24:42 UTC (rev 7166)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/element/Signature.java 2008-05-26 11:41:28 UTC (rev 7167)
@@ -25,6 +25,7 @@
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.signature.XMLSignature;
+import org.jboss.logging.Logger;
import org.jboss.ws.extensions.security.KeyResolver;
import org.jboss.ws.extensions.security.exception.WSSecurityException;
import org.w3c.dom.Element;
@@ -36,10 +37,13 @@
*/
public class Signature implements SecurityProcess
{
+ private static Logger log = Logger.getLogger(Signature.class);
private XMLSignature signature;
/* Used only for decoding */
private PublicKey publicKey;
+ /* Used only for jaas authentication */
+ private BinarySecurityToken securityToken;
private Element cachedElement;
@@ -54,6 +58,15 @@
{
signature = new XMLSignature(element, null);
publicKey = resolver.resolvePublicKey(signature.getKeyInfo());
+ try
+ {
+ securityToken = resolver.resolve(signature.getKeyInfo());
+ }
+ catch (Exception e)
+ {
+ //log exception and ignore, KeyInfo might not reference a security token
+ log.debug("KeyInfo does not contain any reference to a binary security token.", e);
+ }
}
catch (XMLSecurityException e)
{
@@ -84,4 +97,9 @@
{
return publicKey;
}
+
+ public BinarySecurityToken getSecurityToken()
+ {
+ return securityToken;
+ }
}
\ No newline at end of file
Added: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/ReceiveX509Certificate.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/ReceiveX509Certificate.java (rev 0)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/ReceiveX509Certificate.java 2008-05-26 11:41:28 UTC (rev 7167)
@@ -0,0 +1,87 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.ws.extensions.security.operation;
+
+import java.security.Principal;
+import java.security.cert.X509Certificate;
+
+import org.jboss.logging.Logger;
+import org.jboss.security.CertificatePrincipal;
+import org.jboss.security.auth.certs.SubjectCNMapping;
+import org.jboss.security.auth.certs.SubjectDNMapping;
+import org.jboss.ws.extensions.security.element.Token;
+import org.jboss.ws.extensions.security.element.X509Token;
+import org.jboss.ws.extensions.security.exception.WSSecurityException;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.invocation.SecurityAdaptor;
+import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory;
+import org.w3c.dom.Document;
+
+/**
+ * This is used for X509Certificate JAAS authentication
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 24-May-2008
+ */
+public class ReceiveX509Certificate implements TokenOperation
+{
+ private static Logger log = Logger.getLogger(ReceiveX509Certificate.class);
+ private SecurityAdaptorFactory secAdapterfactory;
+ private CertificatePrincipal certMapping;
+
+ public ReceiveX509Certificate(String certificatePrincipal)
+ {
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ secAdapterfactory = spiProvider.getSPI(SecurityAdaptorFactory.class);
+ if (certificatePrincipal != null && !certificatePrincipal.equals(""))
+ {
+ try
+ {
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ Class<?> cpClass = loader.loadClass(certificatePrincipal);
+ certMapping = (CertificatePrincipal) cpClass.newInstance();
+ }
+ catch (Exception e)
+ {
+ log.error("Failed to load CertificatePrincipal '" + certificatePrincipal + "', using default SubjectDNMapping.", e);
+ }
+ }
+ if (certMapping == null)
+ certMapping = new SubjectDNMapping();
+ }
+
+ public void process(Document message, Token token) throws WSSecurityException
+ {
+ if (token == null || !(token instanceof X509Token))
+ {
+ throw new IllegalArgumentException("Token " + token + " is not a X509Token!");
+ }
+ X509Certificate cert = ((X509Token)token).getCert();
+ Principal principal = certMapping.toPrinicipal(new X509Certificate[] { cert });
+ SecurityAdaptor securityAdaptor = secAdapterfactory.newSecurityAdapter();
+ securityAdaptor.setPrincipal(principal);
+ securityAdaptor.setCredential(cert);
+
+ }
+
+}
Property changes on: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/ReceiveX509Certificate.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsse/Authenticate.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsse/Authenticate.java (rev 0)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsse/Authenticate.java 2008-05-26 11:41:28 UTC (rev 7167)
@@ -0,0 +1,68 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.ws.metadata.wsse;
+
+import java.io.Serializable;
+
+/**
+ * <code>Authenticate</code> specifies the token to be used for JAAS authentication.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 26-May-2008
+ */
+public class Authenticate implements Serializable
+{
+ private static final long serialVersionUID = -1338421514796889714L;
+
+ private UsernameAuth usernameAuth;
+ private SignatureCertAuth signatureCertAuth;
+
+ public UsernameAuth getUsernameAuth()
+ {
+ return usernameAuth;
+ }
+
+ public void setUsernameAuth(UsernameAuth usernameAuth)
+ {
+ this.usernameAuth = usernameAuth;
+ }
+
+ public SignatureCertAuth getSignatureCertAuth()
+ {
+ return signatureCertAuth;
+ }
+
+ public void setSignatureCertAuth(SignatureCertAuth signatureCertAuth)
+ {
+ this.signatureCertAuth = signatureCertAuth;
+ }
+
+ public boolean isUsernameAuth()
+ {
+ return usernameAuth != null;
+ }
+
+ public boolean isSignatureCertAuth()
+ {
+ return signatureCertAuth != null;
+ }
+}
Property changes on: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsse/Authenticate.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsse/Config.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsse/Config.java 2008-05-26 11:24:42 UTC (rev 7166)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsse/Config.java 2008-05-26 11:41:28 UTC (rev 7167)
@@ -38,6 +38,7 @@
private Sign sign;
private Encrypt encrypt;
private Requires requires;
+ private Authenticate authenticate;
public Encrypt getEncrypt()
{
@@ -88,4 +89,14 @@
{
this.requires = requires;
}
+
+ public Authenticate getAuthenticate()
+ {
+ return authenticate;
+ }
+
+ public void setAuthenticate(Authenticate authenticate)
+ {
+ this.authenticate = authenticate;
+ }
}
Added: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsse/SignatureCertAuth.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsse/SignatureCertAuth.java (rev 0)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsse/SignatureCertAuth.java 2008-05-26 11:41:28 UTC (rev 7167)
@@ -0,0 +1,52 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.ws.metadata.wsse;
+
+import java.io.Serializable;
+
+/**
+ * <code>UsernameAuth</code> specifies that the certificate token
+ * referenced by the signature should be used for JAAS authentication.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 26-May-2008
+ */
+public class SignatureCertAuth implements Serializable
+{
+ private static final long serialVersionUID = -6618730662350740011L;
+ private String certificatePrincipal;
+
+ public SignatureCertAuth(String certificatePrincipal)
+ {
+ this.certificatePrincipal = certificatePrincipal;
+ }
+
+ public String getCertificatePrincipal()
+ {
+ return certificatePrincipal;
+ }
+
+ public void setCertificatePrincipal(String certificatePrincipal)
+ {
+ this.certificatePrincipal = certificatePrincipal;
+ }
+}
Property changes on: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsse/SignatureCertAuth.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsse/UsernameAuth.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsse/UsernameAuth.java (rev 0)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsse/UsernameAuth.java 2008-05-26 11:41:28 UTC (rev 7167)
@@ -0,0 +1,41 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.ws.metadata.wsse;
+
+import java.io.Serializable;
+
+/**
+ * <code>UsernameAuth</code> specifies that the username
+ * token should be used for JAAS authentication.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 26-May-2008
+ */
+public class UsernameAuth implements Serializable
+{
+ private static final long serialVersionUID = -7767474325576294780L;
+
+ public UsernameAuth()
+ {
+
+ }
+}
Property changes on: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsse/UsernameAuth.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java 2008-05-26 11:24:42 UTC (rev 7166)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java 2008-05-26 11:41:28 UTC (rev 7167)
@@ -304,6 +304,10 @@
return new Username(digestPassword, useNonce, useCreated);
}
+ else if ("authenticate".equals(localName))
+ {
+ return new Authenticate();
+ }
return null;
}
@@ -352,6 +356,33 @@
log.trace("addChild: [obj=" + config + ",child=" + requires + "]");
config.setRequires(requires);
}
+
+ /**
+ * Called when parsing character is complete.
+ */
+ public void addChild(Config config, Authenticate authenticate, UnmarshallingContext navigator, String namespaceURI, String localName)
+ {
+ log.trace("addChild: [obj=" + config + ",child=" + authenticate + "]");
+ config.setAuthenticate(authenticate);
+ }
+
+ /**
+ * Called when parsing character is complete.
+ */
+ public void addChild(Authenticate authenticate, UsernameAuth usernameAuth, UnmarshallingContext navigator, String namespaceURI, String localName)
+ {
+ log.trace("addChild: [obj=" + authenticate + ",child=" + usernameAuth + "]");
+ authenticate.setUsernameAuth(usernameAuth);
+ }
+
+ /**
+ * Called when parsing character is complete.
+ */
+ public void addChild(Authenticate authenticate, SignatureCertAuth signatureCertAuth, UnmarshallingContext navigator, String namespaceURI, String localName)
+ {
+ log.trace("addChild: [obj=" + authenticate + ",child=" + signatureCertAuth + "]");
+ authenticate.setSignatureCertAuth(signatureCertAuth);
+ }
private Object handleTargets(Object object, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
@@ -404,7 +435,25 @@
return null;
}
+
+ /**
+ * Called when parsing of a new element started.
+ */
+ public Object newChild(Authenticate authenticate, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+ {
+ log.trace("newChild: " + localName);
+ if ("usernameAuth".equals(localName))
+ {
+ return new UsernameAuth();
+ }
+ else if ("signatureCertAuth".equals(localName))
+ {
+ return new SignatureCertAuth(attrs.getValue("", "certificatePrincipal"));
+ }
+ return null;
+ }
+
/**
* Called when parsing of a new element started.
*/
Modified: stack/native/trunk/modules/core/src/main/resources/schema/jboss-ws-security_1_0.xsd
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/schema/jboss-ws-security_1_0.xsd 2008-05-26 11:24:42 UTC (rev 7166)
+++ stack/native/trunk/modules/core/src/main/resources/schema/jboss-ws-security_1_0.xsd 2008-05-26 11:41:28 UTC (rev 7167)
@@ -131,6 +131,11 @@
<xs:documentation>Specifies the security requirements that should be applied when receiving a response from the communicating party. If this is not specified, all messages will be allowed through.</xs:documentation>
</xs:annotation>
</xs:element>
+ <xs:element name="authenticate" type="authenticateType" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>Specifies the token to be used for JAAS authentication. If this is not specified, the username token will be used if available.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
</xs:all>
</xs:complexType>
<xs:complexType name="requireTimestampType">
@@ -324,4 +329,26 @@
</xs:element>
</xs:sequence>
</xs:complexType>
+ <xs:complexType name="authenticateType">
+ <xs:choice minOccurs="1" maxOccurs="1">
+ <xs:element name="usernameAuth" type="usernameAuthType" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>Specifies that the username token should be used for JAAS authentication.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="signatureCertAuth" type="signatureCertAuthType" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>Specifies that the certificate token referenced from the signature should be used for JAAS authentication.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:choice>
+ </xs:complexType>
+ <xs:complexType name="usernameAuthType"/>
+ <xs:complexType name="signatureCertAuthType">
+ <xs:attribute name="certificatePrincipal" use="optional">
+ <xs:annotation>
+ <xs:documentation>This specifies the class to be used to map certificates to principal. It must implement org.jboss.security.auth.certs.CertificatePrincipal. Default is org.jboss.security.auth.certs.SubjectCNMapping</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
</xs:schema>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java 2008-05-26 11:24:42 UTC (rev 7166)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java 2008-05-26 11:41:28 UTC (rev 7167)
@@ -95,7 +95,7 @@
cal.set(Calendar.MINUTE, 22);
cal.set(Calendar.SECOND, 25);
- SecurityDecoder decoder = new SecurityDecoder(new SecurityStore(), cal, null, null);
+ SecurityDecoder decoder = new SecurityDecoder(new SecurityStore(), cal, null, null, null);
decoder.decode(soapEnv.getOwnerDocument());
decoder.complete();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java 2008-05-26 11:24:42 UTC (rev 7166)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java 2008-05-26 11:41:28 UTC (rev 7167)
@@ -103,7 +103,7 @@
env = soapMsg.getSOAPPart().getEnvelope();
doc = env.getOwnerDocument();
- SecurityDecoder decoder = new SecurityDecoder(new SecurityStore(), null, null);
+ SecurityDecoder decoder = new SecurityDecoder(new SecurityStore(), null, null, null);
decoder.decode(doc);
decoder.verify(buildRequireOperations());
decoder.complete();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SunInteropTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SunInteropTestCase.java 2008-05-26 11:24:42 UTC (rev 7166)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SunInteropTestCase.java 2008-05-26 11:41:28 UTC (rev 7167)
@@ -72,7 +72,7 @@
cal.set(Calendar.MINUTE, 32);
cal.set(Calendar.SECOND, 25);
- SecurityDecoder decoder = new SecurityDecoder(new SecurityStore(), cal, null, null);
+ SecurityDecoder decoder = new SecurityDecoder(new SecurityStore(), cal, null, null, null);
decoder.decode(doc);
decoder.complete();
@@ -107,7 +107,7 @@
cal.set(Calendar.SECOND, 40);
- SecurityDecoder decoder = new SecurityDecoder(new SecurityStore(), cal, null, null);
+ SecurityDecoder decoder = new SecurityDecoder(new SecurityStore(), cal, null, null, null);
decoder.decode(doc);
decoder.complete();
16 years, 7 months
JBossWS SVN: r7166 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-26 07:24:42 -0400 (Mon, 26 May 2008)
New Revision: 7166
Modified:
stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt
Log:
fixme comments
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-26 10:44:39 UTC (rev 7165)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-26 11:24:42 UTC (rev 7166)
@@ -9,14 +9,14 @@
# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
-# [JBWS-1762] web/xml modified to web/xml/org - Subsequent runs fail
+# [JBWS-1762] web.xml modified to web.xml.org - Subsequent runs fail
# This requires changes to the AS web meta data (servlet init params)
org/jboss/test/ws/jaxws/jbws1762/**
-# [JBWS-1797] Setting /NET friendly Endpoint in web/xml
+# [JBWS-1797] Setting .NET friendly Endpoint in web.xml
org/jboss/test/ws/jaxws/jbws1797/**
-# [JBWS-1813] context-root from jboss/xml
+# [JBWS-1813] context-root from jboss.xml
org/jboss/test/ws/jaxws/jbws1813/**
# [JBWS-1841] WebServiceRef injection from DD doesn't work
16 years, 7 months
JBossWS SVN: r7165 - stack/native/trunk/modules/testsuite/native-tests/src/test/resources.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-05-26 06:44:39 -0400 (Mon, 26 May 2008)
New Revision: 7165
Removed:
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/test-excludes-jboss421.txt
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/test-excludes-jboss422.txt
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/test-excludes-jboss423.txt
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/test-excludes-jboss500.txt
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/test-excludes-jboss501.txt
Log:
remove obsolete files
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/test-excludes-jboss421.txt
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/test-excludes-jboss421.txt 2008-05-26 10:40:06 UTC (rev 7164)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/test-excludes-jboss421.txt 2008-05-26 10:44:39 UTC (rev 7165)
@@ -1,29 +0,0 @@
-#
-# $Id: test-excludes-jboss421.txt 6108 2008-03-26 17:32:49Z richard.opalka(a)jboss.com $
-#
-
-# EJB3/Injection excludes
-org/jboss/test/ws/jaxws/samples/webserviceref/**
-org/jboss/test/ws/jaxws/webserviceref/**
-
-# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
-org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
-
-# [JBWS-1762] web.xml modified to web.xml.org - Subsequent runs fail
-# This requires changes to the AS web meta data (servlet init params)
-org/jboss/test/ws/jaxws/jbws1762/**
-
-# [JBWS-1797] Setting .NET friendly Endpoint in web.xml
-org/jboss/test/ws/jaxws/jbws1797/**
-
-# [JBWS-1813] context-root from jboss.xml
-org/jboss/test/ws/jaxws/jbws1813/**
-
-# [JBWS-1841] WebServiceRef injection from DD doesn't work
-org/jboss/test/ws/jaxws/jbws1841/**
-
-# [JBWS-1911] Support the JMS transport with JAX-WS
-org/jboss/test/ws/jaxws/samples/jmstransport/**
-
-# [JBWS-1907] Authorization based on certificate used for wsse signature
-org/jboss/test/ws/jaxws/jbws2116/**
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/test-excludes-jboss422.txt
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/test-excludes-jboss422.txt 2008-05-26 10:40:06 UTC (rev 7164)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/test-excludes-jboss422.txt 2008-05-26 10:44:39 UTC (rev 7165)
@@ -1,32 +0,0 @@
-#
-# $Id: test-excludes-jboss422.txt 6108 2008-03-26 17:32:49Z richard.opalka(a)jboss.com $
-#
-
-# EJB3/Injection excludes
-org/jboss/test/ws/jaxws/samples/webserviceref/**
-org/jboss/test/ws/jaxws/webserviceref/**
-
-# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
-org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
-
-# [JBWS-1762] web.xml modified to web.xml.org - Subsequent runs fail
-# This requires changes to the AS web meta data (servlet init params)
-org/jboss/test/ws/jaxws/jbws1762/**
-
-# [JBWS-1797] Setting .NET friendly Endpoint in web.xml
-org/jboss/test/ws/jaxws/jbws1797/**
-
-# [JBWS-1813] context-root from jboss.xml
-org/jboss/test/ws/jaxws/jbws1813/**
-
-# [JBWS-1841] WebServiceRef injection from DD doesn't work
-org/jboss/test/ws/jaxws/jbws1841/**
-
-# [JBWS-1911] Support the JMS transport with JAX-WS
-org/jboss/test/ws/jaxws/samples/jmstransport/**
-
-# [JBWS-1526] Automated testing and availablity checks of public endpoints (interop)
-org/jboss/test/ws/interop/**
-
-# [JBWS-1907] Authorization based on certificate used for wsse signature
-org/jboss/test/ws/jaxws/jbws2116/**
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/test-excludes-jboss423.txt
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/test-excludes-jboss423.txt 2008-05-26 10:40:06 UTC (rev 7164)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/test-excludes-jboss423.txt 2008-05-26 10:44:39 UTC (rev 7165)
@@ -1,16 +0,0 @@
-#
-# $Id$
-#
-
-# EJB3/Injection excludes
-org/jboss/test/ws/jaxws/samples/webserviceref/**
-org/jboss/test/ws/jaxws/webserviceref/**
-
-# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
-org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
-
-# [JBWS-1526] Automated testing and availablity checks of public endpoints (interop)
-org/jboss/test/ws/interop/**
-
-# [JBWS-1907] Authorization based on certificate used for wsse signature
-org/jboss/test/ws/jaxws/jbws2116/**
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/test-excludes-jboss500.txt 2008-05-26 10:40:06 UTC (rev 7164)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/test-excludes-jboss500.txt 2008-05-26 10:44:39 UTC (rev 7165)
@@ -1,25 +0,0 @@
-#
-# $Id: test-excludes-jboss500.txt 6108 2008-03-26 17:32:49Z richard.opalka(a)jboss.com $
-#
-
-# Fix BPEL before AS50 goes final
-org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
-
-# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
-org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
-
-# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
-org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-
-# [JBAS-5055] Failed to load users/passwords/role files
-org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.*
-org/jboss/test/ws/jaxws/jbws1840/JBWS1840TestCase.*
-
-# [JBAS-5114] MessageDriven EJB3 does not create destination automatically
-org/jboss/test/ws/jaxws/samples/jmstransport/**
-
-# [JBAS-5115] Valid jboss-app.xml file not recognized correctly by jbossxb runtime
-org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.*
-
-# [JBWS-1907] Authorization based on certificate used for wsse signature
-org/jboss/test/ws/jaxws/jbws2116/**
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/test-excludes-jboss501.txt
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/test-excludes-jboss501.txt 2008-05-26 10:40:06 UTC (rev 7164)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/test-excludes-jboss501.txt 2008-05-26 10:44:39 UTC (rev 7165)
@@ -1,60 +0,0 @@
-#
-# $Id$
-#
-
-# Fix BPEL before AS50 goes final
-org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
-
-# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
-org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
-
-# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
-org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-
-# [JBAS-5055] Failed to load users/passwords/role files
-org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.*
-org/jboss/test/ws/jaxws/jbws1840/JBWS1840TestCase.*
-
-# [JBAS-5114] MessageDriven EJB3 does not create destination automatically
-org/jboss/test/ws/jaxws/samples/jmstransport/**
-
-# [JBAS-5115] Valid jboss-app.xml file not recognized correctly by jbossxb runtime
-org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.*
-
-# [JBWS-2107] Resolve dependency on @SecurityDomain
-org/jboss/test/ws/jaxws/webserviceref/Secure**
-org/jboss/test/ws/jaxws/samples/dar/**
-org/jboss/test/ws/jaxws/samples/news/**
-org/jboss/test/ws/jaxws/jbws1840/**
-
-# [JBWS-1526] Automated testing and availablity checks of public endpoints (interop)
-org/jboss/test/ws/interop/**
-
-# [EJBTHREE-1150] WebServiceContext injection requires mapped-name
-org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.*
-
-# [JBAS-5257] jboss:service=defaultClassLoader is not registered with dynamic webapp deployment
-org/jboss/test/ws/jaxws/endpoint/**
-
-# [JBAS-5359] mapped-name is required for context of deployment
-org/jboss/test/ws/jaxws/binding/**
-org/jboss/test/ws/jaxws/handlerlifecycle/**
-org/jboss/test/ws/jaxws/jbws1611/**
-org/jboss/test/ws/jaxws/jbws1733/**
-org/jboss/test/ws/jaxws/namespace/**
-org/jboss/test/ws/jaxws/samples/wsaddressing/**
-org/jboss/test/ws/jaxws/samples/wssecurity/*TestCase.*
-
-# [JBAS-5386] ClassNotFoundException: org.jboss.deployment.security.WarPolicyConfigurationFacade
-org/jboss/test/ws/jaxrpc/jbws1762/**
-org/jboss/test/ws/jaxws/jbws1762/**
-
-# [JBAS-5387] EJB21 name not bound
-org/jboss/test/ws/jaxrpc/jbws331/**
-
-# [JBAS-5388] JBossXBRuntimeException: Missing value for the required attribute
-org/jboss/test/ws/jaxrpc/jbws720/**
-
-# [JBWS-1907] Authorization based on certificate used for wsse signature
-org/jboss/test/ws/jaxws/jbws2116/**
-
16 years, 7 months
JBossWS SVN: r7164 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-05-26 06:40:06 -0400 (Mon, 26 May 2008)
New Revision: 7164
Modified:
stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
[JBWS-1907] exclude tests
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt 2008-05-26 10:25:46 UTC (rev 7163)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt 2008-05-26 10:40:06 UTC (rev 7164)
@@ -27,3 +27,6 @@
# [JBWS-2175] wsconsume cannot run with jaxws-api from build output
org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.*
+
+# [JBWS-1907] Authorization based on certificate used for wsse signature
+org/jboss/test/ws/jaxws/jbws2116/**
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-26 10:25:46 UTC (rev 7163)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-26 10:40:06 UTC (rev 7164)
@@ -37,3 +37,6 @@
# [JBWS-2175] wsconsume cannot run with jaxws-api from build output
org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.*
+
+# [JBWS-1907] Authorization based on certificate used for wsse signature
+org/jboss/test/ws/jaxws/jbws2116/**
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-05-26 10:25:46 UTC (rev 7163)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-05-26 10:40:06 UTC (rev 7164)
@@ -20,3 +20,6 @@
# [JBWS-2175] wsconsume cannot run with jaxws-api from build output
org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.*
+
+# [JBWS-1907] Authorization based on certificate used for wsse signature
+org/jboss/test/ws/jaxws/jbws2116/**
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-05-26 10:25:46 UTC (rev 7163)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-05-26 10:40:06 UTC (rev 7164)
@@ -34,3 +34,6 @@
# [JBWS-2175] wsconsume cannot run with jaxws-api from build output
org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.*
+
+# [JBWS-1907] Authorization based on certificate used for wsse signature
+org/jboss/test/ws/jaxws/jbws2116/**
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-26 10:25:46 UTC (rev 7163)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-26 10:40:06 UTC (rev 7164)
@@ -74,3 +74,6 @@
# [EJBTHREE-1377] Callback objects are improperly setup - ServiceRefMetaData.getServiceInterface() returns null
org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.*
+
+# [JBWS-1907] Authorization based on certificate used for wsse signature
+org/jboss/test/ws/jaxws/jbws2116/**
16 years, 7 months
JBossWS SVN: r7163 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-05-26 06:25:46 -0400 (Mon, 26 May 2008)
New Revision: 7163
Modified:
stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
[JBWS-2194][EJBTHREE-1323] updating excludes file
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-26 09:49:12 UTC (rev 7162)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-26 10:25:46 UTC (rev 7163)
@@ -81,14 +81,6 @@
# [JBAS-5359] mapped-name is required for context of deployment
org/jboss/test/ws/jaxws/jbws1611/**
-# [EJBTHREE-1323] ClassNotFoundException: org.jboss.ejb3.tx.TxInterceptorFactory
-org/jboss/test/ws/jaxws/samples/advanced/retail/**
-org/jboss/test/ws/jaxws/samples/context/**
-org/jboss/test/ws/jaxws/samples/eardeployment/**
-org/jboss/test/ws/jaxws/samples/swaref/**
-org/jboss/test/ws/jaxws/samples/webserviceref/**
-org/jboss/test/ws/jaxws/samples/webservice/**
-
# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
@@ -97,3 +89,6 @@
# [JBWS-2164] Fix tools tests with maven build
org/jboss/test/ws/jaxws/smoke/tools/**
+
+# [JBWS-2194] request requires HTTP authentication: Unauthorized
+org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.*
\ No newline at end of file
16 years, 7 months
JBossWS SVN: r7162 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-05-26 05:49:12 -0400 (Mon, 26 May 2008)
New Revision: 7162
Modified:
stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
[JBWS-2177] enable test for AS 501
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-26 09:37:55 UTC (rev 7161)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-26 09:49:12 UTC (rev 7162)
@@ -97,6 +97,3 @@
# [JBWS-2164] Fix tools tests with maven build
org/jboss/test/ws/jaxws/smoke/tools/**
-
-# [JBWS-2177] Endorsed mechanism issue
-org/jboss/test/ws/jaxws/complex/**
16 years, 7 months