Create new certificates valid until 2036. Remove some junk from the definitions.xm file. Do a better job at printing out the exception in this test.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@735283 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 17 insertions, 9 deletions

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/AbstractHelloWorldOMTestCase.java b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/AbstractHelloWorldOMTestCase.java
index 6cdb12c221..eca10ca9b6 100644
--- a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/AbstractHelloWorldOMTestCase.java
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/AbstractHelloWorldOMTestCase.java
@@ -28,6 +28,7 @@ import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMText;

 import org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOM;

 import org.apache.tuscany.sca.host.embedded.SCADomain;

+import org.apache.tuscany.sca.interfacedef.util.FaultException;

 

 public abstract class AbstractHelloWorldOMTestCase extends TestCase {

 

@@ -35,14 +36,21 @@ public abstract class AbstractHelloWorldOMTestCase extends TestCase {
     private HelloWorldOM helloWorld;

 

     public void testHelloWorld() throws Exception {

-        OMFactory fac = OMAbstractFactory.getOMFactory();

-        OMElement requestOM = fac.createOMElement("getGreetings", "http://helloworld-om", "helloworld");

-        OMElement parmE = fac.createOMElement("name", "http://helloworld-om", "helloworld");

-        requestOM.addChild(parmE);

-        parmE.addChild(fac.createOMText("petra"));

-        OMElement responseOM = helloWorld.getGreetings(requestOM);

-        OMElement child = (OMElement)responseOM.getFirstElement();

-        Assert.assertEquals("Hello petra", ((OMText)child.getFirstOMChild()).getText());

+    	try {

+	        OMFactory fac = OMAbstractFactory.getOMFactory();

+	        OMElement requestOM = fac.createOMElement("getGreetings", "http://helloworld-om", "helloworld");

+	        OMElement parmE = fac.createOMElement("name", "http://helloworld-om", "helloworld");

+	        requestOM.addChild(parmE);

+	        parmE.addChild(fac.createOMText("petra"));

+	        OMElement responseOM = helloWorld.getGreetings(requestOM);

+	        OMElement child = (OMElement)responseOM.getFirstElement();

+	        Assert.assertEquals("Hello petra", ((OMText)child.getFirstOMChild()).getText());

+    	} catch (Exception ex) {

+    		System.out.println(ex.getMessage());

+    		if (ex.getCause() instanceof FaultException){

+    			System.out.println(((FaultException)ex.getCause()).getFaultInfo().toString());

+    		}

+    	}

     }

 

     @Override

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml
index 9ff02b3a6b..4cb6890c9f 100644
--- a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml
@@ -74,7 +74,7 @@
         		<items>Timestamp Signature</items>

         		<user>TuscanyWsUser</user>

         		<signaturePropFile>org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties</signaturePropFile>

-        		<passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.configparams.IntegrityPWCBHandler</passwordCallbackClass>" +

+        		<passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.configparams.IntegrityPWCBHandler</passwordCallbackClass>

         		<signatureKeyIdentifier>DirectReference</signatureKeyIdentifier>

       		</action>

     	</parameter>

diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks
index 307edb9b37..fef1d7e8a7 100644
--- a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks
diff --git a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks
index 307edb9b37..fef1d7e8a7 100644
--- a/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks
+++ b/branches/sca-java-1.3.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks