Author: veithen
Date: Sun Oct 30 11:36:39 2011
New Revision: 1195148
URL: http://svn.apache.org/viewvc?rev=1195148&view=rev
Log:
Merged r1194994 to the 1.6 branch.
Added:
axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/src/main/java/org/apache/rahas/Rahas.java
- copied unchanged from r1194994,
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/Rahas.java
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/Rampart.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-trust-mar/module.xml
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 30 11:36:39 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,1190533,1190600,1194848
+/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,1194848,1194994
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java?rev=1195148&r1=1195147&r2=1195148&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
Sun Oct 30 11:36:39 2011
@@ -26,18 +26,11 @@ import org.apache.neethi.Policy;
import org.apache.rampart.policy.model.RampartConfig;
import org.apache.ws.secpolicy.SP11Constants;
import org.apache.ws.secpolicy.SP12Constants;
-import org.opensaml.DefaultBootstrap;
-import org.opensaml.xml.ConfigurationException;
public class Rampart implements Module /* , ModulePolicyExtension */ {
public void init(ConfigurationContext configContext, AxisModule module)
throws AxisFault {
- try {
- DefaultBootstrap.bootstrap();
- } catch (ConfigurationException ex) {
- throw new AxisFault("Failed to bootstrap OpenSAML", ex);
- }
}
public void engageNotify(AxisDescription axisDescription) throws AxisFault
{
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-trust-mar/module.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-trust-mar/module.xml?rev=1195148&r1=1195147&r2=1195148&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-trust-mar/module.xml
(original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-trust-mar/module.xml
Sun Oct 30 11:36:39 2011
@@ -1,4 +1,4 @@
-<module name="rahas">
+<module name="rahas" class="org.apache.rahas.Rahas">
<Description>This module is used to STS enable a service where it adds
the RequestSecurityToken operation to a service that the module is
engaged to</Description>
