Author: fadushin
Date: Tue Jun 3 12:26:58 2008
New Revision: 662864
URL: http://svn.apache.org/viewvc?rev=662864&view=rev
Log:
Merged branch/tags changes to mainline
Added:
webservices/wss4j/trunk/ChangeLog.txt
- copied unchanged from r660552,
webservices/wss4j/tags/1_5_4/ChangeLog.txt
webservices/wss4j/trunk/test/wssec/TestWSSecurityNew16.java
- copied unchanged from r660552,
webservices/wss4j/tags/1_5_4/test/wssec/TestWSSecurityNew16.java
Removed:
webservices/wss4j/trunk/lib/bcprov-jdk13-132.jar
webservices/wss4j/trunk/lib/bcprov-jdk15-132.jar
Modified:
webservices/wss4j/trunk/README.txt
webservices/wss4j/trunk/build.xml
webservices/wss4j/trunk/pom.xml
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncryptedKey.java
webservices/wss4j/trunk/src/org/apache/ws/security/processor/SignatureProcessor.java
webservices/wss4j/trunk/test/wssec/PackageTests.java
webservices/wss4j/trunk/wss4j-readme.html
webservices/wss4j/trunk/xdocs/index.xml
Modified: webservices/wss4j/trunk/README.txt
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/README.txt?rev=662864&r1=662863&r2=662864&view=diff
==============================================================================
--- webservices/wss4j/trunk/README.txt (original)
+++ webservices/wss4j/trunk/README.txt Tue Jun 3 12:26:58 2008
@@ -87,7 +87,7 @@
are accessed either as resources via classpath or, if that fails, as files
using the relative path of the application
-Thus no specific installation is required. The wss4j-1.5.1.jar file could be
+Thus no specific installation is required. The wss4j jar file could be
included into ear or war files of enterprise or web application servers.
Please refer to the JAVADOC files of the distribution for further
Modified: webservices/wss4j/trunk/build.xml
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/build.xml?rev=662864&r1=662863&r2=662864&view=diff
==============================================================================
--- webservices/wss4j/trunk/build.xml (original)
+++ webservices/wss4j/trunk/build.xml Tue Jun 3 12:26:58 2008
@@ -27,10 +27,10 @@
<property name='product.version.major' value='1'/>
<property name='product.version.minor' value='5'/>
- <property name='product.version.level' value='2'/>
- <!--<property name='product.version'
value='${product.version.major}.${product.version.minor}.${product.version.level}'/>-->
- <property name='product.version' value='SNAPSHOT'/>
- <property name="year" value="2005"/>
+ <property name='product.version.level' value='4'/>
+ <property name='product.version' value='SNAPSHOT'/>
+ <!-- <property name='product.version'
value='${product.version.major}.${product.version.minor}.${product.version.level}'/>
-->
+ <property name="year" value="2008"/>
<property name="copyright" value="Copyright © ${year} Apache
WSS4J Project. All Rights Reserved."/>
<!-- Give user a chance to override without editing this file
@@ -712,6 +712,8 @@
/>
</target>
+ <target name="dist" depends="bindist, otherdist, srcdist"/>
+
<target name="bindist" depends="gump"
description="Build zip file for distro">
<delete dir="${dir.dist}"/>
Modified: webservices/wss4j/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/pom.xml?rev=662864&r1=662863&r2=662864&view=diff
==============================================================================
--- webservices/wss4j/trunk/pom.xml (original)
+++ webservices/wss4j/trunk/pom.xml Tue Jun 3 12:26:58 2008
@@ -7,6 +7,7 @@
<groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
<name>WSS4J</name>
+ <!-- <version>1.5.4</version> -->
<version>SNAPSHOT</version>
<description>
Apache WSS4J is an implementation of the Web Services Security
(WS-Security) being developed at
@@ -17,7 +18,7 @@
<url>http://ws.apache.org/wss4j/</url>
<issueManagement>
<system>JIRA</system>
- <url>http://issues.apache.org/jira/browse/WSS4J</url>
+ <url>http://issues.apache.org/jira/browse/WSS</url>
</issueManagement>
<ciManagement>
<system>Continuum</system>
@@ -71,6 +72,14 @@
<organization></organization>
</developer>
</developers>
+
+ <contributors>
+ <contributor>
+ <name>Colm O hEigeartaigh</name>
+ </contributor>
+ <!-- ask permission to list others -->
+ </contributors>
+
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
@@ -90,15 +99,24 @@
</organization>
<build>
<sourceDirectory>src</sourceDirectory>
- <resources>
- <resource>
- <directory>src</directory>
- <includes>
-
<include>org/**/errors.properties</include>
- </includes>
- <filtering>false</filtering>
- </resource>
- </resources>
+ <resources>
+
+ <resource>
+
+ <directory>src</directory>
+
+ <includes>
+
+
<include>org/**/errors.properties</include>
+
+ </includes>
+
+ <filtering>false</filtering>
+
+ </resource>
+
+ </resources>
+
<!--<testSourceDirectory>test</testSourceDirectory> -->
<plugins>
<plugin>
@@ -424,6 +442,18 @@
</plugin-->
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>dependencies</report>
+ <report>project-team</report>
+ <report>mailing-list</report>
+ <report>issue-tracking</report>
+ <report>license</report>
+ <report>scm</report>
+ </reports>
+ </reportSet>
+ </reportSets>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -435,6 +465,23 @@
<artifactId>jxr-maven-plugin</artifactId>
<version>2.0-beta-2-SNAPSHOT</version>
</plugin-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <configuration>
+ <onlyCurrentVersion>true</onlyCurrentVersion>
+ <resolutionIds>Any</resolutionIds>
+ <statusIds>Resolved, Closed</statusIds>
+ <sortColumnNames>Key</sortColumnNames>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>jira-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
</plugins>
</reporting>
<distributionManagement>
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java?rev=662864&r1=662863&r2=662864&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java
Tue Jun 3 12:26:58 2008
@@ -296,6 +296,10 @@
}
prepare(doc, crypto);
+
+ if (envelope == null) {
+ envelope = document.getDocumentElement();
+ }
SOAPConstants soapConstants =
WSSecurityUtil.getSOAPConstants(envelope);
if (parts == null) {
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncryptedKey.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncryptedKey.java?rev=662864&r1=662863&r2=662864&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncryptedKey.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncryptedKey.java
Tue Jun 3 12:26:58 2008
@@ -451,6 +451,14 @@
}
/**
+ * Set the encrypted key element when a pre prepared encrypted key is used
+ * @param encryptedKeyElement EncryptedKey element of the encrypted key
used
+ */
+ public void setEncryptedKeyElement(Element encryptedKeyElement) {
+ this.encryptedKeyElement = encryptedKeyElement;
+ }
+
+ /**
* @return Returns the BinarySecurityToken element.
*/
public Element getBinarySecurityTokenElement() {
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/processor/SignatureProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/processor/SignatureProcessor.java?rev=662864&r1=662863&r2=662864&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/processor/SignatureProcessor.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/processor/SignatureProcessor.java
Tue Jun 3 12:26:58 2008
@@ -236,8 +236,18 @@
secretKey = samlKi.getSecret();
} else if (el.equals(WSSecurityEngine.ENCRYPTED_KEY)){
- EncryptedKeyProcessor encryptKeyProcessor = new
EncryptedKeyProcessor();
- encryptKeyProcessor.handleEncryptedKey((Element)token,
cb, crypto);
+
+ String encryptedKeyID =
token.getAttributeNS(null,"Id");
+ EncryptedKeyProcessor encryptKeyProcessor =
(EncryptedKeyProcessor)
+ wsDocInfo.getProcessor(encryptedKeyID);
+
+ if (encryptKeyProcessor == null ) {
+
+ encryptKeyProcessor = new EncryptedKeyProcessor();
+
encryptKeyProcessor.handleEncryptedKey((Element)token, cb, crypto);
+
+ }
+
secretKey = encryptKeyProcessor.getDecryptedBytes();
}else {
Modified: webservices/wss4j/trunk/test/wssec/PackageTests.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/PackageTests.java?rev=662864&r1=662863&r2=662864&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/PackageTests.java (original)
+++ webservices/wss4j/trunk/test/wssec/PackageTests.java Tue Jun 3 12:26:58
2008
@@ -63,6 +63,7 @@
suite.addTestSuite(TestWSSecurityNew12.class);
suite.addTestSuite(TestWSSecurityNew13.class);
suite.addTestSuite(TestWSSecurityNew14.class);
+ suite.addTestSuite(TestWSSecurityNew16.class);
suite.addTestSuite(TestWSSecurityNewSOAP12.class);
// suite.addTestSuite(TestWSSecurityHooks.class);
suite.addTestSuite(TestWSSecurityNewST1.class);
Modified: webservices/wss4j/trunk/wss4j-readme.html
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-readme.html?rev=662864&r1=662863&r2=662864&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-readme.html (original)
+++ webservices/wss4j/trunk/wss4j-readme.html Tue Jun 3 12:26:58 2008
@@ -2,7 +2,7 @@
<HTML>
<HEAD>
<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
- <TITLE>Apache WSS4J-1.5.2</TITLE>
+ <TITLE>Apache WSS4J</TITLE>
<META NAME="GENERATOR" CONTENT="OpenOffice.org 1.9.79 (Linux)">
<META NAME="AUTHOR" CONTENT="Werner Dittmann">
<META NAME="CREATED" CONTENT="20050904;11070500">
@@ -106,7 +106,7 @@
the relative path of the application
</P>
<P STYLE="margin-bottom: 0cm">Thus no specific installation is
-required. The wss4j-1.5.2.jar file should be included into ear or war files
+required. The wss4j jar file should be included into ear or war files
of enterprise or web application servers.</P>
<P STYLE="margin-bottom: 0cm">Please refer to the JAVADOC files of
the distribution for further information how to use WSS4J, the
Modified: webservices/wss4j/trunk/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/xdocs/index.xml?rev=662864&r1=662863&r2=662864&view=diff
==============================================================================
--- webservices/wss4j/trunk/xdocs/index.xml (original)
+++ webservices/wss4j/trunk/xdocs/index.xml Tue Jun 3 12:26:58 2008
@@ -58,7 +58,7 @@
</ul>
</subsection>
<subsection name="Where can I download WSS4J">
- <p style="margin-left: 40px;">Latest version of WSS4J is
1.5.2:<br/>
+ <p style="margin-left: 40px;">You can download the latest
version of WSS4J at the following URL:<br/>
<a
href="http://www.apache.org/dyn/closer.cgi/ws/wss4j/";>http://www.apache.org/dyn/closer.cgi/ws/wss4j/</a>
</p>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
