summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2011-07-04 07:31:13 +0000
committerslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2011-07-04 07:31:13 +0000
commit537b83c58024a90f383e65a9b0591cdeb48dbf46 (patch)
treee29166ef14a891bd692f987964073387e93f051f
parenta9c20c2a85a0bf6b2b359721b596202754965cf8 (diff)
Tidy test to remove debug items
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1142576 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--sca-java-2.x/trunk/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java6
-rw-r--r--sca-java-2.x/trunk/testing/itest/ws/wspolicy/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite2
-rw-r--r--sca-java-2.x/trunk/testing/itest/ws/wspolicy/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java2
3 files changed, 5 insertions, 5 deletions
diff --git a/sca-java-2.x/trunk/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
index f514fc9b94..b1ecba682b 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/trunk/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
@@ -31,14 +31,14 @@ public class HelloWorldService implements HelloWorld {
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;
}
diff --git a/sca-java-2.x/trunk/testing/itest/ws/wspolicy/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite b/sca-java-2.x/trunk/testing/itest/ws/wspolicy/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
index 6c199611a1..463979ef6f 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/wspolicy/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
+++ b/sca-java-2.x/trunk/testing/itest/ws/wspolicy/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
@@ -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>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/wspolicy/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java b/sca-java-2.x/trunk/testing/itest/ws/wspolicy/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java
index d21d3c3682..610f9e4bd5 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/wspolicy/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java
+++ b/sca-java-2.x/trunk/testing/itest/ws/wspolicy/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java
@@ -32,7 +32,7 @@ public class HelloworldTestCase extends TestCase {
private HelloWorld helloWorld;
public void testCalculator() throws Exception {
- assertEquals("Hello fred myname", helloWorld.getGreetings("fred"));
+ assertEquals("Hello fred", helloWorld.getGreetings("fred"));
}
@Override