[axis-axis2-java-rampart] 10/18: Merged r1194994 to the 1.5 branch.

[billblough]

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 42e65c43fff71232fcc7d9bceba5292a14e5f440
Author: Andreas Veithen <veit...@apache.org>
AuthorDate: Sun Oct 30 11:45:15 2011 +0000

    Merged r1194994 to the 1.5 branch.
---
 .../src/main/java/org/apache/rampart/Rampart.java  |  7 ---
 modules/rampart-trust-mar/module.xml               |  2 +-
 .../src/main/java/org/apache/rahas/Rahas.java      | 55 ++++++++++++++++++++++
 3 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java 
b/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
index 80b410e..72f2316 100644
--- a/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
+++ b/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
@@ -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 
{
diff --git a/modules/rampart-trust-mar/module.xml 
b/modules/rampart-trust-mar/module.xml
index c24682f..bfc5119 100644
--- a/modules/rampart-trust-mar/module.xml
+++ b/modules/rampart-trust-mar/module.xml
@@ -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>
 
diff --git a/modules/rampart-trust/src/main/java/org/apache/rahas/Rahas.java 
b/modules/rampart-trust/src/main/java/org/apache/rahas/Rahas.java
new file mode 100644
index 0000000..6130ffb
--- /dev/null
+++ b/modules/rampart-trust/src/main/java/org/apache/rahas/Rahas.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rahas;
+
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.description.AxisDescription;
+import org.apache.axis2.description.AxisModule;
+import org.apache.axis2.modules.Module;
+import org.apache.neethi.Assertion;
+import org.apache.neethi.Policy;
+import org.opensaml.DefaultBootstrap;
+import org.opensaml.xml.ConfigurationException;
+
+public class Rahas implements Module {
+    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 
{
+    }
+
+    public boolean canSupportAssertion(Assertion assertion) {
+        return false;
+    }
+
+    public void applyPolicy(Policy policy, AxisDescription axisDescription)
+            throws AxisFault {
+    }
+
+    public void shutdown(ConfigurationContext configurationContext)
+            throws AxisFault {
+    }
+}