svn commit: r949695 - /axis/axis2/java/rampart/trunk/pom.xml
Author: samisa Date: Mon May 31 09:05:27 2010 New Revision: 949695 URL: http://svn.apache.org/viewvc?rev=949695&view=rev Log: Fixed transport version Modified: axis/axis2/java/rampart/trunk/pom.xml Modified: axis/axis2/java/rampart/trunk/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=949695&r1=949694&r2=949695&view=diff == --- axis/axis2/java/rampart/trunk/pom.xml (original) +++ axis/axis2/java/rampart/trunk/pom.xml Mon May 31 09:05:27 2010 @@ -380,7 +380,7 @@ SNAPSHOT SNAPSHOT -1.0-SNAPSHOT +1.1.0-SNAPSHOT 1.5 1.5.8
svn commit: r1050585 - in /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description: WSDL11ToAxisServiceBuilder.java WSDL20ToAxisServiceBuilder.java WSDLToAxisServiceBuilder.java
Author: samisa
Date: Sat Dec 18 04:07:27 2010
New Revision: 1050585
URL: http://svn.apache.org/viewvc?rev=1050585&view=rev
Log:
Applied patch fixing Wrong order in http location table using WSDL 1.1 -
AXIS2-4835
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDLToAxisServiceBuilder.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java?rev=1050585&r1=1050584&r2=1050585&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
Sat Dec 18 04:07:27 2010
@@ -107,7 +107,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.TreeMap;
import java.util.Vector;
public class WSDL11ToAxisServiceBuilder extends WSDLToAxisServiceBuilder {
@@ -634,7 +633,7 @@ public class WSDL11ToAxisServiceBuilder
AxisBindingOperation axisBindingOperation;
BindingOperation wsdl4jBindingOperation;
-Map httpLocationMap = new TreeMap();
+Map httpLocationMap = createHttpLocationTable();
String httpLocation = null;
for (Iterator iterator = wsdl4jBidingOperations.iterator();
iterator.hasNext();) {
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java?rev=1050585&r1=1050584&r2=1050585&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
Sat Dec 18 04:07:27 2010
@@ -756,13 +756,7 @@ public class WSDL20ToAxisServiceBuilder
private void processHTTPBindingExtention(Binding binding, AxisBinding
axisBinding, Interface serviceInterface)
throws AxisFault {
-
-// Set a comparator so tha httpLocations are stored in decending order
-Map httpLocationTable = new TreeMap(new Comparator(){
-public int compare(Object o1, Object o2) {
-return (-1 * ((Comparable)o1).compareTo(o2));
-}
-});
+Map httpLocationTable = createHttpLocationTable();
// Capture all the binding specific properties
HTTPBindingExtensionsImpl httpBindingExtensions;
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDLToAxisServiceBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDLToAxisServiceBuilder.java?rev=1050585&r1=1050584&r2=1050585&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDLToAxisServiceBuilder.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDLToAxisServiceBuilder.java
Sat Dec 18 04:07:27 2010
@@ -33,9 +33,11 @@ import javax.xml.parsers.DocumentBuilder
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import java.io.InputStream;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import java.util.TreeMap;
public abstract class WSDLToAxisServiceBuilder {
@@ -303,4 +305,14 @@ public abstract class WSDLToAxisServiceB
public void useAxisConfiguration(AxisConfiguration axisConfig) {
this.axisConfig = axisConfig;
}
+
+protected Map createHttpLocationTable() {
+ // Set a comparator so the httpLocations are stored in decending order
+ Map httpLocationTable = new TreeMap(new Comparator(){
+ public int compare(Object o1, Object o2) {
+ return (-1 * ((Comparable)o1).compareTo(o2));
+ }
+ });
+ return httpLocationTable;
+}
}
svn commit: r1050587 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/dataretrieval/BaseAxisDataLocator.java
Author: samisa
Date: Sat Dec 18 04:32:07 2010
New Revision: 1050587
URL: http://svn.apache.org/viewvc?rev=1050587&view=rev
Log:
Applied patch to clean up BaseAxisDataLocator - AXIS2-4299
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/dataretrieval/BaseAxisDataLocator.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/dataretrieval/BaseAxisDataLocator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/dataretrieval/BaseAxisDataLocator.java?rev=1050587&r1=1050586&r2=1050587&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/dataretrieval/BaseAxisDataLocator.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/dataretrieval/BaseAxisDataLocator.java
Sat Dec 18 04:32:07 2010
@@ -91,56 +91,54 @@ public abstract class BaseAxisDataLocato
*/
protected Data[] outputInlineForm(MessageContext msgContext,
ServiceData[] serviceData) throws
DataRetrievalException {
-OMElement metaElement = null;
-ArrayList result = new ArrayList();
-if (serviceData != null) {
-int size = serviceData.length;
-for (int i = 0; i < size; i++) {
-metaElement = serviceData[i].getFileContent(msgContext
-.getAxisService().getClassLoader());
-if (metaElement != null) {
-result.add(new Data(metaElement,
serviceData[i].getIdentifier()));
-}
-
+ assert(msgContext != null);
+ if (serviceData == null || serviceData.length == 0) {
+ return new Data[0];
+ }
+
+final ArrayList result = new ArrayList();
+for(final ServiceData sd: serviceData) {
+ final OMElement metaElement
+ =
sd.getFileContent(msgContext.getAxisService().getClassLoader());
+if (metaElement != null) {
+ result.add(new Data(metaElement, sd.getIdentifier()));
}
-
-
}
-return (Data[]) result.toArray(new Data[0]);
-
+return (Data[]) result.toArray(new Data[result.size()]);
}
protected Data[] outputLocationForm(ServiceData[] serviceData)
throws DataRetrievalException {
-
-ArrayList result = new ArrayList();
-if (serviceData != null) {
-for (int i = 0; i < serviceData.length; i++) {
-
-String urlValue = serviceData[i].getURL();
-if (urlValue != null) {
-result.add(new Data(urlValue,
serviceData[i].getIdentifier()));
-}
+ if(serviceData == null || serviceData.length == 0) {
+ return new Data[0];
+ }
+
+final ArrayList result = new ArrayList();
+for (final ServiceData sd: serviceData) {
+ final String urlValue = sd.getURL();
+ if (urlValue != null) {
+ result.add(new Data(urlValue, sd.getIdentifier()));
}
}
-return (Data[]) result.toArray(new Data[0]);
+return result.toArray(new Data[result.size()]);
}
+
protected Data[] outputReferenceForm(MessageContext msgContext,
ServiceData[] serviceData) throws
DataRetrievalException {
-OMElement epr = null;
-ArrayList result = new ArrayList();
-if (serviceData != null) {
-for (int i = 0; i < serviceData.length; i++) {
-
-epr = serviceData[i].getEndpointReference();
-if (epr != null) {
-result.add(new Data((epr),
serviceData[i].getIdentifier()));
-}
+if(serviceData == null || serviceData.length == 0) {
+ return new Data[0];
+}
+
+final ArrayList result = new ArrayList();
+for (final ServiceData sd: serviceData) {
+ final OMElement epr = sd.getEndpointReference();
+ if (epr != null) {
+ result.add(new Data(epr, sd.getIdentifier()));
}
}
-return (Data[]) result.toArray(new Data[0]);
+return result.toArray(new Data[result.size()]);
}
svn commit: r1050588 - /axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/server/DefaultConnectionListener.java
Author: samisa
Date: Sat Dec 18 04:40:57 2010
New Revision: 1050588
URL: http://svn.apache.org/viewvc?rev=1050588&view=rev
Log:
Applied patch to fix problem of Http connection listener terminating when
request executor full - AXIS2-4800
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/server/DefaultConnectionListener.java
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/server/DefaultConnectionListener.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/server/DefaultConnectionListener.java?rev=1050588&r1=1050587&r2=1050588&view=diff
==
---
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/server/DefaultConnectionListener.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/server/DefaultConnectionListener.java
Sat Dec 18 04:40:57 2010
@@ -26,6 +26,11 @@ import org.apache.http.params.HttpParams
import java.io.IOException;
import java.net.ServerSocket;
import java.net.Socket;
+import java.util.concurrent.RejectedExecutionException;
+import org.apache.http.HttpStatus;
+import org.apache.http.HttpVersion;
+import org.apache.http.impl.DefaultHttpResponseFactory;
+import org.apache.http.protocol.BasicHttpContext;
public class DefaultConnectionListener implements IOProcessor {
@@ -82,9 +87,14 @@ public class DefaultConnectionListener i
socket.getRemoteSocketAddress());
}
AxisHttpConnection conn = new
AxisHttpConnectionImpl(socket, this.params);
-this.connmanager.process(conn);
+try {
+this.connmanager.process(conn);
+} catch (RejectedExecutionException e) {
+conn.sendResponse(new
DefaultHttpResponseFactory().newHttpResponse(
+HttpVersion.HTTP_1_0,
HttpStatus.SC_SERVICE_UNAVAILABLE, new BasicHttpContext(null)));
+}
} catch(java.io.InterruptedIOException ie) {
-break;
+break;
} catch (Throwable ex) {
if (Thread.interrupted()) {
break;
svn commit: r1050763 - /axis/axis2/java/core/trunk/modules/corba/src/org/apache/axis2/corba/receivers/CorbaUtil.java
Author: samisa
Date: Sun Dec 19 05:46:56 2010
New Revision: 1050763
URL: http://svn.apache.org/viewvc?rev=1050763&view=rev
Log:
Closed the file reader - it had not been closed
Modified:
axis/axis2/java/core/trunk/modules/corba/src/org/apache/axis2/corba/receivers/CorbaUtil.java
Modified:
axis/axis2/java/core/trunk/modules/corba/src/org/apache/axis2/corba/receivers/CorbaUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/corba/src/org/apache/axis2/corba/receivers/CorbaUtil.java?rev=1050763&r1=1050762&r2=1050763&view=diff
==
---
axis/axis2/java/core/trunk/modules/corba/src/org/apache/axis2/corba/receivers/CorbaUtil.java
(original)
+++
axis/axis2/java/core/trunk/modules/corba/src/org/apache/axis2/corba/receivers/CorbaUtil.java
Sun Dec 19 05:46:56 2010
@@ -128,6 +128,7 @@ public class CorbaUtil implements CorbaC
char[] buf = new char[1000];
fileReader.read(buf);
obj = orb.string_to_object((new String(buf)).trim());
+fileReader.close();
} else if (iorString!=null) {
obj = orb.string_to_object(((String)
iorString.getValue()).trim());
} else {
svn commit: r1050768 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java
Author: samisa
Date: Sun Dec 19 06:37:59 2010
New Revision: 1050768
URL: http://svn.apache.org/viewvc?rev=1050768&view=rev
Log:
Fixed the problem of AxisFault not giving correct QName in some case. In case
of REST, this might not make sense, but for the sake of SOAP fault
completeness, we can set the detail - AXIS2-3520
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java?rev=1050768&r1=1050767&r2=1050768&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java
Sun Dec 19 06:37:59 2010
@@ -526,7 +526,9 @@ public class Utils {
// If its a REST response the content is not a SOAP envelop
and hence we will
// Have use the soap body as the exception
if (messageContext.isDoingREST() && soapBody.getFirstElement()
!= null) {
-return new
AxisFault(soapBody.getFirstElement().toString());
+ AxisFault fault = new
AxisFault(soapBody.getFirstElement().toString());
+ fault.setDetail(soapBody.getFirstElement());
+ return fault;
}
// if axis2 receives an rest type fault for an soap message
then message context
@@ -535,7 +537,9 @@ public class Utils {
if
((messageContext.getProperty(Constants.Configuration.MESSAGE_TYPE) != null) &&
messageContext.getProperty(Constants.Configuration.MESSAGE_TYPE).equals(HTTPConstants.MEDIA_TYPE_APPLICATION_XML)){
if (soapBody.getFirstElement() != null){
- return new
AxisFault(soapBody.getFirstElement().toString());
+AxisFault fault = new
AxisFault(soapBody.getFirstElement().toString());
+fault.setDetail(soapBody.getFirstElement());
+return fault;
} else {
return new AxisFault("application/xml type error
received.");
}
svn commit: r1051473 - /axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
Author: samisa
Date: Tue Dec 21 12:37:24 2010
New Revision: 1051473
URL: http://svn.apache.org/viewvc?rev=1051473&view=rev
Log:
Fixed the problem of
org.apache.rahas.client.STSClient.org.apache.rahas.processIssueResponse failing
if SamlAssertion is issued - RAMPART-154
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java?rev=1051473&r1=1051472&r2=1051473&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
Tue Dec 21 12:37:24 2010
@@ -547,6 +547,11 @@ public class STSClient {
} else {
//Return wsu:Id of the token element
id = token.getAttributeValue(new QName(WSConstants.WSU_NS, "Id"));
+if ( id == null )
+{
+ // If we are dealing with a SAML Assetion, look for AssertionID.
+ id = token.getAttributeValue(new QName( "AssertionID"));
+}
}
return id;
}
svn commit: r1051504 - /axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartReceiver.java
Author: samisa
Date: Tue Dec 21 14:12:30 2010
New Revision: 1051504
URL: http://svn.apache.org/viewvc?rev=1051504&view=rev
Log:
Fixed the problem of all security exceptions reported as wsse:InvalidSecurity -
RAMPART-308
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartReceiver.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartReceiver.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartReceiver.java?rev=1051504&r1=1051503&r2=1051504&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartReceiver.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartReceiver.java
Tue Dec 21 14:12:30 2010
@@ -159,16 +159,30 @@ public class RampartReceiver implements
msgContext.setProperty(RampartConstants.SEC_FAULT, Boolean.TRUE);
String soapVersionURI =
msgContext.getEnvelope().getNamespace().getNamespaceURI();
-QName invalidSecurity = new
QName(WSConstants.INVALID_SECURITY.getNamespaceURI(),WSConstants.INVALID_SECURITY.getLocalPart(),"wsse");
+QName faultCode = null;
+/*
+ * Get the faultCode from the thrown WSSecurity exception, if there is
one
+ */
+if (e instanceof WSSecurityException)
+{
+ faultCode = ((WSSecurityException)e).getFaultCode();
+}
+/*
+ * Otherwise default to InvalidSecurity
+ */
+if (faultCode == null)
+{
+ faultCode = new
QName(WSConstants.INVALID_SECURITY.getNamespaceURI(),WSConstants.INVALID_SECURITY.getLocalPart(),"wsse");
+}
if (soapVersionURI.equals(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI)
) {
-throw new AxisFault(invalidSecurity,e.getMessage(),e);
+throw new AxisFault(faultCode,e.getMessage(),e);
} else if
(soapVersionURI.equals(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI)) {
List subfaultCodes = new ArrayList();
-subfaultCodes.add(invalidSecurity);
+subfaultCodes.add(faultCode);
throw new
AxisFault(Constants.FAULT_SOAP12_SENDER,subfaultCodes,e.getMessage(),e);
}
svn commit: r1051506 - /axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
Author: samisa
Date: Tue Dec 21 14:23:59 2010
New Revision: 1051506
URL: http://svn.apache.org/viewvc?rev=1051506&view=rev
Log:
Fixed the problem of NPE in RampartMessageData that prevents fault being
returned to service consumer - RAMPART-293
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java?rev=1051506&r1=1051505&r2=1051506&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
Tue Dec 21 14:23:59 2010
@@ -370,7 +370,9 @@ public class RampartMessageData {
// To handle scenarios where password type is not set by default.
this.config.setHandleCustomPasswordTypes(true);
-this.customClassLoader = msgCtx.getAxisService().getClassLoader();
+if (axisService != null) {
+this.customClassLoader = axisService.getClassLoader();
+}
if(this.sender && this.policyData != null) {
this.secHeader = new WSSecHeader();
svn commit: r1051526 - /axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java
Author: samisa Date: Tue Dec 21 15:28:17 2010 New Revision: 1051526 URL: http://svn.apache.org/viewvc?rev=1051526&view=rev Log: Fixed wrong NameIdentifier format - RAMPART-180 Modified: axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java 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=1051526&r1=1051525&r2=1051526&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 Tue Dec 21 15:28:17 2010 @@ -338,7 +338,7 @@ public class SAMLTokenIssuer implements String subjectNameId = data.getPrincipal().getName(); SAMLNameIdentifier nameId = new SAMLNameIdentifier( -subjectNameId, null, SAMLNameIdentifier.FORMAT_EMAIL); +subjectNameId, null, SAMLNameIdentifier.FORMAT_X509); // Create the ds:KeyValue element with the ds:X509Data X509Certificate clientCert = data.getClientCert();
svn commit: r1051532 - /axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java
Author: samisa
Date: Tue Dec 21 15:42:45 2010
New Revision: 1051532
URL: http://svn.apache.org/viewvc?rev=1051532&view=rev
Log:
Fixed the problem of renewing a STS token not working - RAMPART-274
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java?rev=1051532&r1=1051531&r2=1051532&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java
Tue Dec 21 15:42:45 2010
@@ -334,6 +334,8 @@ public class RahasData {
SecurityTokenReference str = new
SecurityTokenReference((Element)elem);
if (str.containsReference()) {
tokenId = str.getReference().getURI();
+} else if(str.containsKeyIdentifier()){
+ tokenId = str.getKeyIdentifierValue();
}
} catch (WSSecurityException e) {
throw new TrustException("errorExtractingTokenId",e);
@@ -358,6 +360,8 @@ public class RahasData {
SecurityTokenReference str = new
SecurityTokenReference((Element)elem);
if (str.containsReference()) {
tokenId = str.getReference().getURI();
+} else if(str.containsKeyIdentifier()){
+ tokenId = str.getKeyIdentifierValue();
}
if(tokenId == null){
if(str.containsKeyIdentifier()){
svn commit: r1051536 - /axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
Author: samisa
Date: Tue Dec 21 16:01:05 2010
New Revision: 1051536
URL: http://svn.apache.org/viewvc?rev=1051536&view=rev
Log:
Fixed NPE in RampartMessageData - RAMPART-270
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java?rev=1051536&r1=1051535&r2=1051536&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
Tue Dec 21 16:01:05 2010
@@ -636,8 +636,7 @@ public class RampartMessageData {
String storageClass = this.policyData.getRampartConfig()
.getTokenStoreClass();
try {
-stClass = Loader.loadClass(msgContext.getAxisService()
-.getClassLoader(), storageClass);
+stClass = Loader.loadClass(this.customClassLoader,
storageClass);
} catch (ClassNotFoundException e) {
throw new RampartException(
"WSHandler: cannot load token storage class: "
svn commit: r1051547 - /axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java
Author: samisa Date: Tue Dec 21 16:35:08 2010 New Revision: 1051547 URL: http://svn.apache.org/viewvc?rev=1051547&view=rev Log: Fixed the problem of TTL not serialized in to saml-issuer-config from SAMLTokenIssuerConfig - RAMPART-253 Modified: axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java Modified: axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java?rev=1051547&r1=1051546&r2=1051547&view=diff == --- axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java (original) +++ axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java Tue Dec 21 16:35:08 2010 @@ -300,6 +300,9 @@ public class SAMLTokenIssuerConfig exten OMElement callbackHandlerName = fac.createOMElement(ATTR_CALLBACK_HANDLER_NAME, configElem); callbackHandlerName.setText(this.callbackHandlerName); +OMElement timeToLive = fac.createOMElement(TTL, configElem); +timeToLive.setText(String.valueOf(this.ttl)); + configElem.addChild(this.cryptoPropertiesElement); OMElement keySizeElem = fac.createOMElement(KEY_SIZE, configElem);
svn commit: r1051693 - /axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
Author: samisa
Date: Tue Dec 21 23:17:52 2010
New Revision: 1051693
URL: http://svn.apache.org/viewvc?rev=1051693&view=rev
Log:
Fixed the problem of having SupportingToken UsernameToken always encrypted -
RAMPART-225
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java?rev=1051693&r1=1051692&r2=1051693&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
Tue Dec 21 23:17:52 2010
@@ -345,6 +345,7 @@ public abstract class BindingBuilder {
//Create the list to hold the tokens
HashMap endSuppTokMap = new HashMap();
+
if(suppTokens != null && suppTokens.getTokens() != null &&
suppTokens.getTokens().size() > 0) {
log.debug("Processing supporting tokens");
@@ -411,8 +412,10 @@ public abstract class BindingBuilder {
//Add the UT
Element elem = utBuilder.getUsernameTokenElement();
elem = RampartUtil.insertSiblingAfter(rmd,
this.getInsertionLocation(), elem);
-
-encryptedTokensIdList.add(utBuilder.getId());
+
+if (suppTokens.isEncryptedToken()) {
+encryptedTokensIdList.add(utBuilder.getId());
+}
//Move the insert location to the next element
this.setInsertionLocation(elem);
svn commit: r1051699 - /axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
Author: samisa
Date: Tue Dec 21 23:43:17 2010
New Revision: 1051699
URL: http://svn.apache.org/viewvc?rev=1051699&view=rev
Log:
Fixed the problem of supporting Tokens not encrypted when protection order is
sign before encrypting - RAMPART-288
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java?rev=1051699&r1=1051698&r2=1051699&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
Tue Dec 21 23:43:17 2010
@@ -1568,7 +1568,26 @@ public class RampartUtil {
if (supportingTokens != null &&
supportingTokens.getTokens().size() != 0) {
return true;
}
-
+
+supportingTokens = rpd.getEncryptedSupportingTokens();
+if (supportingTokens != null &&
supportingTokens.getTokens().size() != 0) {
+return true;
+}
+
+supportingTokens = rpd.getSignedEncryptedSupportingTokens();
+if (supportingTokens != null &&
supportingTokens.getTokens().size() != 0) {
+return true;
+}
+
+supportingTokens = rpd.getEndorsingEncryptedSupportingTokens();
+if (supportingTokens != null &&
supportingTokens.getTokens().size() != 0) {
+return true;
+}
+
+supportingTokens =
rpd.getSignedEndorsingEncryptedSupportingTokens();
+if (supportingTokens != null &&
supportingTokens.getTokens().size() != 0) {
+return true;
+}
}
return false;
@@ -1744,4 +1763,4 @@ public class RampartUtil {
}
-}
\ No newline at end of file
+}
svn commit: r1051709 - in /axis/axis2/java/rampart/trunk/modules: rampart-core/src/main/java/org/apache/rampart/policy/ rampart-policy/src/main/java/org/apache/ws/secpolicy/model/ rampart-policy/src/m
Author: samisa
Date: Wed Dec 22 00:15:32 2010
New Revision: 1051709
URL: http://svn.apache.org/viewvc?rev=1051709&view=rev
Log:
Fixed the problem of sp:ProtectTokens assertion being ignored w/ transport
security binding - RAMPART-283
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportBinding.java
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportBindingBuilder.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java?rev=1051709&r1=1051708&r2=1051709&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java
Wed Dec 22 00:15:32 2010
@@ -127,6 +127,7 @@ public class RampartPolicyBuilder {
private static void processTransportBinding(TransportBinding binding,
RampartPolicyData rpd) {
binding(binding, rpd);
rpd.setTransportBinding(true);
+rpd.setTokenProtection(binding.isTokenProtection());
TransportToken transportToken = binding.getTransportToken();
if ( transportToken != null ) {
rpd.setTransportToken(transportToken.getTransportToken());
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportBinding.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportBinding.java?rev=1051709&r1=1051708&r2=1051709&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportBinding.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportBinding.java
Wed Dec 22 00:15:32 2010
@@ -37,9 +37,12 @@ public class TransportBinding extends Bi
private TransportToken transportToken;
private List transportBindings;
+
+private boolean tokenProtection;
public TransportBinding(int version) {
super(version);
+this.tokenProtection = false;
}
/**
* @return Returns the transportToken.
@@ -55,6 +58,21 @@ public class TransportBinding extends Bi
public void setTransportToken(TransportToken transportToken) {
this.transportToken = transportToken;
}
+
+/**
+ * @return Returns the tokenProtection.
+ */
+public boolean isTokenProtection() {
+return tokenProtection;
+}
+
+/**
+ * @param tokenProtection The tokenProtection to set.
+ */
+public void setTokenProtection(boolean tokenProtection) {
+this.tokenProtection = tokenProtection;
+}
+
public List getConfigurations() {
return transportBindings;
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportBindingBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportBindingBuilder.java?rev=1051709&r1=1051708&r2=1051709&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportBindingBuilder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportBindingBuilder.java
Wed Dec 22 00:15:32 2010
@@ -77,6 +77,9 @@ public class TransportBindingBuilder imp
} else if (name.equals(SP12Constants.LAYOUT)) {
parent.setLayout((Layout) primitive);
+} else if (name.equals(SP12Constants.PROTECT_TOKENS)) {
+parent.setTokenProtection(true);
+
} else if (name.equals(SP12Constants.SIGNED_SUPPORTING_TOKENS)) {
parent.setSignedSupportingToken((SupportingToken) primitive);
svn commit: r1051764 - in /axis/axis2/java/rampart/trunk/modules: rampart-core/src/main/java/org/apache/rampart/ rampart-core/src/main/java/org/apache/rampart/handler/ rampart-core/src/main/java/org/a
Author: samisa
Date: Wed Dec 22 06:10:09 2010
New Revision: 1051764
URL: http://svn.apache.org/viewvc?rev=1051764&view=rev
Log:
Fixed some bugs found with find-bugs
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/NonceCache.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllSender.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/HandlerParameterDecoder.java
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AbstractSecurityAssertion.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/NonceCache.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/NonceCache.java?rev=1051764&r1=1051763&r2=1051764&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/NonceCache.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/NonceCache.java
Wed Dec 22 06:10:09 2010
@@ -39,19 +39,24 @@ public class NonceCache extends Abstract
@Override
public boolean equals(Object another)
{
+ if (another == null){
+ return false;
+ }
+
+ if (another == this) {
+ return true;
+ }
+
+ if (!(another instanceof Nonce)){
+ return false;
+ }
+
+
Nonce otherNonce = (Nonce)another;
-if (this.userName.equals(otherNonce.userName))
+if (this.userName.equals(otherNonce.userName) &&
this.nonceValue.equals(otherNonce.nonceValue))
{
-if (this.nonceValue.equals(otherNonce.nonceValue))
-{
-return true;
-}
-else
-{
-return false;
-}
+return true;
}
-
return false;
}
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java?rev=1051764&r1=1051763&r2=1051764&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
Wed Dec 22 06:10:09 2010
@@ -399,7 +399,7 @@ public class PolicyBasedResultsValidator
.get(WSSecurityEngineResult.TAG_ACTION);
int action = actInt.intValue();
if(WSConstants.SIGN == action || WSConstants.ENCR == action) {
-sigEncrActions.add(new Integer(action));
+sigEncrActions.add(Integer.valueOf(action));
}
}
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllSender.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllSender.java?rev=1051764&r1=1051763&r2=1051764&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllSender.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllSender.java
Wed Dec 22 06:10:09 2010
@@ -257,7 +257,7 @@ public class WSDoAllSender extends WSDoA
// of the same handler
repetition++;
msgContext.setProperty(WSSHandlerConstants.CURRENT_REPETITON,
-new Integer(repetition));
+Integer.valueOf(repetition));
this.invoke(msgContext);
}
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/HandlerParameterDecoder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/HandlerParameterDecoder.java?rev=1051764&r1=1051763&r2=1051764&view=diff
===
svn commit: r1051779 - in /axis/axis2/java/rampart/trunk/modules: rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/ rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/ ramp
Author: samisa
Date: Wed Dec 22 07:14:06 2010
New Revision: 1051779
URL: http://svn.apache.org/viewvc?rev=1051779&view=rev
Log:
Fixed some bugs found with find-bugs
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedPartsBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedElementsBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedPartsBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SupportingTokensBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/X509TokenBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedElementsBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedPartsBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedElementsBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SupportingTokensBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/X509TokenBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java?rev=1051779&r1=1051778&r2=1051779&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java
Wed Dec 22 07:14:06 2010
@@ -42,8 +42,8 @@ public class EncryptedElementsBuilder im
OMAttribute isOptional =
element.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
if (isOptional != null) {
- signedEncryptedElements.setOptional((new
Boolean(isOptional.getAttributeValue())
- .booleanValue()));
+
signedEncryptedElements.setOptional(Boolean.valueOf(isOptional.getAttributeValue())
+ .booleanValue());
}
for (Iterator iterator = element.getChildElements();
iterator.hasNext();) {
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedPartsBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedPartsBuilder.java?rev=1051779&r1=1051778&r2=1051779&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedPartsBuilder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedPartsBuilder.java
Wed Dec 22 07:14:06 2010
@@ -52,8 +52,8 @@ public class EncryptedPartsBuilder imple
OMAttribute isOptional = element
.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
if (isOptional != null) {
- signedEncryptedParts.setOptional((new Boolean(isOptional
- .getAttributeValue()).booleanValue()));
+
signedEncryptedParts.setOptional(Boolean.valueOf(isOptional
+ .getAttributeValue()).booleanValue());
svn commit: r1051827 - in /axis/axis2/java/rampart/trunk/modules/rampart-tests/src/test/java/org/apache/rampart: MessageBuilderTestBase.java RampartEngineTest.java
Author: samisa
Date: Wed Dec 22 10:56:01 2010
New Revision: 1051827
URL: http://svn.apache.org/viewvc?rev=1051827&view=rev
Log:
Fixed the issue of RampartEngine throwing ClassCastException retrieving
SOAPHeaderBlocks - RAMPART-202
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-tests/src/test/java/org/apache/rampart/MessageBuilderTestBase.java
axis/axis2/java/rampart/trunk/modules/rampart-tests/src/test/java/org/apache/rampart/RampartEngineTest.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-tests/src/test/java/org/apache/rampart/MessageBuilderTestBase.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-tests/src/test/java/org/apache/rampart/MessageBuilderTestBase.java?rev=1051827&r1=1051826&r2=1051827&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-tests/src/test/java/org/apache/rampart/MessageBuilderTestBase.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-tests/src/test/java/org/apache/rampart/MessageBuilderTestBase.java
Wed Dec 22 10:56:01 2010
@@ -19,6 +19,8 @@ package org.apache.rampart;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAP11Constants;
+import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import org.apache.axis2.AxisFault;
import org.apache.axis2.client.Options;
@@ -63,8 +65,28 @@ public class MessageBuilderTestBase exte
* @throws AxisFault
*/
protected MessageContext getMsgCtx() throws Exception {
+return initMsgCtxFromMessage("test-resources/policy/soapmessage.xml");
+}
+
+/**
+ * Return a message context initialized with a SOAP 1.2 message.
+ *
+ * @throws XMLStreamException
+ * @throws FactoryConfigurationError
+ * @throws AxisFault
+ */
+protected MessageContext getMsgCtx12() throws Exception {
+return initMsgCtxFromMessage("test-resources/policy/soapmessage.xml");
+}
+
+/**
+ * @throws XMLStreamException
+ * @throws FactoryConfigurationError
+ * @throws AxisFault
+ */
+private MessageContext initMsgCtxFromMessage(String messageResource)
throws Exception {
MessageContext ctx = new MessageContext();
-
+
AxisConfiguration axisConfiguration = new AxisConfiguration();
AxisService axisService = new AxisService("TestService");
axisConfiguration.addService(axisService);
@@ -88,7 +110,7 @@ public class MessageBuilderTestBase exte
XMLStreamReader reader =
XMLInputFactory.newInstance().
-createXMLStreamReader(new
FileInputStream("test-resources/policy/soapmessage.xml"));
+createXMLStreamReader(new
FileInputStream(messageResource));
ctx.setEnvelope(new StAXSOAPModelBuilder(reader,
null).getSOAPEnvelope());
return ctx;
}
@@ -121,4 +143,15 @@ public class MessageBuilderTestBase exte
}
}
+public String getContentTypeForEnvelope(SOAPEnvelope env) {
+String contentType = SOAP11Constants.SOAP_11_CONTENT_TYPE; //default
+if
(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(env.getNamespace().getNamespaceURI()))
{
+contentType = SOAP11Constants.SOAP_11_CONTENT_TYPE;
+}
+else if
(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(env.getNamespace().getNamespaceURI()))
{
+contentType = SOAP12Constants.SOAP_12_CONTENT_TYPE;
+}
+return contentType;
+}
+
}
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-tests/src/test/java/org/apache/rampart/RampartEngineTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-tests/src/test/java/org/apache/rampart/RampartEngineTest.java?rev=1051827&r1=1051826&r2=1051827&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-tests/src/test/java/org/apache/rampart/RampartEngineTest.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-tests/src/test/java/org/apache/rampart/RampartEngineTest.java
Wed Dec 22 10:56:01 2010
@@ -18,14 +18,23 @@ package org.apache.rampart;
import java.io.ByteArrayInputStream;
import java.util.Vector;
+import java.util.ArrayList;
+import java.security.cert.X509Certificate;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.builder.SOAPBuilder;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.engine.AxisEngine;
+import org.apache.axis2.namespace.Constants;
import org.apache.neethi.Policy;
import org.apache.rampart
svn commit: r1051845 - /axis/axis2/java/rampart/trunk/modules/documentation/src/site/site.xml
Author: samisa Date: Wed Dec 22 11:20:21 2010 New Revision: 1051845 URL: http://svn.apache.org/viewvc?rev=1051845&view=rev Log: Fixed the links on site Modified: axis/axis2/java/rampart/trunk/modules/documentation/src/site/site.xml Modified: axis/axis2/java/rampart/trunk/modules/documentation/src/site/site.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/documentation/src/site/site.xml?rev=1051845&r1=1051844&r2=1051845&view=diff == --- axis/axis2/java/rampart/trunk/modules/documentation/src/site/site.xml (original) +++ axis/axis2/java/rampart/trunk/modules/documentation/src/site/site.xml Wed Dec 22 11:20:21 2010 @@ -40,8 +40,7 @@ - http://ws.apache.org/"/> - http://ws.apache.org/axis2"; /> + http://axis.apache.org/axis2/java/core/"; /> @@ -69,7 +68,7 @@ http://issues.apache.org/jira/browse/Rampart"; /> http://svn.apache.org/viewcvs.cgi/webservices/rampart/trunk/?root=Apache-SVN"; /> + href="http://svn.apache.org/viewvc/axis/axis2/java/rampart/"; /> http://www.apache.org/licenses/LICENSE-2.0.html"; />
svn commit: r1051847 - /axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/svn.xml
Author: samisa Date: Wed Dec 22 11:23:48 2010 New Revision: 1051847 URL: http://svn.apache.org/viewvc?rev=1051847&view=rev Log: Fixed svn locations to those of Axis project from WS project Modified: axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/svn.xml Modified: axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/svn.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/svn.xml?rev=1051847&r1=1051846&r2=1051847&view=diff == --- axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/svn.xml (original) +++ axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/svn.xml Wed Dec 22 11:23:48 2010 @@ -55,13 +55,13 @@ Subversion repository, you must use one depending on your level of access to the Rampart source code: If you are not a committer: http://svn.apache.org/repos/asf/webservices/rampart/trunk/java"; +"http://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk"; target= -"_blank">http://svn.apache.org/repos/asf/webservices/rampart/trunk/java +"_blank">http://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk If you are a committer: https://svn.apache.org/repos/asf/webservices/rampart/trunk/java"; +"https://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk"; target= -"_blank">https://svn.apache.org/repos/asf/webservices/rampart/trunk/java +"_blank">https://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk If you are a committer, make sure that you have selected an svnpasswd. To do this, you must log into svn.apache.org. For more
svn commit: r1051851 - /axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download.xml
Author: samisa Date: Wed Dec 22 11:35:59 2010 New Revision: 1051851 URL: http://svn.apache.org/viewvc?rev=1051851&view=rev Log: Updated download page for next 1.5.1 release Modified: axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download.xml Modified: axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download.xml?rev=1051851&r1=1051850&r2=1051851&view=diff == --- axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download.xml (original) +++ axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download.xml Wed Dec 22 11:35:59 2010 @@ -19,63 +19,81 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> http://www.w3.org/1999/xhtml";> - - Download Apache Rampart module - Apache Rampart Releases - This page provides links to the release versions of Apache Rampart Java. - - - - Version - Date - Description - - + +Download Apache Rampart Module +Apache Rampart Releases +This page provides links to the release versions of Apache Rampart Java. + + + +Version +Date +Description + + - -1.4 + +1.5.1 -1.4 Release (Mirrored) +1.5.1 Release (Mirrored) + + + + +1.5.1 + + +01 Feb 2010 +1.5 Release (Archived) + + + + +1.5 + + +12 Jun 2008 +1.4 Release (Archived) + + + + +1.3 + + +06 Sep 2007 +1.3 Release (Archived) + + + + +1.2 + + +02 Jun 2007 +1.2 Release (Archived) + + + + +1.1 + + +11 Dec 2006 +1.1 Release (Archived) - - - - 1.3 - - - - 1.3 Release (Mirrored) - - - - - 1.2 - - - - 1.2 Release (Mirrored) - - - - - 1.1 - - - - 1.1 Release (Mirrored) - - - - - Apache Rampart Distributions : http://people.apache.org/~ruchithf/rampart/SNAPSHOT";>Nightly builds - - - - Maven Repository: http://people.apache.org/repo/m2-ibiblio-rsync-repository/";>Released Apache Rampart jars | http://people.apache.org/
svn commit: r1051858 - in /axis/axis2/java/rampart/trunk/release-docs: NOTICE.txt README.txt release-notes.html
Author: samisa Date: Wed Dec 22 11:46:33 2010 New Revision: 1051858 URL: http://svn.apache.org/viewvc?rev=1051858&view=rev Log: Fixed documentation to include next release information, 1.5.1 Modified: axis/axis2/java/rampart/trunk/release-docs/NOTICE.txt axis/axis2/java/rampart/trunk/release-docs/README.txt axis/axis2/java/rampart/trunk/release-docs/release-notes.html Modified: axis/axis2/java/rampart/trunk/release-docs/NOTICE.txt URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/release-docs/NOTICE.txt?rev=1051858&r1=1051857&r2=1051858&view=diff == --- axis/axis2/java/rampart/trunk/release-docs/NOTICE.txt (original) +++ axis/axis2/java/rampart/trunk/release-docs/NOTICE.txt Wed Dec 22 11:46:33 2010 @@ -1,12 +1,9 @@ - = - == NOTICE file corresponding to the section 4 d of== - == the Apache License, Version 2.0, == - == in this case for the Apache Axis2 distribution.== - = +Apache Rampart +Copyright 2010 The Apache Software Foundation - This product includes software developed by - The Apache Software Foundation (http://www.apache.org/). +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). - Please read the different LICENSE files present in the lib directory of - this distribution. +Please read the different LICENSE files present in the lib directory of +this distribution. Modified: axis/axis2/java/rampart/trunk/release-docs/README.txt URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/release-docs/README.txt?rev=1051858&r1=1051857&r2=1051858&view=diff == --- axis/axis2/java/rampart/trunk/release-docs/README.txt (original) +++ axis/axis2/java/rampart/trunk/release-docs/README.txt Wed Dec 22 11:46:33 2010 @@ -1,43 +1,43 @@ == -Apache Rampart-1.4 build (April 03, 2008) +Apache Rampart-1.5.1 build (Dec 23, 2010) -http://ws.apache.org/axis2/modules/rampart/ +http://axis.apache.org/axis2/java/rampart -- -___ -Contents -=== +___ +Contents of Binary Distribution +=== lib - This directory contains all the libraries required by rampart in addition to the libraries available in the axis2 standard binary release. -rampart-1.4.mar - WS-Security and WS-SecureConversation support for Axis2 -rahas-1.4.mar - STS module - to be used to add STS operations to a service +rampart-1.5.1.mar - WS-Security and WS-SecureConversation support for Axis2 +rahas-1.5.1.mar - STS module - to be used to add STS operations to a service samples - This contains samples on using Apache Rampart and configuring different components to carryout different WS-Sec* operations. README.txt - This file -build.xml - Setup file to copy all jars to required places - - -Installation - - -Using Ant -- -Run ant script on extracted binary distribution and it will copy the required files to Axis2. You have to set the AXIS2_HOME system variable to point to your Axis2 binary distribution. - -Manual Installation -You can copy the required libraries and module files manually. You need copy all the libraries in the lib directory of Rampart binary distribution to Axis2 lib directory and all the module files to in the modules directory of Rampart binary distribution to Axis2 modules directory. - -Axis2 lib directory â AXIS2_HOME/lib (Standard binary distribution ) or axis2/WEB-INF/lib (WAR) +build.xml - Setup file to copy all jars to required places + +Installation + + +Using Ant +- +Run ant script on extracted binary distribution and it will copy the required files to Axis2. You have to set the AXIS2_HOME system variable to point to your Axis2 binary distribution. + +Manual Installation +--- +You can copy the required libraries and module files manually. You need copy all the libraries in the lib directory of Rampart binary distribution to Axis2 lib directory and all the module files to in the modules directory of Rampart binary distribution to Axis2 modules directory. + +Axis2 lib directory â AXIS2_HOME/lib (Standard binary distribution ) or axis2/WEB-INF/lib (WAR) + +Axis2 modules directory â AXIS2_HOME/repository/modules (Standard binary distribution ) or axis2/WEB-INF/modules (WAR) -Axis2 modules directory â AXIS2_HOME/repository/modules (Standa
svn commit: r1051866 - /axis/axis2/java/rampart/trunk/pom.xml
Author: samisa
Date: Wed Dec 22 12:05:51 2010
New Revision: 1051866
URL: http://svn.apache.org/viewvc?rev=1051866&view=rev
Log:
Fixed the versions for next release as well as dependency versions
Modified:
axis/axis2/java/rampart/trunk/pom.xml
Modified: axis/axis2/java/rampart/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=1051866&r1=1051865&r2=1051866&view=diff
==
--- axis/axis2/java/rampart/trunk/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/pom.xml Wed Dec 22 12:05:51 2010
@@ -12,7 +12,7 @@
rampart-project
pom
WS-Security, WS-Trust and WS-SecureConversation
implementaion for Apache Axis2
-SNAPSHOT
+1.5.1
Apache Rampart
http://ws.apache.org/rampart
@@ -36,10 +36,10 @@
Rampart Developers
-rampart-dev-subscr...@ws.apache.org
-rampart-dev-unsubscr...@ws.apache.org
-rampart-...@ws.apache.org
-
http://mail-archives.apache.org/mod_mbox/ws-rampart-dev/
+java-dev-subscr...@axis.apache.org
+java-dev-unsubscr...@axis.apache.org
+java-...@axis.apache.org
+
http://mail-archives.apache.org/mod_mbox/axis-java-dev/
http://markmail.org/search/list:org.apache.ws.rampart-dev
@@ -70,25 +70,25 @@
Davanum Srinivas
dims
-dims AT wso2.com
-WSO2
+dims AT apache.org
+IBM
Nandana Mihindukulasooriya
nandana
-nandana AT wso2.com
-WSO2
+nandana AT apache.org
+
-
scm:svn:https://svn.apache.org/repos/asf/webservices/rampart/trunk/java
+
scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk
-
scm:svn:https://svn.apache.org/repos/asf/webservices/rampart/trunk/java
+
scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk
-
https://svn.apache.org/repos/asf/webservices/rampart/trunk/java
+
https://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk
@@ -374,13 +374,13 @@
${pom.version}
-SNAPSHOT
-SNAPSHOT
+1.51
+1.51
-SNAPSHOT
-1.2.11-SNAPSHOT
+1.5.4
+1.2.10
-1.5.10-SNAPSHOT
+1.5.10
1.4.2
1.1
svn commit: r1051867 - /axis/axis2/java/rampart/trunk/pom.xml
Author: samisa
Date: Wed Dec 22 12:08:43 2010
New Revision: 1051867
URL: http://svn.apache.org/viewvc?rev=1051867&view=rev
Log:
Fixed mar versions to be 1.5.1
Modified:
axis/axis2/java/rampart/trunk/pom.xml
Modified: axis/axis2/java/rampart/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=1051867&r1=1051866&r2=1051867&view=diff
==
--- axis/axis2/java/rampart/trunk/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/pom.xml Wed Dec 22 12:08:43 2010
@@ -374,8 +374,8 @@
${pom.version}
-1.51
-1.51
+1.5.1
+1.5.1
1.5.4
1.2.10
svn commit: r1051871 - /axis/axis2/java/rampart/trunk/release-docs/release-notes.html
Author: samisa Date: Wed Dec 22 12:26:30 2010 New Revision: 1051871 URL: http://svn.apache.org/viewvc?rev=1051871&view=rev Log: Fixed the typo in Axis2 version and Sandesha version Modified: axis/axis2/java/rampart/trunk/release-docs/release-notes.html Modified: axis/axis2/java/rampart/trunk/release-docs/release-notes.html URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/release-docs/release-notes.html?rev=1051871&r1=1051870&r2=1051871&view=diff == --- axis/axis2/java/rampart/trunk/release-docs/release-notes.html (original) +++ axis/axis2/java/rampart/trunk/release-docs/release-notes.html Wed Dec 22 12:26:30 2010 @@ -34,8 +34,8 @@ and WS-Security Policy and it is importa configuration is also available even though being marked as deprecated. -Apache Rampart 1.5.1 can be successfully used with the next Apache Sandesha2 -release targeted towards Apache Axis2 1.5.1 to configure +Apache Rampart 1.5.1 can be successfully used with the next Apache Sandesha2 1.4 +release targeted towards Apache Axis2 1.5.4 to configure WS-SecureConversation + WS-ReliableMessaging scenarios. The rampart module was successfully tested for interoperability with other
svn commit: r1051894 - /axis/axis2/java/rampart/trunk/pom.xml
Author: samisa
Date: Wed Dec 22 13:43:12 2010
New Revision: 1051894
URL: http://svn.apache.org/viewvc?rev=1051894&view=rev
Log:
Fixing version on trunk back to snapshot
Modified:
axis/axis2/java/rampart/trunk/pom.xml
Modified: axis/axis2/java/rampart/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=1051894&r1=1051893&r2=1051894&view=diff
==
--- axis/axis2/java/rampart/trunk/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/pom.xml Wed Dec 22 13:43:12 2010
@@ -12,7 +12,7 @@
rampart-project
pom
WS-Security, WS-Trust and WS-SecureConversation
implementaion for Apache Axis2
-1.5.1
+SNAPSHOT
Apache Rampart
http://ws.apache.org/rampart
@@ -379,10 +379,10 @@
${pom.version}
-1.5.1
-1.5.1
+SNAPSHOT
+SNAPSHOT
-1.5.4
+1.5.3
1.2.10
1.5.10
svn commit: r1051901 - /axis/axis2/java/rampart/branches/1_5_x/
Author: samisa Date: Wed Dec 22 13:50:17 2010 New Revision: 1051901 URL: http://svn.apache.org/viewvc?rev=1051901&view=rev Log: Creating branch for 1.5.x. We will use this to do 1.5.1 release and future 1.5.x releases. We cannot use 1_5 branch for 1.5.1, because the trunk has moved a lot away from 1_5 branch. We cannot release 1.6 from trunk, as we have not yet released Axis2 1.6 and also we do not have many new features in here. Added: axis/axis2/java/rampart/branches/1_5_x/ - copied from r1051894, axis/axis2/java/rampart/trunk/
svn commit: r1051904 - /axis/axis2/java/rampart/branches/1_5_x/pom.xml
Author: samisa
Date: Wed Dec 22 13:53:09 2010
New Revision: 1051904
URL: http://svn.apache.org/viewvc?rev=1051904&view=rev
Log:
Fixed the version to 1.5.1
Modified:
axis/axis2/java/rampart/branches/1_5_x/pom.xml
Modified: axis/axis2/java/rampart/branches/1_5_x/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/pom.xml?rev=1051904&r1=1051903&r2=1051904&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_5_x/pom.xml Wed Dec 22 13:53:09 2010
@@ -12,7 +12,7 @@
rampart-project
pom
WS-Security, WS-Trust and WS-SecureConversation
implementaion for Apache Axis2
-SNAPSHOT
+1.5.1
Apache Rampart
http://ws.apache.org/rampart
@@ -379,10 +379,10 @@
${pom.version}
-SNAPSHOT
-SNAPSHOT
+1.5.1
+1.5.1
-1.5.3
+1.5.4
1.2.10
1.5.10
svn commit: r1051905 - in /axis/axis2/java/rampart/branches/1_5_x/modules: distribution/ documentation/ rampart-core/ rampart-integration/ rampart-mar/ rampart-policy/ rampart-samples/basic/ rampart-s
Author: samisa Date: Wed Dec 22 13:59:03 2010 New Revision: 1051905 URL: http://svn.apache.org/viewvc?rev=1051905&view=rev Log: Updating the version to 1.5.1 for next release based on Axis2 1.5.4 Modified: axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-samples/basic/build.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-samples/policy/build.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust/pom.xml Modified: axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml?rev=1051905&r1=1051904&r2=1051905&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml Wed Dec 22 13:59:03 2010 @@ -5,7 +5,7 @@ org.apache.rampart rampart-project -SNAPSHOT +1.5.1 ../../pom.xml 4.0.0 @@ -117,4 +117,4 @@ - \ No newline at end of file + Modified: axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml?rev=1051905&r1=1051904&r2=1051905&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml Wed Dec 22 13:59:03 2010 @@ -5,7 +5,7 @@ org.apache.rampart rampart-project -SNAPSHOT +1.5.1 ../../pom.xml 4.0.0 @@ -30,4 +30,4 @@ - \ No newline at end of file + Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml?rev=1051905&r1=1051904&r2=1051905&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml Wed Dec 22 13:59:03 2010 @@ -5,7 +5,7 @@ org.apache.rampart rampart-project -SNAPSHOT +1.5.1 ../../pom.xml Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml?rev=1051905&r1=1051904&r2=1051905&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml Wed Dec 22 13:59:03 2010 @@ -5,14 +5,14 @@ org.apache.rampart rampart-project -SNAPSHOT +1.5.1 ../../pom.xml 4.0.0 rampart-integration jar -SNAPSHOT +1.5.1 Rampart - Integration Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml?rev=1051905&r1=1051904&r2=1051905&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml Wed Dec 22 13:59:03 2010 @@ -4,7 +4,7 @@ org.apache.rampart rampart-project -SNAPSHOT +1.5.1 ../../pom.xml Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml?rev=1051905&r1=1051904&r2=1051905&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml (original) +++ axis/axis2/java/rampart/branches
svn commit: r1051910 - /axis/axis2/java/rampart/branches/1_5_x/release-docs/ChangeLog.txt
Author: samisa Date: Wed Dec 22 14:19:32 2010 New Revision: 1051910 URL: http://svn.apache.org/viewvc?rev=1051910&view=rev Log: Added release dates Modified: axis/axis2/java/rampart/branches/1_5_x/release-docs/ChangeLog.txt Modified: axis/axis2/java/rampart/branches/1_5_x/release-docs/ChangeLog.txt URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/release-docs/ChangeLog.txt?rev=1051910&r1=1051909&r2=1051910&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/release-docs/ChangeLog.txt (original) +++ axis/axis2/java/rampart/branches/1_5_x/release-docs/ChangeLog.txt Wed Dec 22 14:19:32 2010 @@ -1,8 +1,8 @@ This file contains a listing of all Jira issues that have been closed for a given release. -Release 1.5.1 -= +Release 1.5.1 - 23 Dec 2010 +=== ** Bug * [RAMPART-316] - commons-lang jar is not available with Axis2 which breaks Sample-08 @@ -66,8 +66,8 @@ Release 1.5.1 * [RAMPART-291] - Possible improvements to SAML2TokenIssuer * [RAMPART-265] - Incorrect version references in Rampart 1.4 -Release 1.5 -=== +Release 1.5 01 Feb 2010 +=== ** Bug * [RAMPART-189] - WS-Security rampart uses wrong token in service response
svn commit: r1051913 - /axis/axis2/java/rampart/trunk/release-docs/ChangeLog.txt
Author: samisa Date: Wed Dec 22 14:20:42 2010 New Revision: 1051913 URL: http://svn.apache.org/viewvc?rev=1051913&view=rev Log: Added release dates and also 1.5.1 Jira fix info Modified: axis/axis2/java/rampart/trunk/release-docs/ChangeLog.txt Modified: axis/axis2/java/rampart/trunk/release-docs/ChangeLog.txt URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/release-docs/ChangeLog.txt?rev=1051913&r1=1051912&r2=1051913&view=diff == --- axis/axis2/java/rampart/trunk/release-docs/ChangeLog.txt (original) +++ axis/axis2/java/rampart/trunk/release-docs/ChangeLog.txt Wed Dec 22 14:20:42 2010 @@ -1,8 +1,73 @@ This file contains a listing of all Jira issues that have been closed for a given release. -Release 1.5 -=== +Release 1.5.1 - 23 Dec 2010 +=== + +** Bug +* [RAMPART-316] - commons-lang jar is not available with Axis2 which breaks Sample-08 +* [RAMPART-315] - Sample-06 is not working in the current trunk +* [RAMPART-181] - OptimizePartsConfig does not open namespace tag when serializing the assertion +* [RAMPART-186] - Password call back not copied over when the call back is set via a parameter to the axis Service (Secure conversation) +* [RAMPART-174] - Rampart module says true to all assertions when canSupportAssertion is called +* [RAMPART-202] - RampartEngine throws ClassCastException retrieving SOAPHeaderBlocks +* [RAMPART-212] - WSSecurityException: Error in converting SOAP Envelope to Document +* [RAMPART-314] - Rampart distribution does not contain OpenSAML 1.1 jars +* [RAMPART-198] - Rampart 1.4 assumes WSS10 or WSS11 to be present in the policy +* [RAMPART-273] - multiple rampart samples doesn't work +* [RAMPART-254] - Public getter/setter setCallbackHander/getCallbackHander mis-spelled [ hander --> handler] in SAMLTokenIssuerConfig +* [RAMPART-259] - SAML2TokenIssuer calls DefaultBootstrap.bootstrap() per every request and attribute call back handler not being called +* [RAMPART-277] - Rampart ignores token inclusion settings when using the asymmetric security binding +* [RAMPART-267] - div class="xleft" does not work +* [RAMPART-224] - Error in Rampart configuration schema +* [RAMPART-283] - sp:ProtectTokens Assertion Ignored w/ Transport Security Binding +* [RAMPART-288] - Supporting Tokens Not Encrypted When Protection Order is Sign Before Encrypting +* [RAMPART-300] - Rampart automaticaly tries to load an "Encryption user" if the security policy defines the use of a UsernameToken with a AsymmetricBinding +* [RAMPART-225] - SupportingToken UsernameToken is always encrypted +* [RAMPART-303] - Incorrect XML Passed to Digest Algorithm when XML Elements Belong to Empty Namespace +* [RAMPART-309] - Incorrect XML Passed to Digest Algorithm +* [RAMPART-116] - Policy Sample 04 on application scope fails with "Error in key derivation" +* [RAMPART-253] - TTL doesn't serialized in to saml-issuer-config from SAMLTokenIssuerConfig +* [RAMPART-270] - NPE in RampartMessageData +* [RAMPART-274] - renewing a sts token doesn't work +* [RAMPART-180] - Wrong NameIdentifier format +* [RAMPART-276] - SignedEncryptedElements can incorrectly set the namespace of child xpaths during serialization +* [RAMPART-293] - NPE in RampartMessageData prevents fault being returned to service consumer +* [RAMPART-308] - All security exceptions reported as wsse:InvalidSecurity +* [RAMPART-290] - NullPointerException in RampartEngine.isSecurityFault if the incoming fault message contains an invalid fault code element +* [RAMPART-311] - Error AxisFault: A required message part [body] is not signed. +* [RAMPART-239] - Axis2: Rampart module should not check the order of WS-Security header tags +* [RAMPART-119] - Invalid behavior when empty element present in the policy +* [RAMPART-310] - Property 'invalidIssuerAddress' missing from error.properties +* [RAMPART-154] - org.apache.rahas.client.STSClient.org.apache.rahas.processIssueResponse fails if SamlAssertion is issued. +* [RAMPART-130] - MTOM with WS-Security +* [RAMPART-97 ] - interop(WSE3.0 + Rampart1.3) Signature varification failed,When request with Non-English Character +* [RAMPART-210] - samples/basic/sample11 does not exist in distro rampart-dist-1.4-bin.zip +* [RAMPART-22 ] - Exception handling in UsernameTokenProcessor.handleUsernameToken +* [RAMPART-111] - Rampart won't send certificate serial + issuer. Only either BinaryToken or Identity, but not always as it should +* [RAMPART-187] - Secure conversation clients do not work when the bootstrap policy requires Username Token +* [RAMPART-195] - Maven metadata are invalid in official repo preventing the use of
svn commit: r1051917 - /axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download.xml
Author: samisa Date: Wed Dec 22 14:32:07 2010 New Revision: 1051917 URL: http://svn.apache.org/viewvc?rev=1051917&view=rev Log: Fixed the typos in release version info and link info Modified: axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download.xml Modified: axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download.xml?rev=1051917&r1=1051916&r2=1051917&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download.xml Wed Dec 22 14:32:07 2010 @@ -41,8 +41,8 @@ - -1.5.1 + +1.5 01 Feb 2010 @@ -50,8 +50,8 @@ - -1.5 + +1.4 12 Jun 2008
svn commit: r1051919 - /axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download.xml
Author: samisa Date: Wed Dec 22 14:33:14 2010 New Revision: 1051919 URL: http://svn.apache.org/viewvc?rev=1051919&view=rev Log: Fixed the typos in release version info and link info Modified: axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download.xml Modified: axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download.xml?rev=1051919&r1=1051918&r2=1051919&view=diff == --- axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download.xml (original) +++ axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download.xml Wed Dec 22 14:33:14 2010 @@ -41,8 +41,8 @@ - -1.5.1 + +1.5 01 Feb 2010 @@ -50,8 +50,8 @@ - -1.5 + +1.4 12 Jun 2008
