svn commit: r1195130 - in /axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas: Rahas.java impl/SAMLTokenIssuer.java impl/SAMLTokenRenewer.java impl/SAMLTokenValidator.j
Author: veithen
Date: Sun Oct 30 08:18:31 2011
New Revision: 1195130
URL: http://svn.apache.org/viewvc?rev=1195130&view=rev
Log:
Use a less hacky solution to make OpenSAML 1 use DOOM: register a custom
XML.ParserPool that uses DOOMDocumentBuilderFactory.
Added:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/AxiomParserPool.java
(with props)
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/Rahas.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenRenewer.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenValidator.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/Rahas.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/Rahas.java?rev=1195130&r1=1195129&r2=1195130&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/Rahas.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/Rahas.java
Sun Oct 30 08:18:31 2011
@@ -25,12 +25,17 @@ import org.apache.axis2.description.Axis
import org.apache.axis2.modules.Module;
import org.apache.neethi.Assertion;
import org.apache.neethi.Policy;
+import org.apache.rahas.impl.util.AxiomParserPool;
import org.opensaml.DefaultBootstrap;
+import org.opensaml.XML;
import org.opensaml.xml.ConfigurationException;
public class Rahas implements Module {
public void init(ConfigurationContext configContext, AxisModule module)
throws AxisFault {
+// Set up OpenSAML to use a DOM aware Axiom implementation
+XML.parserPool = new AxiomParserPool();
+
try {
DefaultBootstrap.bootstrap();
} catch (ConfigurationException ex) {
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java?rev=1195130&r1=1195129&r2=1195130&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java
Sun Oct 30 08:18:31 2011
@@ -18,7 +18,6 @@ package org.apache.rahas.impl;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.impl.dom.jaxp.DocumentBuilderFactoryImpl;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.Parameter;
@@ -76,176 +75,166 @@ public class SAMLTokenIssuer implements
private String configFile;
public SOAPEnvelope issue(RahasData data) throws TrustException {
+MessageContext inMsgCtx = data.getInMessageContext();
-try {
-MessageContext inMsgCtx = data.getInMessageContext();
-
-SAMLTokenIssuerConfig config = null;
-if (this.configElement != null) {
-config = new SAMLTokenIssuerConfig(configElement
-
.getFirstChildWithName(SAMLTokenIssuerConfig.SAML_ISSUER_CONFIG));
-}
-
-// Look for the file
-if (config == null && this.configFile != null) {
-config = new SAMLTokenIssuerConfig(this.configFile);
-}
-
-// Look for the param
-if (config == null && this.configParamName != null) {
-Parameter param = inMsgCtx.getParameter(this.configParamName);
-if (param != null && param.getParameterElement() != null) {
-config = new SAMLTokenIssuerConfig(param
-.getParameterElement().getFirstChildWithName(
-SAMLTokenIssuerConfig.SAML_ISSUER_CONFIG));
-} else {
-throw new TrustException("expectedParameterMissing",
-new String[] { this.configParamName });
-}
-}
-
-if (config == null) {
-throw new TrustException("configurationIsNull");
-}
-
-// Set the DOM impl to DOOM
-DocumentBuilderFactoryImpl.setDOOMRequired(true);
-
-SOAPEnvelope env = TrustUtil.createSOAPEnvelope(inMsgCtx
-.getEnvelope().getNamespace().getNamespaceURI());
-
-
svn commit: r1195148 - in /axis/axis2/java/rampart/branches/1_6: ./ modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java modules/rampart-trust-mar/module.xml modules/rampart-trust/src/ma
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 @@
-
+
This module is used to STS enable a service where it adds
the RequestSecurityToken operation to a service that the module is
engaged to
svn commit: r1195151 - in /axis/axis2/java/rampart/branches/1_5_x: ./ modules/documentation/src/site/xdoc/download/1.5.1/ modules/rampart-core/src/main/java/org/apache/rampart/ modules/rampart-trust-m
Author: veithen
Date: Sun Oct 30 11:45:15 2011
New Revision: 1195151
URL: http://svn.apache.org/viewvc?rev=1195151&view=rev
Log:
Merged r1194994 to the 1.5 branch.
Added:
axis/axis2/java/rampart/branches/1_5_x/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_5_x/ (props changed)
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
(props changed)
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/module.xml
Propchange: axis/axis2/java/rampart/branches/1_5_x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 30 11:45:15 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1052172-1052173,1072178,1072180,1072182,1072187,1072313,1072316,1075676,1083686,1089599,1130570,1132548,1134683,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175324,1177260,1177413,1178193,1186491,1190533,1190600,1194848
+/axis/axis2/java/rampart/trunk:1052172-1052173,1072178,1072180,1072182,1072187,1072313,1072316,1075676,1083686,1089599,1130570,1132548,1134683,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175324,1177260,1177413,1178193,1186491,1190533,1190600,1194848,1194994
Propchange:
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 30 11:45:15 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.1/download.xml:1052172-1052173,1072178,1072180,1072182,1072187,1072313,1072316,1075676,1083686,1089599,1130570,1131278,1132548,1134683,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175324,1177260,1177413,1178193,1186491,1190533,1190600,1194848
+/axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.1/download.xml:1052172-1052173,1072178,1072180,1072182,1072187,1072313,1072316,1075676,1083686,1089599,1130570,1131278,1132548,1134683,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175324,1177260,1177413,1178193,1186491,1190533,1190600,1194848,1194994
Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java?rev=1195151&r1=1195150&r2=1195151&view=diff
==
---
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
(original)
+++
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
Sun Oct 30 11:45:15 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_5_x/modules/rampart-trust-mar/module.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/module.xml?rev=1195151&r1=1195150&r2=1195151&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/module.xml
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/module.xml
Sun Oct 30 11:45:15 2011
@@ -1,4 +1,4 @@
-
+
This module is used to STS enable a service where it adds
the RequestSecurityToken operation to a service that the module is
engaged to
svn commit: r1195165 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/MultipartFormDataFormatter.java
Author: veithen
Date: Sun Oct 30 14:15:52 2011
New Revision: 1195165
URL: http://svn.apache.org/viewvc?rev=1195165&view=rev
Log:
AXIS2-3933: Adapted the code to the change in r1195164.
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/MultipartFormDataFormatter.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/MultipartFormDataFormatter.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/MultipartFormDataFormatter.java?rev=1195165&r1=1195164&r2=1195165&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/MultipartFormDataFormatter.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/MultipartFormDataFormatter.java
Sun Oct 30 14:15:52 2011
@@ -19,6 +19,7 @@
package org.apache.axis2.transport.http;
+import org.apache.axiom.mime.Header;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
@@ -33,6 +34,7 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.net.URL;
+import java.util.Collections;
import java.util.Iterator;
/**
@@ -184,12 +186,14 @@ public class MultipartFormDataFormatter
omElement.addChild(
processComplexType(omElement,
ele.getChildElements(), omFactory));
OutputStream partOutputStream =
writer.writePart(DEFAULT_CONTENT_TYPE, null,
-DISPOSITION_TYPE, "name=\"" +
omElement.getLocalName() + "\"");
+Collections.singletonList(new
Header("Content-Disposition",
+DISPOSITION_TYPE + "; name=\"" +
omElement.getLocalName() + "\"")));
partOutputStream.write(omElement.toString().getBytes());
partOutputStream.close();
} else {
OutputStream partOutputStream =
writer.writePart(DEFAULT_CONTENT_TYPE, null,
-DISPOSITION_TYPE, "name=\"" + ele.getLocalName() +
"\"");
+Collections.singletonList(new
Header("Content-Disposition",
+DISPOSITION_TYPE + "; name=\"" +
ele.getLocalName() + "\"")));
partOutputStream.write(ele.getText().getBytes());
partOutputStream.close();
}
