svn commit: r1220746 - in /axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas: errors.properties impl/SAMLTokenIssuer.java

2011-12-19 Thread ruchithf 
Author: ruchithf
Date: Mon Dec 19 13:49:05 2011
New Revision: 1220746

URL: http://svn.apache.org/viewvc?rev=1220746&view=rev
Log:
Applying Amila's patch for RAMPART-347

Modified:

axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/errors.properties

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/errors.properties
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/errors.properties?rev=1220746&r1=1220745&r2=1220746&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/errors.properties
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/errors.properties
 Mon Dec 19 13:49:05 2011
@@ -49,6 +49,7 @@ notSupported = Not supported: {0}
 errorCreatingSymmKey = Error in creating the ephemeral key
 badDispatcherConfigMultipleDefaultIssuers = Dispatcher configuration error : 
There should be only one default issuer
 errorInBuildingTheEncryptedKeyForPrincipal = Error in building encrypted key 
for principal : \"{0}\"
+trustedCertNotFoundForEPR = Trusted certificate not found for service address 
: \"{0}\"
 invlidTTL = timeToLive (in milliseconds) must be a positive long value.
 invalidKeysize = Invalid key size
 unsupportedWSTVersion = Unsupported WS-Trust version

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=1220746&r1=1220745&r2=1220746&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
 Mon Dec 19 13:49:05 2011
@@ -318,11 +318,21 @@ public class SAMLTokenIssuer implements 
 // Extract the Encryptedkey DOM element
 encryptedKeyElem = encrKeyBuilder.getEncryptedKeyElement();
 } catch (WSSecurityException e) {
-throw new TrustException(
-"errorInBuildingTheEncryptedKeyForPrincipal",
-new String[] { serviceCert.getSubjectDN().getName() },
-e);
+
+if (serviceCert != null) {
+throw new TrustException(
+"errorInBuildingTheEncryptedKeyForPrincipal",
+new String[]{serviceCert.getSubjectDN().getName()},
+e);
+} else {
+throw new TrustException(
+"trustedCertNotFoundForEPR",
+new String[]{data.getAppliesToAddress()},
+e);
+}
+
 }
