You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wss4j-dev@ws.apache.org by co...@apache.org on 2008/09/29 12:28:03 UTC
svn commit: r700046 - in /webservices/wss4j/trunk: ./
src/org/apache/ws/security/ src/org/apache/ws/security/processor/
Author: coheigea
Date: Mon Sep 29 03:28:00 2008
New Revision: 700046
URL: http://svn.apache.org/viewvc?rev=700046&view=rev
Log:
[WSS-123] - Removed dependency on opensaml jar.
- Some minor spelling corrections as well.
Modified:
webservices/wss4j/trunk/README.txt
webservices/wss4j/trunk/src/org/apache/ws/security/WSSConfig.java
webservices/wss4j/trunk/src/org/apache/ws/security/WSSecurityException.java
webservices/wss4j/trunk/src/org/apache/ws/security/errors.properties
webservices/wss4j/trunk/src/org/apache/ws/security/processor/SignatureProcessor.java
Modified: webservices/wss4j/trunk/README.txt
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/README.txt?rev=700046&r1=700045&r2=700046&view=diff
==============================================================================
--- webservices/wss4j/trunk/README.txt (original)
+++ webservices/wss4j/trunk/README.txt Mon Sep 29 03:28:00 2008
@@ -76,7 +76,7 @@
The WSS4J zip archive is the binary distribution and contains the wss4j
jar file, some examples, test classes (incl. sources), the interop test
classes (incl. sources and necessary certificate store), and the according
-client and server deployment and protery files.
+client and server deployment and property files.
The WSS4J jar file contains all classes that implement the basic functions
and the handlers. To install it make sure this jar file is in the classpath
@@ -139,7 +139,7 @@
required:
addressing-1.0.jar
- This jar contains the implementation of WS-Adressing, required
+ This jar contains the implementation of WS-Addressing, required
by WSS4J Trust.
See: http://ws.apache.org/addressing/
@@ -150,7 +150,7 @@
axis-saaj-1.4.jar
These jars contain the Apache Axis base software. They implement
the basic SOAP processing, deployment, WSDL to Java, Java to WSDL
- tools and a lot more. Plase refer to a Axis documentation how to
+ tools and a lot more. Please refer to a Axis documentation how to
setup Axis. You should be familiar with Axis, its setup, and
deployment methods before you start with any WSS4J functions.
@@ -167,7 +167,7 @@
commons-discovery-0.2.jar
commons-logging-1.1.jar
These jars are from the Commons project and provide may useful
- funtions, such as Base64 encoding/decoding, resource lookup,
+ functions, such as Base64 encoding/decoding, resource lookup,
and much more. Please refer to the commons project to get more
information.
@@ -187,7 +187,7 @@
See: http://logging.apache.org/
opensaml-1.1.jar
- The SAML implemetation used by WSS4J to implement the SAML profile.
+ The SAML implementation used by WSS4J to implement the SAML profile.
See: http://www.opensaml.org/
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/WSSConfig.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/WSSConfig.java?rev=700046&r1=700045&r2=700046&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/WSSConfig.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/WSSConfig.java Mon Sep 29 03:28:00 2008
@@ -64,13 +64,18 @@
new Integer(WSConstants.SIGN),
org.apache.ws.security.action.SignatureAction.class.getName()
);
+ //
+ // Note that all actions/processors with dependencies on opensaml are
+ // registered as Strings. This is so that applications that do not use
+ // saml do not have to have the opensaml jar available.
+ //
tmp.put(
new Integer(WSConstants.ST_SIGNED),
- org.apache.ws.security.action.SAMLTokenSignedAction.class.getName()
+ "org.apache.ws.security.action.SAMLTokenSignedAction"
);
tmp.put(
new Integer(WSConstants.ST_UNSIGNED),
- org.apache.ws.security.action.SAMLTokenUnsignedAction.class.getName()
+ "org.apache.ws.security.action.SAMLTokenUnsignedAction"
);
tmp.put(
new Integer(WSConstants.TS),
@@ -101,7 +106,7 @@
try {
tmp.put(
WSSecurityEngine.SAML_TOKEN,
- org.apache.ws.security.processor.SAMLTokenProcessor.class.getName()
+ "org.apache.ws.security.processor.SAMLTokenProcessor"
);
tmp.put(
WSSecurityEngine.ENCRYPTED_KEY,
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/WSSecurityException.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/WSSecurityException.java?rev=700046&r1=700045&r2=700046&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/WSSecurityException.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/WSSecurityException.java Mon Sep 29 03:28:00 2008
@@ -54,7 +54,7 @@
try {
resources = ResourceBundle.getBundle("org.apache.ws.security.errors");
} catch (MissingResourceException e) {
- throw new RuntimeException(e.getMessage());
+ throw new RuntimeException(e.getMessage(), e);
}
FAULT_CODE_MAP.put(
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/errors.properties
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/errors.properties?rev=700046&r1=700045&r2=700046&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/errors.properties (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/errors.properties Mon Sep 29 03:28:00 2008
@@ -47,8 +47,8 @@
keystore = Cannot access/read keystore data
noCert = No certificate provided
##
-noSigCryptoFile=WSSecurityEngine: No crypto protery file supplied to verify signature
-noDecCryptoFile=WSSecurityEngine: No crypto propery file supplied for decryption
+noSigCryptoFile=WSSecurityEngine: No crypto property file supplied to verify signature
+noDecCryptoFile=WSSecurityEngine: No crypto property file supplied for decryption
noCallback=WSSecurityEngine: No password callback supplied
noPassword=WSSecurityEngine: Callback supplied no password for: {0}
noKey=WSSecurityEngine: Callback supplied no key for: {0}
@@ -67,7 +67,7 @@
#
noSAMLdoc=Cannot convert SAML to DOM document
invalidSAMLsecurity=SAML token security failure
-invalidSAMLToken = INvalid SAML assertion : {0}
+invalidSAMLToken = Invalid SAML assertion : {0}
invalidData=Invalid data: {0}
noKeyInSAMLToken=Provided SAML token does not contain a suitable key
#
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/processor/SignatureProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/processor/SignatureProcessor.java?rev=700046&r1=700045&r2=700046&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/processor/SignatureProcessor.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/processor/SignatureProcessor.java Mon Sep 29 03:28:00 2008
@@ -189,7 +189,7 @@
int docHash = elem.getOwnerDocument().hashCode();
/*
* Her we get some information about the document that is being
- * processed, in partucular the crypto implementation, and already
+ * processed, in particular the crypto implementation, and already
* detected BST that may be used later during dereferencing.
*/
WSDocInfo wsDocInfo = WSDocInfoStore.lookup(docHash);
@@ -428,7 +428,7 @@
//This is the custom key scenario
CustomTokenPrincipal principal = new CustomTokenPrincipal(customTokenId);
return principal;
- }else {
+ } else {
throw new WSSecurityException("Cannot determine principal");
}
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: wss4j-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: wss4j-dev-help@ws.apache.org