Author: slaws
Date: Mon Jul 4 07:31:13 2011
New Revision: 1142576
URL: http://svn.apache.org/viewvc?rev=1142576&view=rev
Log:
Tidy test to remove debug items
Modified:
tuscany/sca-java-2.x/trunk/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
tuscany/sca-java-2.x/trunk/testing/itest/ws/wspolicy/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
tuscany/sca-java-2.x/trunk/testing/itest/ws/wspolicy/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java
Modified:
tuscany/sca-java-2.x/trunk/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java?rev=1142576&r1=1142575&r2=1142576&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
(original)
+++
tuscany/sca-java-2.x/trunk/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
Mon Jul 4 07:31:13 2011
@@ -31,14 +31,14 @@ public class HelloWorldService implement
public String getGreetings(String name) {
Subject subject = requestContext.getSecuritySubject();
- String response = "Hello " + name + " ";
-
+ String response = "Hello " + name;
+/*
if (subject == null){
response += "null subject";
} else {
response += subject.getPrincipals().iterator().next().getName();
}
-
+*/
System.out.println("At service: " + response);
return response;
}
Modified:
tuscany/sca-java-2.x/trunk/testing/itest/ws/wspolicy/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/wspolicy/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite?rev=1142576&r1=1142575&r2=1142576&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/ws/wspolicy/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
(original)
+++
tuscany/sca-java-2.x/trunk/testing/itest/ws/wspolicy/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
Mon Jul 4 07:31:13 2011
@@ -30,7 +30,7 @@
<reference name="helloWorldWS" requires="integrity">
<interface.wsdl
interface="http://helloworld#wsdl.interface(HelloWorld)" />
<binding.ws
wsdlElement="http://helloworld#wsdl.binding(HelloWorldSoapBinding)"
-
uri="http://localhost:8081/HelloWorldService/HelloWorld"/>
+
uri="http://localhost:8080/HelloWorldService/HelloWorld"/>
</reference>
</component>
Modified:
tuscany/sca-java-2.x/trunk/testing/itest/ws/wspolicy/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/wspolicy/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java?rev=1142576&r1=1142575&r2=1142576&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/ws/wspolicy/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/testing/itest/ws/wspolicy/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java
Mon Jul 4 07:31:13 2011
@@ -32,7 +32,7 @@ public class HelloworldTestCase extends
private HelloWorld helloWorld;
public void testCalculator() throws Exception {
- assertEquals("Hello fred myname", helloWorld.getGreetings("fred"));
+ assertEquals("Hello fred", helloWorld.getGreetings("fred"));
}
@Override