+
 return this.createAttributeAssertion(doc, data ,encryptedKeyElem, 
config,
 crypto, creationTime, expirationTime);
 } else {

svn commit: r1220888 - in /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2: description/WSDL11ToAxisServiceBuilder.java namespace/Constants.java wsdl/WSDLConstants.java

2011-12-19 Thread ruchithf 
Author: ruchithf
Date: Mon Dec 19 18:39:05 2011
New Revision: 1220888

URL: http://svn.apache.org/viewvc?rev=1220888&view=rev
Log:
WS-Policy 1.5 namespace URI added. Without this codegen fails with wsdl with 
WS-Policy v1.5


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/namespace/Constants.java

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/WSDLConstants.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=1220888&r1=1220887&r2=1220888&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
 Mon Dec 19 18:39:05 2011
@@ -3114,7 +3114,8 @@ public class WSDL11ToAxisServiceBuilder 
 
 if (extElement instanceof UnknownExtensibilityElement) {
 unknown = (UnknownExtensibilityElement) extElement;
-if 
(WSDLConstants.WSDL11Constants.POLICY.equals(unknown.getElementType())) {
+if 
(WSDLConstants.WSDL11Constants.POLICY.equals(unknown.getElementType())
+   || 
WSDLConstants.WSDL11Constants.POLICY_15.equals(unknown.getElementType())) {
 
 policy = (Policy) 
PolicyUtil.getPolicyComponent(unknown.getElement());
 String key;

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/namespace/Constants.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/namespace/Constants.java?rev=1220888&r1=1220887&r2=1220888&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/namespace/Constants.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/namespace/Constants.java
 Mon Dec 19 18:39:05 2011
@@ -112,6 +112,9 @@ public class Constants {
 
 public static final String URI_POLICY =
 "http://schemas.xmlsoap.org/ws/2004/09/policy";;
+public static final String URI_POLICY_15 =
+"http://www.w3.org/ns/ws-policy";;
+
 public static final String FORMAT_BINDING = 
"http://schemas.xmlsoap.org/wsdl/formatbinding/";;
 public static final String JAVA_NS = 
"http://schemas.xmlsoap.org/wsdl/java/";;
 /**

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/WSDLConstants.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/WSDLConstants.java?rev=1220888&r1=1220887&r2=1220888&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/WSDLConstants.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/WSDLConstants.java
 Mon Dec 19 18:39:05 2011
@@ -128,6 +128,8 @@ public interface WSDLConstants {
 Constants.URI_WSDL12_SOAP, "binding");
 QName POLICY = new QName(
 Constants.URI_POLICY, "Policy");
+QName POLICY_15 = new QName(
+Constants.URI_POLICY_15, "Policy");
 QName POLICY_REFERENCE = new QName(
 Constants.URI_POLICY, "PolicyReference");
 }

svn commit: r1220915 - in /axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model: Wss10.java Wss11.java

2011-12-19 Thread ruchithf 
Author: ruchithf
Date: Mon Dec 19 19:42:33 2011
New Revision: 1220915

URL: http://svn.apache.org/viewvc?rev=1220915&view=rev
Log:
Fixing the incorrect prefix issue, reported in some complaints about working 
with generated code

Modified:

axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss10.java

axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss11.java

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss10.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss10.java?rev=1220915&r1=1220914&r2=1220915&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss10.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss10.java
 Mon Dec 19 19:42:33 2011
@@ -119,7 +119,7 @@ public class Wss10 extends AbstractSecur
 }
 
 // 
-writer.writeStartElement(prefix, SPConstants.POLICY.getLocalPart(), 
SPConstants.POLICY.getNamespaceURI());
+writer.writeStartElement(SPConstants.POLICY.getPrefix(), 
SPConstants.POLICY.getLocalPart(), SPConstants.POLICY.getNamespaceURI());
 
 if (isMustSupportRefKeyIdentifier()) {
 // 

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss11.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss11.java?rev=1220915&r1=1220914&r2=1220915&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss11.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss11.java
 Mon Dec 19 19:42:33 2011
@@ -101,7 +101,7 @@ public class Wss11 extends Wss10 {
 }
 
 // 
-writer.writeStartElement(prefix, SPConstants.POLICY.getLocalPart(), 
SPConstants.POLICY.getNamespaceURI());
+writer.writeStartElement(SPConstants.POLICY.getPrefix(), 
SPConstants.POLICY.getLocalPart(), SPConstants.POLICY.getNamespaceURI());
 
 // 
 if (isMustSupportRefKeyIdentifier()) {

svn commit: r1220960 - in /axis/axis2/java/sandesha/trunk: ./ modules/tests/ modules/tests/src/test/java/org/apache/sandesha2/ modules/tests/test-resources/

2011-12-19 Thread veithen 
Author: veithen
Date: Mon Dec 19 21:37:54 2011
New Revision: 1220960

URL: http://svn.apache.org/viewvc?rev=1220960&view=rev
Log:
Allow Sandesha2 builds to run concurrently.

Modified:
axis/axis2/java/sandesha/trunk/modules/tests/pom.xml

axis/axis2/java/sandesha/trunk/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java
axis/axis2/java/sandesha/trunk/modules/tests/test-resources/client_axis2.xml

axis/axis2/java/sandesha/trunk/modules/tests/test-resources/client_mtom_axis2.xml
axis/axis2/java/sandesha/trunk/pom.xml

Modified: axis/axis2/java/sandesha/trunk/modules/tests/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/tests/pom.xml?rev=1220960&r1=1220959&r2=1220960&view=diff
==
--- axis/axis2/java/sandesha/trunk/modules/tests/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/modules/tests/pom.xml Mon Dec 19 21:37:54 
2011
@@ -174,6 +174,10 @@
 axis2-transport-local
 
 
+org.apache.axis2
+axis2-testutils
+
+
 org.apache.sandesha2
 sandesha2-core
 ${project.version}

Modified: 
axis/axis2/java/sandesha/trunk/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java?rev=1220960&r1=1220959&r2=1220960&view=diff
==
--- 
axis/axis2/java/sandesha/trunk/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java
 (original)
+++ 
axis/axis2/java/sandesha/trunk/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java
 Mon Dec 19 21:37:54 2011
@@ -42,6 +42,7 @@ import org.apache.axis2.description.Axis
 import org.apache.axis2.description.AxisOperationFactory;
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.engine.MessageReceiver;
+import org.apache.axis2.testutils.PortAllocator;
 import org.apache.axis2.transport.http.SimpleHTTPServer;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -51,7 +52,7 @@ public class SandeshaTestCase extends Te
String resourceDir = ""; //"test-resources";
 Properties properties = null;
 final String PROPERTY_FILE_NAME = "sandesha2-test.properties";
-public final int DEFAULT_SERVER_TEST_PORT = 8060;
+public final int DEFAULT_SERVER_TEST_PORT = PortAllocator.allocatePort();
 public ConfigurationContext serverConfigurationContext = null;
 private final String RMServiceName = "RMSampleService";
private Log log = LogFactory.getLog(getClass());

Modified: 
axis/axis2/java/sandesha/trunk/modules/tests/test-resources/client_axis2.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/tests/test-resources/client_axis2.xml?rev=1220960&r1=1220959&r2=1220960&view=diff
==
--- 
axis/axis2/java/sandesha/trunk/modules/tests/test-resources/client_axis2.xml 
(original)
+++ 
axis/axis2/java/sandesha/trunk/modules/tests/test-resources/client_axis2.xml 
Mon Dec 19 21:37:54 2011
@@ -127,7 +127,7 @@
 
 
-6060
+0
 
 
-6060
+0
 
 
 

Modified: axis/axis2/java/sandesha/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/pom.xml?rev=1220960&r1=1220959&r2=1220960&view=diff
==
--- axis/axis2/java/sandesha/trunk/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/pom.xml Mon Dec 19 21:37:54 2011
@@ -399,6 +399,11 @@
 axis2-transport-local
 ${axis2.version}
 
+
+org.apache.axis2
+axis2-testutils
+${axis2.version}
+

svn commit: r1220972 - /axis/axis2/java/sandesha/branches/1_6/pom.xml

2011-12-19 Thread veithen 
Author: veithen
Date: Mon Dec 19 22:03:14 2011
New Revision: 1220972

URL: http://svn.apache.org/viewvc?rev=1220972&view=rev
Log:
Updated dependency versions on the 1.6 branch.

Modified:
axis/axis2/java/sandesha/branches/1_6/pom.xml

Modified: axis/axis2/java/sandesha/branches/1_6/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/pom.xml?rev=1220972&r1=1220971&r2=1220972&view=diff
==
--- axis/axis2/java/sandesha/branches/1_6/pom.xml (original)
+++ axis/axis2/java/sandesha/branches/1_6/pom.xml Mon Dec 19 22:03:14 2011
@@ -430,9 +430,9 @@
 
 
 
-1.6.1
-1.6.1
-1.2.12
+1.6.2-SNAPSHOT
+1.6.2-SNAPSHOT
+1.2.13-SNAPSHOT
 1.1.1
 3.8.2
 1.2.15

svn commit: r1221080 - /axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java

2011-12-19 Thread ruchithf 
Author: ruchithf
Date: Tue Dec 20 02:44:58 2011
New Revision: 1221080

URL: http://svn.apache.org/viewvc?rev=1221080&view=rev
Log:
Fix suggested in RAMPART-350


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=1221080&r1=1221079&r2=1221080&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 20 02:44:58 2011
@@ -175,10 +175,6 @@ public abstract class BindingBuilder {
 password = cb[0].getPassword();
 }
 
-if (log.isDebugEnabled()) {
-log.debug("Password : " + password);
-}
-
 if(password != null && !"".equals(password)) {
 //If the password is available then build the token

svn commit: r1221102 - in /axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart: builder/BindingBuilder.java errors.properties

2011-12-19 Thread ruchithf 
Author: ruchithf
Date: Tue Dec 20 05:12:59 2011
New Revision: 1221102

URL: http://svn.apache.org/viewvc?rev=1221102&view=rev
Log:
Getting rid of a possible NPE : Caused when someone forgets to setup 
RampartConfig

Modified:

axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java

axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties

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=1221102&r1=1221101&r2=1221102&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 20 05:12:59 2011
@@ -27,6 +27,7 @@ import org.apache.rampart.RampartExcepti
 import org.apache.rampart.RampartMessageData;
 import org.apache.rampart.policy.RampartPolicyData;
 import org.apache.rampart.policy.SupportingPolicyData;
+import org.apache.rampart.policy.model.RampartConfig;
 import org.apache.rampart.util.RampartUtil;
 import org.apache.ws.secpolicy.Constants;
 import org.apache.ws.secpolicy.SPConstants;
@@ -274,14 +275,19 @@ public abstract class BindingBuilder {
 }
 
 // Get the user - First check whether userCertAlias present
-if (user == null) {
-user = rpd.getRampartConfig().getUserCertAlias();
+RampartConfig rampartConfig = rpd.getRampartConfig();
+if(rampartConfig == null) {
+   throw new RampartException("rampartConfigMissing");
+}
+
+   if (user == null) {
+user = rampartConfig.getUserCertAlias();
 }
 
 // If userCertAlias is not present, use user property as Alias
 
 if (user == null) {
-user = rpd.getRampartConfig().getUser();
+user = rampartConfig.getUser();
 }
 
 String password = null;
@@ -334,8 +340,7 @@ public abstract class BindingBuilder {
 sig.setDigestAlgo(algorithmSuite.getDigest());
 
 try {
-sig.prepare(rmd.getDocument(), RampartUtil.getSignatureCrypto(rpd
-.getRampartConfig(), rmd.getCustomClassLoader()), 
+sig.prepare(rmd.getDocument(), 
RampartUtil.getSignatureCrypto(rampartConfig, rmd.getCustomClassLoader()), 
 rmd.getSecHeader());
 } catch (WSSecurityException e) {
 throw new RampartException("errorInSignatureWithX509Token", e);

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties?rev=1221102&r1=1221101&r2=1221102&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties
 Tue Dec 20 05:12:59 2011
@@ -28,6 +28,7 @@ cannotCreatePolicyValidatorCallbackInsta
 cannotLoadRampartConfigCallbackClass = Cannot load rampart config callback 
class : \"{0}\"
 cannotCreateRampartConfigCallbackInstance = Cannot create rampart config 
callback class instance : \"{0}\"
 missingEncryptionUser=Encryption user not specified (The context is created by 
the initiating party)
+rampartConfigMissing = Rampart policy configuration missing
 
 missingSignatureCrypto=Signature crypto information not available
 missingEncryptionCrypto=Encryption crypto information not available