Author: coheigea
Date: Wed Jul 29 16:31:29 2009
New Revision: 798973
URL: http://svn.apache.org/viewvc?rev=798973&view=rev
Log:
Forward merging to trunk.
Modified:
webservices/wss4j/trunk/build.xml
webservices/wss4j/trunk/src/org/apache/ws/security/message/token/UsernameToken.java
webservices/wss4j/trunk/src/org/apache/ws/security/util/WSSecurityUtil.java
Modified: webservices/wss4j/trunk/build.xml
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/build.xml?rev=798973&r1=798972&r2=798973&view=diff
==============================================================================
--- webservices/wss4j/trunk/build.xml (original)
+++ webservices/wss4j/trunk/build.xml Wed Jul 29 16:31:29 2009
@@ -730,7 +730,7 @@
"${dir.dist}/${product.shortname}-bin-${product.version}.zip">
<zipfileset prefix="wss4j" dir="."
includes="keys/**, interop/**, interop2/**, test/**, samples/**,
- ChangeLog.txt, LICENSE.txt, README.txt, NOTICE, legal/**,
webapps/**"/>
+ ChangeLog.txt, LICENSE.txt, README.txt, NOTICE, webapps/**"/>
<zipfileset prefix="wss4j/classes" dir="${build.classes}"
includes=
"*.properties, interop/**, wssec/**, org/**/oasis/**,
org/**/samples/**"/>
@@ -746,7 +746,7 @@
<zip destfile=
"${dir.dist}/${product.shortname}-otherjars-${product.version}.zip">
<zipfileset prefix="wss4j" dir="."
- includes="lib/*.jar, endorsed/*.jar legal/**"/>
+ includes="lib/*.jar, endorsed/*.jar, LICENSE.txt, README.txt,
NOTICE, legal/**"/>
</zip>
</target>
@@ -756,7 +756,7 @@
<zip destfile=
"${dir.dist}/${product.shortname}-src-${product.version}.zip">
<zipfileset prefix="wss4j" dir="."
- includes="src/** ChangeLog.txt LICENSE.txt README.txt NOTICE
legal/** build.xml "/>
+ includes="src/** ChangeLog.txt LICENSE.txt README.txt NOTICE
build.xml "/>
</zip>
</target>
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/token/UsernameToken.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/token/UsernameToken.java?rev=798973&r1=798972&r2=798973&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/message/token/UsernameToken.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/message/token/UsernameToken.java
Wed Jul 29 16:31:29 2009
@@ -477,7 +477,7 @@
/**
* Set the raw (plain text) password used to compute secret key.
*
- * @param raw_password the raw_password to set
+ * @param newRawPassword the raw password to set
*/
public void setRawPassword(String newRawPassword) {
rawPassword = newRawPassword;
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/util/WSSecurityUtil.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/util/WSSecurityUtil.java?rev=798973&r1=798972&r2=798973&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/util/WSSecurityUtil.java
(original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/util/WSSecurityUtil.java
Wed Jul 29 16:31:29 2009
@@ -231,7 +231,7 @@
* <code>//name</code> with the given namespace. It's somewhat faster than
* XPath, and we do not deal with prefixes, just with the real namespace
URI
*
- * @param start Node Where to start the search
+ * @param startNode Where to start the search
* @param name Local name of the element
* @param namespace Namespace URI of the element
* @return The found element or <code>null</code>
---------------------------------------------------------------------
To unsubscribe, e-mail: wss4j-dev-unsubscr...@ws.apache.org
For additional commands, e-mail: wss4j-dev-h...@ws.apache.org
