Author: coheigea
Date: Wed Oct 30 10:54:54 2013
New Revision: 1537035
URL: http://svn.apache.org/r1537035
Log:
Javadoc fixes + plugin updates
Modified:
webservices/wss4j/trunk/pom.xml
webservices/wss4j/trunk/ws-security-dom/pom.xml
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSSecurityProperties.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSUtils.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ReplayTest.java
Modified: webservices/wss4j/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/pom.xml?rev=1537035&r1=1537034&r2=1537035&view=diff
==============================================================================
--- webservices/wss4j/trunk/pom.xml (original)
+++ webservices/wss4j/trunk/pom.xml Wed Oct 30 10:54:54 2013
@@ -162,7 +162,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.3.2</version>
+ <version>2.4.2</version>
<configuration>
<useReleaseProfile>false</useReleaseProfile>
<preparationGoals>clean install</preparationGoals>
@@ -255,7 +255,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.15</version>
+ <version>2.16</version>
<inherited>true</inherited>
<configuration>
<reportFormat>brief</reportFormat>
@@ -272,7 +272,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
+ <version>2.9.2</version>
<executions>
<execution>
<goals>
Modified: webservices/wss4j/trunk/ws-security-dom/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/pom.xml?rev=1537035&r1=1537034&r2=1537035&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/pom.xml (original)
+++ webservices/wss4j/trunk/ws-security-dom/pom.xml Wed Oct 30 10:54:54 2013
@@ -264,7 +264,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
+ <version>2.9.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified:
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSSecurityProperties.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSSecurityProperties.java?rev=1537035&r1=1537034&r2=1537035&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSSecurityProperties.java
(original)
+++
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSSecurityProperties.java
Wed Oct 30 10:54:54 2013
@@ -177,7 +177,7 @@ public class WSSSecurityProperties exten
/**
* returns the password callback handler
*
- * @return
+ * @return the password callback handler
*/
public CallbackHandler getCallbackHandler() {
return callbackHandler;
@@ -187,7 +187,7 @@ public class WSSSecurityProperties exten
/**
* sets the password callback handler
*
- * @param callbackHandler
+ * @param callbackHandler the password callback handler
*/
public void setCallbackHandler(CallbackHandler callbackHandler) {
this.callbackHandler = callbackHandler;
@@ -518,7 +518,7 @@ public class WSSSecurityProperties exten
/**
* Returns the decryption crypto class
*
- * @return
+ * @return the decryption crypto class
*/
public Class<? extends Merlin> getDecryptionCryptoClass() {
if (decryptionWSSCrypto != null) {
@@ -612,7 +612,7 @@ public class WSSSecurityProperties exten
/**
* Returns the encryption crypto class
*
- * @return
+ * @return the encryption crypto class
*/
public Class<? extends Merlin> getEncryptionCryptoClass() {
if (encryptionWSSCrypto != null) {
Modified:
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSUtils.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSUtils.java?rev=1537035&r1=1537034&r2=1537035&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSUtils.java
(original)
+++
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSUtils.java
Wed Oct 30 10:54:54 2013
@@ -84,7 +84,6 @@ public class WSSUtils extends XMLSecurit
* Try to get the secret key from a CallbackHandler implementation
*
* @param callbackHandler a CallbackHandler implementation
- * @return An array of bytes corresponding to the secret key (can be null)
* @throws WSSecurityException
*/
public static void doSecretKeyCallback(CallbackHandler callbackHandler,
Callback callback, String id)
Modified:
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ReplayTest.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ReplayTest.java?rev=1537035&r1=1537034&r2=1537035&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ReplayTest.java
(original)
+++
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ReplayTest.java
Wed Oct 30 10:54:54 2013
@@ -167,6 +167,7 @@ public class ReplayTest extends Abstract
callbackHandler.setStatement(SAML2CallbackHandler.Statement.AUTHN);
callbackHandler.setConfirmationMethod(SAML2Constants.CONF_BEARER);
callbackHandler.setIssuer("www.example.com");
+ callbackHandler.setSignAssertion(false);
ConditionsBean conditions = new ConditionsBean();
conditions.setTokenPeriodMinutes(5);
@@ -218,6 +219,7 @@ public class ReplayTest extends Abstract
callbackHandler.setStatement(SAML2CallbackHandler.Statement.AUTHN);
callbackHandler.setConfirmationMethod(SAML2Constants.CONF_BEARER);
callbackHandler.setIssuer("www.example.com");
+ callbackHandler.setSignAssertion(false);
ConditionsBean conditions = new ConditionsBean();
conditions.setTokenPeriodMinutes(5);
