You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ru...@apache.org on 2006/12/02 09:53:45 UTC
svn commit: r481520 - in /webservices/axis2/branches/java/1_1: ./
modules/rahas/src/org/apache/rahas/
modules/rahas/src/org/apache/rahas/impl/ modules/security/
modules/security/src/org/apache/rampart/builder/
modules/security/src/org/apache/rampart/co...
Author: ruchithf
Date: Sat Dec 2 00:53:42 2006
New Revision: 481520
URL: http://svn.apache.org/viewvc?view=rev&rev=481520
Log:
- Handle the case where we use keys derived using an ephemeral key when the client is an async client.
- Added the rampart-javadocs goal
- Getting rid of javadoc warnings
- Deprecating older handlers and their utility classes
Modified:
webservices/axis2/branches/java/1_1/maven.xml
webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/TokenCanceler.java
webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/TokenRenewer.java
webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/TokenStorage.java
webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/TokenValidator.java
webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/TrustUtil.java
webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/impl/TokenCancelerImpl.java
webservices/axis2/branches/java/1_1/modules/security/maven.xml
webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/builder/AsymmetricBindingBuilder.java
webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/builder/BindingBuilder.java
webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/conversation/ConversationCallbackHandler.java
webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/conversation/ConversationConfiguration.java
webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/conversation/STSRequester.java
webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/conversation/Util.java
webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/WSDoAllReceiver.java
webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/WSDoAllSender.java
webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/config/InflowConfiguration.java
webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/config/OutflowConfiguration.java
webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/policy/RampartPolicyData.java
webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/util/RampartUtil.java
Modified: webservices/axis2/branches/java/1_1/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/maven.xml?view=diff&rev=481520&r1=481519&r2=481520
==============================================================================
--- webservices/axis2/branches/java/1_1/maven.xml (original)
+++ webservices/axis2/branches/java/1_1/maven.xml Sat Dec 2 00:53:42 2006
@@ -1023,8 +1023,8 @@
<!-- ================================================================ -->
<!--- Create Apache Rampart Release Artifacts -->
- <!-- ================================================================ -->
- <goal name="rampart-release">
+ <!-- ========================prereqs="create-lib"======================================== -->
+ <goal name="rampart-release" >
<ant:echo>+----------------------------------------------</ant:echo>
<ant:echo>| Creating: Rampart Release</ant:echo>
@@ -1035,8 +1035,9 @@
<attainGoal name="rampart-dist-bin"/>
<attainGoal name="rampart-dist-src"/>
-
- <!--<attainGoal name="rampart-dist-doc"/> -->
+
+ <attainGoal name="rampart-javadocs"/>
+
</goal>
<!-- ================================================================ -->
@@ -1166,6 +1167,40 @@
<ant:fileset dir="target/temp-rampart-src/"/>
</ant:zip>
<ant:delete dir="target/temp-rampart-src"/>
+ </goal>
+
+
+ <!-- ================================================================ -->
+ <!--- Create Rampart Java Docs -->
+ <!-- ================================================================ -->
+ aaf
+ <goal name="rampart-javadocs">
+ <ant:javadoc packagenames="org.apache.rampart.*, org.apache.rahas.*,org.apache.ws.secpolicy.*"
+ defaultexcludes="yes"
+ destdir="target/dist/rampart/rampart-${rampart_version}-apidocs"
+ author="true"
+ breakiterator="true"
+ version="true"
+ use="true"
+ windowtitle="Apache Rampart ${rampart_version} API">
+ <ant:arg
+ line="-J-Dhttp.proxy.port=${maven.proxy.port} -J-Dhttp.proxy.host=${maven.proxy.host}"/>
+ <ant:sourcepath>
+ <ant:pathelement location="modules/security/src"/>
+ <ant:pathelement location="modules/rahas/src"/>
+ <ant:pathelement location="modules/secpolicy/src"/>
+ </ant:sourcepath>
+ <ant:classpath>
+ <ant:fileset dir="target/lib">
+ <ant:include name="**/*.jar"/>
+ </ant:fileset>
+ </ant:classpath>
+ <ant:link href="http://java.sun.com/j2se/1.4.2/docs/api/"/>
+ <ant:link href="http://java.sun.com/webservices/docs/1.5/api/"/>
+ <ant:link href="http://xerces.apache.org/xerces-j/apiDocs/"/>
+ <ant:link href="http://xml.apache.org/xalan-j/apidocs/"/>
+ <ant:link href="http://xmlbeans.apache.org/docs/2.1.0/reference/"/>
+ </ant:javadoc>
</goal>
<define:taglib uri="macros">
Modified: webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/TokenCanceler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/TokenCanceler.java?view=diff&rev=481520&r1=481519&r2=481520
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/TokenCanceler.java (original)
+++ webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/TokenCanceler.java Sat Dec 2 00:53:42 2006
@@ -25,7 +25,7 @@
* Cancel the token specified in the request.
*
* @param data A populated <code>RahasData</code> instance
- * @return
+ * @return Response SOAPEnveloper
* @throws TrustException
*/
SOAPEnvelope cancel(RahasData data) throws TrustException;
Modified: webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/TokenRenewer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/TokenRenewer.java?view=diff&rev=481520&r1=481519&r2=481520
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/TokenRenewer.java (original)
+++ webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/TokenRenewer.java Sat Dec 2 00:53:42 2006
@@ -25,7 +25,7 @@
*
* @param data
* A populated <code>RahasData</code> instance
- * @return
+ * @return Response SOAPEnveloper
* @throws TrustException
*/
public SOAPEnvelope renew(RahasData data) throws TrustException;
Modified: webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/TokenStorage.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/TokenStorage.java?view=diff&rev=481520&r1=481519&r2=481520
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/TokenStorage.java (original)
+++ webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/TokenStorage.java Sat Dec 2 00:53:42 2006
@@ -50,28 +50,28 @@
* Return the list of <code>EXPIRED</code> tokens.
* If there are no <code>EXPIRED</code> tokens <code>null</code> will be
* returned
- * @return
+ * @return An array of expired <code>Tokens</code>
* @throws TrustException
*/
Token[] getExpiredTokens() throws TrustException;
/**
* Return the list of ISSUED and RENEWED tokens.
- * @return
+ * @return An array of ISSUED and RENEWED <code>Tokens</code>.
* @throws TrustException
*/
Token[] getValidTokens() throws TrustException;
/**
* Return the list of RENEWED tokens.
- * @return
+ * @return An array of RENEWED <code>Tokens</code>
* @throws TrustException
*/
Token[] getRenewedTokens() throws TrustException;
/**
* Return the list of CANCELLED tokens
- * @return
+ * @return An array of CANCELLED <code>Tokens</code>
* @throws TrustException
*/
Token[] getCancelledTokens() throws TrustException;
@@ -79,7 +79,7 @@
/**
* Returns the <code>Token</code> of the given id
* @param id
- * @return
+ * @return The requested <code>Token</code> identified by the give id
* @throws TrustException
*/
Token getToken(String id) throws TrustException;
Modified: webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/TokenValidator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/TokenValidator.java?view=diff&rev=481520&r1=481519&r2=481520
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/TokenValidator.java (original)
+++ webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/TokenValidator.java Sat Dec 2 00:53:42 2006
@@ -25,7 +25,7 @@
*
* @param data
* A populated <code>RahasData</code> instance
- * @return
+ * @return Response SOAPEnveloper
* @throws TrustException
*/
public SOAPEnvelope validate(RahasData data) throws TrustException;
Modified: webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/TrustUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/TrustUtil.java?view=diff&rev=481520&r1=481519&r2=481520
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/TrustUtil.java (original)
+++ webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/TrustUtil.java Sat Dec 2 00:53:42 2006
@@ -399,7 +399,7 @@
/**
* Create an ephemeral key
*
- * @return
+ * @return The generated ephemeral key
* @throws TrustException
*/
protected byte[] generateEphemeralKey(int keySize) throws TrustException {
@@ -416,7 +416,7 @@
/**
* Create an ephemeral key
*
- * @return
+ * @return The generated ephemeral key
* @throws TrustException
*/
protected byte[] generateEphemeralKey(byte[] reqEnt,
Modified: webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/impl/TokenCancelerImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/impl/TokenCancelerImpl.java?view=diff&rev=481520&r1=481519&r2=481520
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/impl/TokenCancelerImpl.java (original)
+++ webservices/axis2/branches/java/1_1/modules/rahas/src/org/apache/rahas/impl/TokenCancelerImpl.java Sat Dec 2 00:53:42 2006
@@ -51,7 +51,7 @@
* Cancel the token specified in the request.
*
* @param data A populated <code>RahasData</code> instance
- * @return
+ * @return Response SOAPEnveloper
* @throws org.apache.rahas.TrustException
*
*/
Modified: webservices/axis2/branches/java/1_1/modules/security/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/security/maven.xml?view=diff&rev=481520&r1=481519&r2=481520
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/security/maven.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/security/maven.xml Sat Dec 2 00:53:42 2006
@@ -211,12 +211,14 @@
<copy toDir="target/classes/META-INF/services" overwrite="yes">
<fileset dir="src/META-INF/services" />
</copy>
- <delete includeEmptyDirs="true">
- <fileset dir="target/classes/org/xmlsoap/"/>
- <fileset dir="target/classes/org/oasis_open/"/>
- <fileset dir="target/classes/org/w3/"/>
- <fileset file="target/classes/org/apache/axis2/security/InteropScenarioClient.class"/>
- </delete>
+ <j:if test="${context.getVariable('maven.test.skip') != 'true'}">
+ <delete includeEmptyDirs="true">
+ <fileset dir="target/classes/org/xmlsoap/"/>
+ <fileset dir="target/classes/org/oasis_open/"/>
+ <fileset dir="target/classes/org/w3/"/>
+ <fileset file="target/classes/org/apache/axis2/security/InteropScenarioClient.class"/>
+ </delete>
+ </j:if>
</preGoal>
</project>
Modified: webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/builder/AsymmetricBindingBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/builder/AsymmetricBindingBuilder.java?view=diff&rev=481520&r1=481519&r2=481520
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/builder/AsymmetricBindingBuilder.java (original)
+++ webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/builder/AsymmetricBindingBuilder.java Sat Dec 2 00:53:42 2006
@@ -531,39 +531,55 @@
if(resultsObj != null) {
encryptedKeyId = RampartUtil.getRequestEncryptedKeyId((Vector)resultsObj);
encryptedKeyValue = RampartUtil.getRequestEncryptedKeyValue((Vector)resultsObj);
- if(encryptedKeyId == null || encryptedKeyValue == null) {
- throw new RampartException("missingEncryptedKeyInRequest");
+
+ //In the case where we don't have the EncryptedKey in the
+ //request, for the control to have reached this state,
+ //the scenario MUST be a case where this is the response
+ //message by a listener created for an async client
+ //Therefor we will create a new EncryptedKey
+ if(encryptedKeyId == null && encryptedKeyValue == null) {
+ createEncryptedKey(rmd, token);
}
} else {
throw new RampartException("noSecurityResults");
}
- } else {
- //Set up the encrypted key to use
- encrKey = this.getEncryptedKeyBuilder(rmd, token);
+ } else {
+ createEncryptedKey(rmd, token);
+ }
+ }
- Element bstElem = encrKey.getBinarySecurityTokenElement();
- if (bstElem != null) {
- // If a BST is available then use it
- RampartUtil.appendChildToSecHeader(rmd, bstElem);
- }
-
- // Add the EncryptedKey
- encrTokenElement = encrKey.getEncryptedKeyElement();
- this.encrTokenElement = RampartUtil.appendChildToSecHeader(rmd,
- encrTokenElement);
- encryptedKeyValue = encrKey.getEphemeralKey();
- encryptedKeyId = encrKey.getId();
+ /**
+ * Create an encrypted key element
+ * @param rmd
+ * @param token
+ * @throws RampartException
+ */
+ private void createEncryptedKey(RampartMessageData rmd, Token token) throws RampartException {
+ //Set up the encrypted key to use
+ encrKey = this.getEncryptedKeyBuilder(rmd, token);
- //Store the token for client - response verification
- // and server - response creation
- try {
- org.apache.rahas.Token tok = new org.apache.rahas.Token(
- encryptedKeyId, (OMElement)encrTokenElement , null, null);
- tok.setSecret(encryptedKeyValue);
- rmd.getTokenStorage().add(tok);
- } catch (TrustException e) {
- throw new RampartException("errorInAddingTokenIntoStore", e);
- }
- }
+ Element bstElem = encrKey.getBinarySecurityTokenElement();
+ if (bstElem != null) {
+ // If a BST is available then use it
+ RampartUtil.appendChildToSecHeader(rmd, bstElem);
+ }
+
+ // Add the EncryptedKey
+ encrTokenElement = encrKey.getEncryptedKeyElement();
+ this.encrTokenElement = RampartUtil.appendChildToSecHeader(rmd,
+ encrTokenElement);
+ encryptedKeyValue = encrKey.getEphemeralKey();
+ encryptedKeyId = encrKey.getId();
+
+ //Store the token for client - response verification
+ // and server - response creation
+ try {
+ org.apache.rahas.Token tok = new org.apache.rahas.Token(
+ encryptedKeyId, (OMElement)encrTokenElement , null, null);
+ tok.setSecret(encryptedKeyValue);
+ rmd.getTokenStorage().add(tok);
+ } catch (TrustException e) {
+ throw new RampartException("errorInAddingTokenIntoStore", e);
+ }
}
}
Modified: webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/builder/BindingBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/builder/BindingBuilder.java?view=diff&rev=481520&r1=481519&r2=481520
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/builder/BindingBuilder.java (original)
+++ webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/builder/BindingBuilder.java Sat Dec 2 00:53:42 2006
@@ -99,7 +99,7 @@
* @param rmd
* @param rpd
* @param doc
- * @return
+ * @return The <code>WSSecUsernameToken</code> instance
* @throws RampartException
*/
protected WSSecUsernameToken addUsernameToken(RampartMessageData rmd) throws RampartException {
Modified: webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/conversation/ConversationCallbackHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/conversation/ConversationCallbackHandler.java?view=diff&rev=481520&r1=481519&r2=481520
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/conversation/ConversationCallbackHandler.java (original)
+++ webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/conversation/ConversationCallbackHandler.java Sat Dec 2 00:53:42 2006
@@ -28,6 +28,7 @@
/**
* This is ths callback handler used to extract he secure conversation
* session key for a given context identifier
+ * @deprecated
*/
public class ConversationCallbackHandler implements CallbackHandler {
Modified: webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/conversation/ConversationConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/conversation/ConversationConfiguration.java?view=diff&rev=481520&r1=481519&r2=481520
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/conversation/ConversationConfiguration.java (original)
+++ webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/conversation/ConversationConfiguration.java Sat Dec 2 00:53:42 2006
@@ -43,6 +43,7 @@
/**
* Configuration manager for Ramapart-SecConv
+ * @deprecated
*/
public class ConversationConfiguration {
Modified: webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/conversation/STSRequester.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/conversation/STSRequester.java?view=diff&rev=481520&r1=481519&r2=481520
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/conversation/STSRequester.java (original)
+++ webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/conversation/STSRequester.java Sat Dec 2 00:53:42 2006
@@ -39,6 +39,9 @@
import javax.xml.namespace.QName;
+/**
+ * @deprecated
+ */
public class STSRequester {
Modified: webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/conversation/Util.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/conversation/Util.java?view=diff&rev=481520&r1=481519&r2=481520
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/conversation/Util.java (original)
+++ webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/conversation/Util.java Sat Dec 2 00:53:42 2006
@@ -43,7 +43,7 @@
* <code>Crypto</code> instance of the configuration.
*
* @param config
- * @return
+ * @return The crypto instance of this configuration
* @throws RahasException
*/
public static Crypto getCryptoInstace(ConversationConfiguration config)
Modified: webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/WSDoAllReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/WSDoAllReceiver.java?view=diff&rev=481520&r1=481519&r2=481520
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/WSDoAllReceiver.java (original)
+++ webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/WSDoAllReceiver.java Sat Dec 2 00:53:42 2006
@@ -52,6 +52,9 @@
import java.util.Iterator;
import java.util.Vector;
+/**
+ * @deprecated
+ */
public class WSDoAllReceiver extends WSDoAllHandler {
private static final Log log = LogFactory.getLog(WSDoAllReceiver.class);
Modified: webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/WSDoAllSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/WSDoAllSender.java?view=diff&rev=481520&r1=481519&r2=481520
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/WSDoAllSender.java (original)
+++ webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/WSDoAllSender.java Sat Dec 2 00:53:42 2006
@@ -57,6 +57,9 @@
import java.util.Date;
import java.util.Vector;
+/**
+ * @deprecated
+ */
public class WSDoAllSender extends WSDoAllHandler {
private static final Log log = LogFactory.getLog(WSDoAllSender.class);
Modified: webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/config/InflowConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/config/InflowConfiguration.java?view=diff&rev=481520&r1=481519&r2=481520
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/config/InflowConfiguration.java (original)
+++ webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/config/InflowConfiguration.java Sat Dec 2 00:53:42 2006
@@ -114,7 +114,7 @@
/**
* Sets the decryption property ref key.
- * @param decryptionPropFile
+ * @param decryptionPropRefKey
*/
public void setDecryptionPropRefKey(String decryptionPropRefKey) {
this.action.put(WSHandlerConstants.DEC_PROP_REF_ID,decryptionPropRefKey);
@@ -154,7 +154,7 @@
/**
* Sets the signature property ref key.
- * @param signaturePropFile
+ * @param signaturePropRefId
*/
public void setSignaturePropRefId(String signaturePropRefId) {
this.action.put(WSHandlerConstants.SIG_PROP_REF_ID, signaturePropRefId);
Modified: webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/config/OutflowConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/config/OutflowConfiguration.java?view=diff&rev=481520&r1=481519&r2=481520
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/config/OutflowConfiguration.java (original)
+++ webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/config/OutflowConfiguration.java Sat Dec 2 00:53:42 2006
@@ -496,7 +496,7 @@
/**
* Enable/Disable PrecisionInMilliseconds
- * @param encPropFile
+ * @param value
*/
public void setPrecisionInMilliseconds(boolean value) {
this.actionList[this.currentAction].put(
Modified: webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/policy/RampartPolicyData.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/policy/RampartPolicyData.java?view=diff&rev=481520&r1=481519&r2=481520
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/policy/RampartPolicyData.java (original)
+++ webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/policy/RampartPolicyData.java Sat Dec 2 00:53:42 2006
@@ -436,7 +436,7 @@
}
/**
- * @param signedEndorsingSupportingToken The signedEndorsingSupportingToken to set.
+ * @param signedEndorsingSupportingTokens The signedEndorsingSupportingToken to set.
*/
public void setSignedEndorsingSupportingTokens(
SupportingToken signedEndorsingSupportingTokens) {
@@ -451,7 +451,7 @@
}
/**
- * @param signedSupportingToken The signedSupportingToken to set.
+ * @param signedSupportingTokens The signedSupportingToken to set.
*/
public void setSignedSupportingTokens(SupportingToken signedSupportingTokens) {
this.signedSupportingTokens = signedSupportingTokens;
@@ -465,7 +465,7 @@
}
/**
- * @param endorsingSupportingToken The endorsingSupportingToken to set.
+ * @param endorsingSupportingTokens The endorsingSupportingToken to set.
*/
public void setEndorsingSupportingTokens(SupportingToken endorsingSupportingTokens) {
this.endorsingSupportingTokens = endorsingSupportingTokens;
Modified: webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/util/RampartUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/util/RampartUtil.java?view=diff&rev=481520&r1=481519&r2=481520
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/util/RampartUtil.java (original)
+++ webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/util/RampartUtil.java Sat Dec 2 00:53:42 2006
@@ -86,7 +86,7 @@
/**
* @param msgContext
* @param rpd
- * @return
+ * @return The <code>CallbackHandler</code> instance
* @throws RampartException
*/
public static CallbackHandler getPasswordCB(MessageContext msgContext, RampartPolicyData rpd) throws RampartException {
@@ -172,7 +172,7 @@
* from the rampart configuration assertion
*
* @param config
- * @return
+ * @return The <code>Crypto</code> instance to be used for encryption
* @throws RampartException
*/
public static Crypto getEncryptionCrypto(RampartConfig config, ClassLoader loader)
@@ -208,7 +208,7 @@
* from the rampart configuration assertion
*
* @param config
- * @return
+ * @return The <code>Crypto</code> instance to be used for signature
* @throws RampartException
*/
public static Crypto getSignatureCrypto(RampartConfig config, ClassLoader loader)
@@ -231,7 +231,7 @@
/**
* figureout the key identifier of a give X509Token
* @param token
- * @return
+ * @return The key identifier of a give X509Token
* @throws RampartException
*/
public static int getKeyIdentifier(X509Token token) throws RampartException {
@@ -251,7 +251,7 @@
/**
* Process a give issuer address element and return the address.
* @param issuerAddress
- * @return
+ * @return The address of an issuer address element
* @throws RampartException If the issuer address element is malformed.
*/
public static String processIssuerAddress(OMElement issuerAddress)
@@ -320,7 +320,7 @@
* Obtain a security context token.
* @param rmd
* @param secConvTok
- * @return
+ * @return Return the SecurityContextidentifier of the token
* @throws TrustException
* @throws RampartException
*/
@@ -372,7 +372,7 @@
* Obtain an issued token.
* @param rmd
* @param issuedToken
- * @return
+ * @return The identifier of the issued token
* @throws RampartException
*/
public static String getIssuedToken(RampartMessageData rmd,
@@ -408,7 +408,7 @@
* @param issuerEpr
* @param action
* @param issuerPolicy
- * @return
+ * @return Return the identifier of the obtained token
* @throws RampartException
*/
public static String getToken(RampartMessageData rmd, OMElement rstTemplate,
@@ -581,7 +581,7 @@
/**
* Creates the unique (reproducible) id for to hold the context identifier
* of the message exchange.
- * @return
+ * @return Id to hold the context identifier in the message context
*/
public static String getContextIdentifierKey(MessageContext msgContext) {
return msgContext.getAxisService().getName();
@@ -590,7 +590,7 @@
/**
* Returns the map of security context token identifiers
- * @return
+ * @return the map of security context token identifiers
*/
public static Hashtable getContextMap(MessageContext msgContext) {
//Fist check whether its there
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org