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 ru...@apache.org on 2007/07/14 12:42:59 UTC
svn commit: r556258 - in
/webservices/wss4j/trunk/src/org/apache/ws/security: action/
components/crypto/ conversation/ conversation/dkalgo/
Author: ruchithf
Date: Sat Jul 14 03:42:55 2007
New Revision: 556258
URL: http://svn.apache.org/viewvc?view=rev&rev=556258
Log:
Fixed some more typos
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/action/SAMLTokenUnsignedAction.java
webservices/wss4j/trunk/src/org/apache/ws/security/action/SignatureAction.java
webservices/wss4j/trunk/src/org/apache/ws/security/action/SignatureConfirmationAction.java
webservices/wss4j/trunk/src/org/apache/ws/security/action/TimestampAction.java
webservices/wss4j/trunk/src/org/apache/ws/security/action/UsernameTokenSignedAction.java
webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/AbstractCrypto.java
webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/BouncyCastle.java
webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/Crypto.java
webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/CryptoBase.java
webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/CryptoFactory.java
webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/Merlin.java
webservices/wss4j/trunk/src/org/apache/ws/security/conversation/ConversationConstants.java
webservices/wss4j/trunk/src/org/apache/ws/security/conversation/dkalgo/AlgoFactory.java
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/action/SAMLTokenUnsignedAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/action/SAMLTokenUnsignedAction.java?view=diff&rev=556258&r1=556257&r2=556258
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/action/SAMLTokenUnsignedAction.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/action/SAMLTokenUnsignedAction.java Sat Jul 14 03:42:55 2007
@@ -36,7 +36,7 @@
saml.setUsername(reqData.getUsername());
SAMLAssertion assertion = saml.newAssertion();
- // add the SAMLAssertion Token to the SOAP Enevelope
+ // add the SAMLAssertion Token to the SOAP Envelope
builder.build(doc, assertion, reqData.getSecHeader());
}
}
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/action/SignatureAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/action/SignatureAction.java?view=diff&rev=556258&r1=556257&r2=556258
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/action/SignatureAction.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/action/SignatureAction.java Sat Jul 14 03:42:55 2007
@@ -54,7 +54,7 @@
wsSign.build(doc, reqData.getSigCrypto(), reqData.getSecHeader());
reqData.getSignatureValues().add(wsSign.getSignatureValue());
} catch (WSSecurityException e) {
- throw new WSSecurityException("WSHandler: Signature: error during message procesing" + e);
+ throw new WSSecurityException("WSHandler: Signature: error during message processing" + e);
}
}
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/action/SignatureConfirmationAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/action/SignatureConfirmationAction.java?view=diff&rev=556258&r1=556257&r2=556258
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/action/SignatureConfirmationAction.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/action/SignatureConfirmationAction.java Sat Jul 14 03:42:55 2007
@@ -72,7 +72,8 @@
for (int i = 0; i < signatureActions.size(); i++) {
WSSecurityEngineResult wsr = (WSSecurityEngineResult) signatureActions
.get(i);
- byte[] sigVal = wsr.getSignatureValue();
+ byte[] sigVal = (byte[]) wsr
+ .get(WSSecurityEngineResult.TAG_SIGNATURE_VALUE);
wsc.build(doc, sigVal, reqData.getSecHeader());
signatureParts.add(new WSEncryptionPart(wsc.getId()));
}
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/action/TimestampAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/action/TimestampAction.java?view=diff&rev=556258&r1=556257&r2=556258
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/action/TimestampAction.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/action/TimestampAction.java Sat Jul 14 03:42:55 2007
@@ -30,7 +30,7 @@
new WSSecTimestamp();
timeStampBuilder.setWsConfig(reqData.getWssConfig());
timeStampBuilder.setTimeToLive(handler.decodeTimeToLive(reqData));
- // add the Timestamp to the SOAP Enevelope
+ // add the Timestamp to the SOAP Envelope
timeStampBuilder.build(doc, reqData.getSecHeader());
}
}
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/action/UsernameTokenSignedAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/action/UsernameTokenSignedAction.java?view=diff&rev=556258&r1=556257&r2=556258
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/action/UsernameTokenSignedAction.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/action/UsernameTokenSignedAction.java Sat Jul 14 03:42:55 2007
@@ -56,7 +56,7 @@
sign.build(doc, null, reqData.getSecHeader());
reqData.getSignatureValues().add(sign.getSignatureValue());
} catch (WSSecurityException e) {
- throw new WSSecurityException("WSHandler: Error during Signatur with UsernameToken secret"
+ throw new WSSecurityException("WSHandler: Error during Signature with UsernameToken secret"
+ e);
}
builder.prependToHeader(reqData.getSecHeader());
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/AbstractCrypto.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/AbstractCrypto.java?view=diff&rev=556258&r1=556257&r2=556258
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/AbstractCrypto.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/AbstractCrypto.java Sat Jul 14 03:42:55 2007
@@ -159,7 +159,7 @@
* Retrieves the alias name of the default certificate which has been
* specified as a property. This should be the certificate that is used for
* signature and encryption. This alias corresponds to the certificate that
- * should be used whenever KeyInfo is not poresent in a signed or
+ * should be used whenever KeyInfo is not present in a signed or
* an encrypted message. May return null.
*
* @return alias name of the default X509 certificate
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/BouncyCastle.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/BouncyCastle.java?view=diff&rev=556258&r1=556257&r2=556258
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/BouncyCastle.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/BouncyCastle.java Sat Jul 14 03:42:55 2007
@@ -67,7 +67,7 @@
* Construct an array of X509Certificate's from the byte array.
* <p/>
*
- * @param data The <code>byte</code> array containg the X509 data
+ * @param data The <code>byte</code> array containing the X509 data
* @param reverse If set the first certificate in input data will
* the last in the array
* @return An array of X509 certificates, ordered according to
@@ -102,7 +102,7 @@
* @param reverse If set the first certificate in the array data will
* the last in the byte array
* @param certs The certificates to convert
- * @return The byte array for the certficates ordered according
+ * @return The byte array for the certificates ordered according
* to the reverse flag
* @throws org.apache.ws.security.WSSecurityException
*
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/Crypto.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/Crypto.java?view=diff&rev=556258&r1=556257&r2=556258
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/Crypto.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/Crypto.java Sat Jul 14 03:42:55 2007
@@ -38,7 +38,7 @@
* load a X509Certificate from the input stream.
* <p/>
*
- * @param in The <code>InputStream</code> array containg the X509 data
+ * @param in The <code>InputStream</code> array containing the X509 data
* @return An X509 certificate
* @throws WSSecurityException
*/
@@ -48,7 +48,7 @@
* Construct an array of X509Certificate's from the byte array.
* <p/>
*
- * @param data The <code>byte</code> array containg the X509 data
+ * @param data The <code>byte</code> array containing the X509 data
* @param reverse If set the first certificate in input data will
* the last in the array
* @return An array of X509 certificates, ordered according to
@@ -64,7 +64,7 @@
* @param reverse If set the first certificate in the array data will
* the last in the byte array
* @param certs The certificates to convert
- * @return The byte array for the certficates ordered according
+ * @return The byte array for the certificates ordered according
* to the reverse flag
* @throws WSSecurityException
*/
@@ -112,10 +112,10 @@
/**
* Lookup a X509 Certificate in the keystore according to a given
- * the issuer of a Certficate.
+ * the issuer of a Certificate.
* <p/>
* The search gets all alias names of the keystore and gets the certificate chain
- * for each alias. Then the Issuer fo each certificate of the chain
+ * for each alias. Then the Issuer of each certificate of the chain
* is compared with the parameters.
*
* @param issuer The issuer's name for the certificate
@@ -126,10 +126,10 @@
/**
* Search a X509 Certificate in the keystore according to a given serial number and
- * the issuer of a Certficate.
+ * the issuer of a Certificate.
* <p/>
* The search gets all alias names of the keystore and gets the certificate chain
- * for each alias. Then the SerialNumber and Issuer fo each certificate of the chain
+ * for each alias. Then the SerialNumber and Issuer of each certificate of the chain
* is compared with the parameters.
*
* @param issuer The issuer's name for the certificate
@@ -157,7 +157,7 @@
* Retrieves the alias name of the default certificate which has been
* specified as a property. This should be the certificate that is used for
* signature and encryption. This alias corresponds to the certificate that
- * should be used whenever KeyInfo is not poresent in a signed or
+ * should be used whenever KeyInfo is not present in a signed or
* an encrypted message. May return null.
*
* @return alias name of the default X509 certificate.
@@ -169,7 +169,7 @@
* <p/>
*
* @param cert The certificate to read SKI
- * @return The byte array conating the binary SKI data
+ * @return The byte array containing the binary SKI data
*/
public byte[] getSKIBytesFromCert(X509Certificate cert) throws WSSecurityException;
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/CryptoBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/CryptoBase.java?view=diff&rev=556258&r1=556257&r2=556258
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/CryptoBase.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/CryptoBase.java Sat Jul 14 03:42:55 2007
@@ -106,7 +106,7 @@
* load a X509Certificate from the input stream.
* <p/>
*
- * @param in The <code>InputStream</code> array containg the X509 data
+ * @param in The <code>InputStream</code> array containing the X509 data
* @return Returns a X509 certificate
* @throws org.apache.ws.security.WSSecurityException
*
@@ -178,7 +178,7 @@
/**
* Lookup a X509 Certificate in the keystore according to a given serial number and
- * the issuer of a Certficate.
+ * the issuer of a Certificate.
* <p/>
* The search gets all alias names of the keystore and gets the certificate chain
* for each alias. Then the SerialNumber and Issuer fo each certificate of the chain
@@ -457,7 +457,7 @@
* If we cannot compute the SKI throw a WSSecurityException.
*
* @param cert The certificate to read SKI
- * @return The byte array conating the binary SKI data
+ * @return The byte array containing the binary SKI data
*/
public byte[] getSKIBytesFromCert(X509Certificate cert)
throws WSSecurityException {
@@ -545,7 +545,7 @@
* @param reverse If set the first certificate in the array data will
* the last in the byte array
* @param certs The certificates to convert
- * @return The byte array for the certficates ordered according
+ * @return The byte array for the certificates ordered according
* to the reverse flag
* @throws WSSecurityException
*/
@@ -575,7 +575,7 @@
* Construct an array of X509Certificate's from the byte array.
* <p/>
*
- * @param data The <code>byte</code> array containg the X509 data
+ * @param data The <code>byte</code> array containing the X509 data
* @param reverse If set the first certificate in input data will
* the last in the array
* @return An array of X509 certificates, ordered according to
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/CryptoFactory.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/CryptoFactory.java?view=diff&rev=556258&r1=556257&r2=556258
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/CryptoFactory.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/CryptoFactory.java Sat Jul 14 03:42:55 2007
@@ -59,7 +59,7 @@
* getInstance
* <p/>
* Returns an instance of Crypto. The properties are handed over the the crypto
- * implementation. The porperties must at least contain the Crypto implementation
+ * implementation. The properties must at least contain the Crypto implementation
* class name as the value of the property : org.apache.ws.security.crypto.provider
* <p/>
*
@@ -78,13 +78,13 @@
* <p/>
* Returns an instance of Crypto loaded with the given classloader.
* The properties are handed over the the crypto implementation.
- * The porperties must at least contain the Crypto implementation
+ * The properties must at least contain the Crypto implementation
* class name as the value of the property : org.apache.ws.security.crypto.provider
* <p/>
*
- * @param properties The Properties that are forwarded to the crypto implementaion
+ * @param properties The Properties that are forwarded to the crypto implementation
* and the Crypto impl class name.
- * These properties are dependend on the crypto implementatin
+ * These properties are dependent on the crypto implementation
* @param classLoader The class loader to use
* @return The cyrpto implementation or null if no cryptoClassName was defined
*/
@@ -97,7 +97,7 @@
* getInstance
* <p/>
* Returns an instance of Crypto. The properties are handed over the the crypto
- * implementation. The porperties can be <code>null</code>. It is depenend on the
+ * implementation. The properties can be <code>null</code>. It is dependent on the
* Crypto implementation how the initialization is done in this case.
* <p/>
*
@@ -117,13 +117,13 @@
* getInstance
* <p/>
* Returns an instance of Crypto. The supplied map is handed over the the crypto
- * implementation. The map can be <code>null</code>. It is depenend on the
+ * implementation. The map can be <code>null</code>. It is dependent on the
* Crypto implementation how the initialization is done in this case.
* <p/>
*
* @param cryptoClassName This is the crypto implementation class. No default is
* provided here.
- * @param map The Maps that is forwarded to the crypto implementaion.
+ * @param map The Maps that is forwarded to the crypto implementation.
* These contents of the map are dependent on the
* underlying crypto implementation specified in the
* cryptoClassName parameter.
@@ -136,7 +136,7 @@
/**
* getInstance
* <p/>
- * Returns an instance of Crypto. This method uses the specifed filename
+ * Returns an instance of Crypto. This method uses the specified filename
* to load a property file. This file shall use the property
* <code>org.apache.ws.security.crypto.provider</code>
* to define the classname of the Crypto implementation. The file
@@ -228,7 +228,7 @@
* Gets the properties for crypto.
* The functions loads the property file via
* {@link Loader.getResource(String)}, thus the property file
- * should be accesible via the classpath
+ * should be accessible via the classpath
*
* @param propFilename the properties file to load
* @return a <code>Properties</code> object loaded from the filename
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/Merlin.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/Merlin.java?view=diff&rev=556258&r1=556257&r2=556258
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/Merlin.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/Merlin.java Sat Jul 14 03:42:55 2007
@@ -69,7 +69,7 @@
* Construct an array of X509Certificate's from the byte array. <p/>
*
* @param data
- * The <code>byte</code> array containg the X509 data
+ * The <code>byte</code> array containing the X509 data
* @param reverse
* If set the first certificate in input data will the last in
* the array
@@ -106,7 +106,7 @@
* in the byte array
* @param certs
* The certificates to convert
- * @return The byte array for the certficates ordered according to the
+ * @return The byte array for the certificates ordered according to the
* reverse flag
* @throws WSSecurityException
*/
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/conversation/ConversationConstants.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/conversation/ConversationConstants.java?view=diff&rev=556258&r1=556257&r2=556258
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/conversation/ConversationConstants.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/conversation/ConversationConstants.java Sat Jul 14 03:42:55 2007
@@ -127,7 +127,7 @@
public final static String DEFAULT_LABEL = "WS-SecureConversation";
/**
- * Key to hod the map of security context identifiers against the
+ * Key to hold the map of security context identifiers against the
* service epr addresses (service scope) or wsa:Action values (operation
* scope).
*/
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/conversation/dkalgo/AlgoFactory.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/conversation/dkalgo/AlgoFactory.java?view=diff&rev=556258&r1=556257&r2=556258
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/conversation/dkalgo/AlgoFactory.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/conversation/dkalgo/AlgoFactory.java Sat Jul 14 03:42:55 2007
@@ -30,9 +30,9 @@
* This gives a DerivationAlgorithm instance from the default set of algorithms provided
*
* @param algorithm The algo identifier @see DeivationAlgorithm
- * @return A derivatio algorithm
- * @throws ConversationException If the specified algorithmis not available in
- * default implementations
+ * @return A derivation algorithm
+ * @throws ConversationException If the specified algorithm is not available
+ * in default implementations
*/
public static DerivationAlgorithm getInstance(String algorithm) throws
ConversationException {
---------------------------------------------------------------------
To unsubscribe, e-mail: wss4j-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: wss4j-dev-help@ws.apache.org