Author: veithen
Date: Fri Oct 28 21:58:42 2011
New Revision: 1190617
URL: http://svn.apache.org/viewvc?rev=1190617&view=rev
Log:
Merged r1190533 and r1190600 to the 1.6 branch.
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/branches/1_6/pom.xml
axis/axis2/java/rampart/branches/1_6/release-docs/README.txt
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 28 21:58:42 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175271,1175324,1177260,1177279,1177413,1178193,1186491
+/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175271,1175324,1177260,1177279,1177413,1178193,1186491,1190533,1190600
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java?rev=1190617&r1=1190616&r2=1190617&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
Fri Oct 28 21:58:42 2011
@@ -132,7 +132,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();
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml?rev=1190617&r1=1190616&r2=1190617&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml
(original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml
Fri Oct 28 21:58:42 2011
@@ -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>
@@ -560,6 +572,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>
Modified: axis/axis2/java/rampart/branches/1_6/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/pom.xml?rev=1190617&r1=1190616&r2=1190617&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/pom.xml Fri Oct 28 21:58:42 2011
@@ -153,6 +153,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>
Modified: axis/axis2/java/rampart/branches/1_6/release-docs/README.txt
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/release-docs/README.txt?rev=1190617&r1=1190616&r2=1190617&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/release-docs/README.txt (original)
+++ axis/axis2/java/rampart/branches/1_6/release-docs/README.txt Fri Oct 28
21:58:42 2011
@@ -64,14 +64,18 @@ http://www.bouncycastle.org/latest_relea
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.
