Fixes for TUSCANY-2666

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

3 files changed, 47 insertions, 5 deletions

diff --git a/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java b/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java
index 2e367cf32b..562314230a 100644
--- a/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java
+++ b/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java
@@ -31,6 +31,11 @@ import org.apache.tuscany.sca.node.SCANodeFactory;
 public class CheckingAccountServer {
 
     public static void main(String[] args) {
+        long timeout = -1L;
+        if (args.length > 0) {
+            timeout = Long.parseLong(args[0]);
+        }
+        
         try {
             BrokerService jmsBroker;
             jmsBroker = new BrokerService(); 
@@ -43,8 +48,12 @@ public class CheckingAccountServer {
             SCANode node = factory.createSCANodeFromClassLoader("CheckingsAccount.composite", CheckingAccountServer.class.getClassLoader());
             node.start();
 
-            System.out.println("CheckingsAccount server started (press enter to shutdown)");
-            System.in.read();
+            if (timeout < 0) {
+                System.out.println("CheckingsAccount server started (press enter to shutdown)");
+                System.in.read();
+            } else {
+                Thread.sleep(timeout);
+            }            
 
             node.stop();
             
diff --git a/java/sca/samples/spring-bigbank-checkaccount/src/main/resources/definitions.xml b/java/sca/samples/spring-bigbank-checkaccount/src/main/resources/definitions.xml
index d57d02297c..0ce1440ddf 100644
--- a/java/sca/samples/spring-bigbank-checkaccount/src/main/resources/definitions.xml
+++ b/java/sca/samples/spring-bigbank-checkaccount/src/main/resources/definitions.xml
@@ -27,7 +27,7 @@
 

   

 <sca:intent name="authorization" 

- 			 constrains="sca:implementation.java">

+ 			 constrains="sca:implementation.spring">

  			 <description>

  				Authorization Intent

  			 </description>

@@ -36,7 +36,7 @@
  <!-- WS Security POLICY SETS -->

  <sca:policySet name="wsAuthenticationPolicy"

  	provides="authentication"

- 	appliesTo="sca:service/sca:binding.ws">

+ 	appliesTo="sca:service/sca:binding.jms">

  	<tuscany:wsConfigParam>

  		<parameter name="InflowSecurity">

  			<action>

@@ -49,7 +49,7 @@
  

  <sca:policySet name="chkDeptAuthorizationPolicy"

  	provides="bba:authorization"

- 	appliesTo="sca:implementation.java">

+ 	appliesTo="sca:implementation.spring">

  	<chk:AuthPolicy>

  		<!-- need to evolve what should go in here -->

  	</chk:AuthPolicy>

diff --git a/java/sca/samples/spring-bigbank-checkaccount/src/test/java/bigbank/checkaccount/CheckAccountServiceTestCase.java b/java/sca/samples/spring-bigbank-checkaccount/src/test/java/bigbank/checkaccount/CheckAccountServiceTestCase.java
new file mode 100644
index 0000000000..a45630278b
--- /dev/null
+++ b/java/sca/samples/spring-bigbank-checkaccount/src/test/java/bigbank/checkaccount/CheckAccountServiceTestCase.java
@@ -0,0 +1,33 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package bigbank.checkaccount;

+

+import junit.framework.TestCase;

+import bigbank.account.checking.server.CheckingAccountServer;

+

+/**

+ * Tests out the big bank service

+ *

+ */

+public class CheckAccountServiceTestCase extends TestCase {

+

+    public void testServer() throws Exception {

+        CheckingAccountServer.main(new String[] {"1000"});

+    }

+}