You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2013/03/08 12:06:40 UTC
svn commit: r1454320 - in /webservices/wss4j/trunk:
ws-security-common/src/main/java/org/apache/wss4j/common/crypto/
ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/
ws-security-dom/src/main/java/org/apache/wss4j/dom/ ws-security-...
Author: coheigea
Date: Fri Mar 8 11:06:40 2013
New Revision: 1454320
URL: http://svn.apache.org/r1454320
Log:
Removing some deprecated stuff
Modified:
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CertificateStore.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Crypto.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML2ComponentBuilder.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSDocInfo.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/KerberosTokenValidator.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/SignatureTrustValidator.java
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CertificateStore.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CertificateStore.java?rev=1454320&r1=1454319&r2=1454320&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CertificateStore.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CertificateStore.java Fri Mar 8 11:06:40 2013
@@ -136,18 +136,6 @@ public class CertificateStore extends Cr
* Evaluate whether a given certificate chain should be trusted.
*
* @param certs Certificate chain to validate
- * @return true if the certificate chain is valid, false otherwise
- * @throws WSSecurityException
- */
- @Deprecated
- public boolean verifyTrust(X509Certificate[] certs) throws WSSecurityException {
- return verifyTrust(certs, false);
- }
-
- /**
- * Evaluate whether a given certificate chain should be trusted.
- *
- * @param certs Certificate chain to validate
* @param enableRevocation whether to enable CRL verification or not
* @return true if the certificate chain is valid, false otherwise
* @throws WSSecurityException
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Crypto.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Crypto.java?rev=1454320&r1=1454319&r2=1454320&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Crypto.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Crypto.java Fri Mar 8 11:06:40 2013
@@ -182,16 +182,6 @@ public interface Crypto {
* Evaluate whether a given certificate chain should be trusted.
*
* @param certs Certificate chain to validate
- * @return true if the certificate chain is valid, false otherwise
- * @throws WSSecurityException
- */
- @Deprecated
- boolean verifyTrust(X509Certificate[] certs) throws WSSecurityException;
-
- /**
- * Evaluate whether a given certificate chain should be trusted.
- *
- * @param certs Certificate chain to validate
* @param enableRevocation whether to enable CRL verification or not
* @return true if the certificate chain is valid, false otherwise
* @throws WSSecurityException
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java?rev=1454320&r1=1454319&r2=1454320&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java Fri Mar 8 11:06:40 2013
@@ -768,19 +768,6 @@ public class Merlin extends CryptoBase {
* Uses the CertPath API to validate a given certificate chain.
*
* @param certs Certificate chain to validate
- * @return true if the certificate chain is valid, false otherwise
- * @throws WSSecurityException
- */
- @Deprecated
- public boolean verifyTrust(X509Certificate[] certs) throws WSSecurityException {
- return verifyTrust(certs, false);
- }
-
- /**
- * Evaluate whether a given certificate chain should be trusted.
- * Uses the CertPath API to validate a given certificate chain.
- *
- * @param certs Certificate chain to validate
* @param enableRevocation whether to enable CRL verification or not
* @return true if the certificate chain is valid, false otherwise
* @throws WSSecurityException
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML2ComponentBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML2ComponentBuilder.java?rev=1454320&r1=1454319&r2=1454320&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML2ComponentBuilder.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML2ComponentBuilder.java Fri Mar 8 11:06:40 2013
@@ -332,19 +332,6 @@ public final class SAML2ComponentBuilder
*
* @param friendlyName of type String
* @param name of type String
- * @param values of type ArrayList
- * @return a SAML2 Attribute
- * @deprecated
- */
- public static Attribute createAttribute(String friendlyName, String name, List<String> values) {
- return createAttribute(friendlyName, name, null, values);
- }
-
- /**
- * Create a SAML2 Attribute
- *
- * @param friendlyName of type String
- * @param name of type String
* @param nameFormat of type String
* @param values of type ArrayList
* @return a SAML2 Attribute
@@ -414,30 +401,6 @@ public final class SAML2ComponentBuilder
/**
* Create a SubjectConfirmationData object
*
- * @param inResponseTo of type String
- * @param recipient of type String
- * @param notOnOrAfter of type DateTime
- * @param keyInfoBean of type KeyInfoBean
- * @return a SubjectConfirmationData object
- */
- @Deprecated
- public static SubjectConfirmationData createSubjectConfirmationData(
- String inResponseTo,
- String recipient,
- DateTime notOnOrAfter,
- KeyInfoBean keyInfoBean
- ) throws org.opensaml.xml.security.SecurityException, WSSecurityException {
- SubjectConfirmationDataBean subjectConfirmationDataBean =
- new SubjectConfirmationDataBean();
- subjectConfirmationDataBean.setInResponseTo(inResponseTo);
- subjectConfirmationDataBean.setRecipient(recipient);
- subjectConfirmationDataBean.setNotAfter(notOnOrAfter);
- return createSubjectConfirmationData(subjectConfirmationDataBean, keyInfoBean);
- }
-
- /**
- * Create a SubjectConfirmationData object
- *
* @param subjectConfirmationDataBean of type SubjectConfirmationDataBean
* @param keyInfoBean of type KeyInfoBean
* @return a SubjectConfirmationData object
@@ -584,21 +547,6 @@ public final class SAML2ComponentBuilder
}
/**
- * Create an Attribute object. The name format is of type:
- * urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified
- * urn:oasis:names:tc:SAML:2.0:attrname-format:uri
- * urn:oasis:names:tc:SAML:2.0:attrname-format:basic
- *
- * @param friendlyName of type String
- * @param name of type String
- * @return an Attribute object
- * @deprecated
- */
- public static Attribute createAttribute(String friendlyName, String name) {
- return createAttribute(friendlyName, name, (String)null);
- }
-
- /**
* Create an Attribute object.
*
* @param friendlyName of type String
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSDocInfo.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSDocInfo.java?rev=1454320&r1=1454319&r2=1454320&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSDocInfo.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSDocInfo.java Fri Mar 8 11:06:40 2013
@@ -181,29 +181,6 @@ public class WSDocInfo {
}
/**
- * Store a protection element for later retrieval. This is only used for the
- * creation/outbound case.
- * @param element is the protection element to store
- * @deprecated
- */
- public void addProtectionElement(Element element) {
- if (tokenList == null) {
- tokenList = new ArrayList<Element>();
- }
- tokenList.add(element);
- }
-
- /**
- * Get a protection element for the given (wsu/SAML) Id.
- * @param uri is the (relative) uri of the id
- * @return the protection element or null if nothing found
- * @deprecated
- */
- public Element getProtectionElement(String uri) {
- return getTokenElement(uri);
- }
-
- /**
* Store a WSSecurityEngineResult for later retrieval.
* @param result is the WSSecurityEngineResult to store
*/
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java?rev=1454320&r1=1454319&r2=1454320&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java Fri Mar 8 11:06:40 2013
@@ -315,22 +315,6 @@ public class WSSecEncrypt extends WSSecE
}
/**
- * @deprecated Use encryptForRef(dataRef, references) instead
- */
- public Element encryptForInternalRef(Element dataRef, List<WSEncryptionPart> references)
- throws WSSecurityException {
- return encryptForRef(dataRef, references);
- }
-
- /**
- * @deprecated Use encryptForRef(dataRef, references) instead
- */
- public Element encryptForExternalRef(Element dataRef, List<WSEncryptionPart> references)
- throws WSSecurityException {
- return encryptForRef(dataRef, references);
- }
-
- /**
* Adds the internal Reference element to this Encrypt data.
*
* The reference element <i>must</i> be created by the
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/KerberosTokenValidator.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/KerberosTokenValidator.java?rev=1454320&r1=1454319&r2=1454320&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/KerberosTokenValidator.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/KerberosTokenValidator.java Fri Mar 8 11:06:40 2013
@@ -64,24 +64,6 @@ public class KerberosTokenValidator impl
}
/**
- * @deprecated
- * Get the JAAS Login module name to use.
- * @return the JAAS Login module name to use
- */
- public String getJaasLoginModuleName() {
- return contextName;
- }
-
- /**
- * @deprecated
- * Set the JAAS Login module name to use.
- * @param jaasLoginModuleName the JAAS Login module name to use
- */
- public void setJaasLoginModuleName(String jaasLoginModuleName) {
- this.contextName = jaasLoginModuleName;
- }
-
- /**
* Get the CallbackHandler to use with the LoginContext
* @return the CallbackHandler to use with the LoginContext
*/
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/SignatureTrustValidator.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/SignatureTrustValidator.java?rev=1454320&r1=1454319&r2=1454320&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/SignatureTrustValidator.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/SignatureTrustValidator.java Fri Mar 8 11:06:40 2013
@@ -113,18 +113,6 @@ public class SignatureTrustValidator imp
}
}
- @Deprecated
- protected boolean verifyTrustInCert(X509Certificate cert, Crypto crypto)
- throws WSSecurityException {
- return verifyTrustInCert(cert, crypto, new RequestData(), false);
- }
-
- @Deprecated
- protected boolean verifyTrustInCert(X509Certificate cert, Crypto crypto, boolean enableRevocation)
- throws WSSecurityException {
- return verifyTrustInCert(cert, crypto, new RequestData(), enableRevocation);
- }
-
/**
* Evaluate whether a given certificate should be trusted.
*
@@ -271,23 +259,6 @@ public class SignatureTrustValidator imp
return false;
}
- @Deprecated
- protected boolean verifyTrustInCerts(
- X509Certificate[] certificates,
- Crypto crypto
- ) throws WSSecurityException {
- return verifyTrustInCerts(certificates, crypto, new RequestData(), false);
- }
-
- @Deprecated
- protected boolean verifyTrustInCerts(
- X509Certificate[] certificates,
- Crypto crypto,
- boolean enableRevocation
- ) throws WSSecurityException {
- return verifyTrustInCerts(certificates, crypto, new RequestData(), enableRevocation);
- }
-
/**
* Evaluate whether the given certificate chain should be trusted.
*