This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5_x
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 1a599e8d1990392af8e40896bdf735701174f661
Author: Andreas Veithen <veit...@apache.org>
AuthorDate: Fri Oct 28 22:23:10 2011 +0000
Merged r1190533 and r1190600 to the 1.5 branch.
---
.../main/java/org/apache/rampart/util/Axis2Util.java | 2 +-
modules/rampart-integration/pom.xml | 19 +++++++++++++++++++
pom.xml | 4 ++++
release-docs/README.txt | 10 +++++++---
4 files changed, 31 insertions(+), 4 deletions(-)
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
b/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
index b974cdb..4d719e1 100644
--- a/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
+++ b/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
@@ -131,7 +131,7 @@ public class Axis2Util {
env.getXMLStreamReader(), factory, nsURI);
SOAPEnvelope envelope = (stAXSOAPModelBuilder)
.getSOAPEnvelope();
- ((OMNode) envelope.getParent()).build();
+ envelope.getParent().build();
//Set the processed flag of the processed headers
SOAPHeader header = envelope.getHeader();
diff --git a/modules/rampart-integration/pom.xml
b/modules/rampart-integration/pom.xml
index dc3eeec..a6e613d 100644
--- a/modules/rampart-integration/pom.xml
+++ b/modules/rampart-integration/pom.xml
@@ -75,6 +75,18 @@
</artifactItems>
</configuration>
</execution>
+ <execution>
+ <id>copy-endorsed</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+
<includeGroupIds>org.apache.xerces,org.apache.xalan</includeGroupIds>
+
<outputDirectory>${project.build.directory}/endorsed</outputDirectory>
+ <stripVersion>true</stripVersion>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
@@ -548,6 +560,13 @@
</execution>
</executions>
</plugin-->
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- Add the Xerces/Xalan versions expected by OpenSAML to
the boot classpath so that the build succeeds on older 1.5 JDKs -->
+
<argLine>-Xbootclasspath/p:${project.build.directory}/endorsed/xml-apis.jar${path.separator}${project.build.directory}/endorsed/xercesImpl.jar${path.separator}${project.build.directory}/endorsed/resolver.jar${path.separator}${project.build.directory}/endorsed/serializer.jar${path.separator}${project.build.directory}/endorsed/xalan.jar</argLine>
+ </configuration>
+ </plugin>
</plugins>
</build>
diff --git a/pom.xml b/pom.xml
index 295044d..f4afdfa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,6 +147,10 @@
<artifactId>axis2-mar-maven-plugin</artifactId>
<version>1.5.4</version>
</plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.10</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
diff --git a/release-docs/README.txt b/release-docs/README.txt
index b79bbb9..e9f7512 100644
--- a/release-docs/README.txt
+++ b/release-docs/README.txt
@@ -64,14 +64,18 @@ http://www.bouncycastle.org/latest_releases.html
lib/security directory as the last line.
security.provider.X=org.bouncycastle.jce.provider.BouncyCastleProvider
-Test cases written for SAML 2.0 support requires endorsing the JDK's default
JAXP
+On older JDKs, the SAML 2.0 support requires endorsing the JDK's default JAXP
implementation with Xerces(http://xerces.apache.org/mirrors.cgi#binary) and
-Xalan(http://xml.apache.org/xalan-j/downloads.html#latest-release). So before
building Rampart from the
-source distribution, you need to copy resolver-x.x.x.jar,
serializer-x.x.x.jar, xercesImpl-x.x.x.jar
+Xalan(http://xml.apache.org/xalan-j/downloads.html#latest-release). To do that,
+you need to copy resolver-x.x.x.jar, serializer-x.x.x.jar,
xercesImpl-x.x.x.jar
and xml-apis-x.x.x.jar from the Xerces binary distribution and xalan-x.x.x.jar
from the xalan binary
distribution to the endorsed directory. If you are using Sun JDK, endorsed
directory is located at
$JAVA_HOME/jre/lib/endorsed.
+Note that during the build these JARs are added automatically to the boot
classpath
+of the JVM running the unit tests. Therefore this is only necessary at
runtime, not
+when building Rampart.
+
When Rampart is deployed in a particular application server, please refer to
the endorsing mechanism
recommended for that server and endorse the JAXP implementation using the set
of jars mentioned above.
