Adding missing files

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

13 files changed, 654 insertions, 0 deletions

diff --git a/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/java/sample/servlet/GreetingService.java b/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/java/sample/servlet/GreetingService.java
new file mode 100644
index 0000000000..5a963ab595
--- /dev/null
+++ b/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/java/sample/servlet/GreetingService.java
@@ -0,0 +1,31 @@
+/*
+ * 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 sample.servlet;
+
+import org.oasisopen.sca.annotation.Remotable;
+
+
+@Remotable
+/**
+ * Greeting service interface
+ */
+public interface GreetingService {
+    String greet(String msg);
+}
diff --git a/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/java/sample/servlet/GreetingServiceImpl.java b/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/java/sample/servlet/GreetingServiceImpl.java
new file mode 100644
index 0000000000..6d17c5d8c5
--- /dev/null
+++ b/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/java/sample/servlet/GreetingServiceImpl.java
@@ -0,0 +1,63 @@
+/*
+ * 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 sample.servlet;
+
+import sample.DateService;
+import sample.Helloworld;
+
+/**
+ * Greeting service implementation
+ */
+public class GreetingServiceImpl implements GreetingService {
+    private Helloworld helloworld; // Reference to a Spring bean in the web application context
+    private DateService dateService; // Reference to an SCA service in the web application node
+    private MessageServiceImpl messageService; // Reference to a Spring bean in the servlet-scoped application context
+
+    @Override
+    public String greet(String msg) {
+        String newMsg = messageService.toUppercase(msg);
+        return "[" + dateService.getDate() + "] " + helloworld.sayHello(newMsg);
+    }
+
+    public Helloworld getHelloworld() {
+        return helloworld;
+    }
+
+    public void setHelloworld(Helloworld helloworld) {
+        this.helloworld = helloworld;
+    }
+
+    public DateService getDateService() {
+        return dateService;
+    }
+
+    public void setDateService(DateService dateService) {
+        this.dateService = dateService;
+    }
+
+    public MessageServiceImpl getMessageService() {
+        return messageService;
+    }
+
+    public void setMessageService(MessageServiceImpl messageService) {
+        this.messageService = messageService;
+    }
+
+}
diff --git a/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/java/sample/servlet/MessageServiceImpl.java b/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/java/sample/servlet/MessageServiceImpl.java
new file mode 100644
index 0000000000..bc604cb72f
--- /dev/null
+++ b/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/java/sample/servlet/MessageServiceImpl.java
@@ -0,0 +1,29 @@
+/*
+ * 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 sample.servlet;
+
+/**
+ * A message service implementation that converts messages to be uppercase
+ */
+public class MessageServiceImpl {
+    public String toUppercase(String msg) {
+        return msg.toUpperCase();
+    }
+}
diff --git a/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/java/sample/spring/mvc/basic/account/Account.java b/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/java/sample/spring/mvc/basic/account/Account.java
new file mode 100644
index 0000000000..b6c7835500
--- /dev/null
+++ b/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/java/sample/spring/mvc/basic/account/Account.java
@@ -0,0 +1,95 @@
+/*
+ * 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 sample.spring.mvc.basic.account;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.springframework.format.annotation.NumberFormat;
+import org.springframework.format.annotation.NumberFormat.Style;
+
+public class Account {
+
+    private Long id;
+
+    // @NotNull
+    // @Size(min=1, max=25)
+    private String name;
+
+    // @NotNull
+    @NumberFormat(style = Style.CURRENCY)
+    private BigDecimal balance = new BigDecimal("1000");
+
+    // @NotNull
+    @NumberFormat(style = Style.PERCENT)
+    private BigDecimal equityAllocation = new BigDecimal(".60");
+
+    // @DateTimeFormat(style = "S-")
+    // @Future
+    private Date renewalDate = new Date(new Date().getTime() + 31536000000L);
+
+    public Long getId() {
+        return id;
+    }
+
+    void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public BigDecimal getBalance() {
+        return balance;
+    }
+
+    public void setBalance(BigDecimal balance) {
+        this.balance = balance;
+    }
+
+    public BigDecimal getEquityAllocation() {
+        return equityAllocation;
+    }
+
+    public void setEquityAllocation(BigDecimal equityAllocation) {
+        this.equityAllocation = equityAllocation;
+    }
+
+    public Date getRenewalDate() {
+        return renewalDate;
+    }
+
+    public void setRenewalDate(Date renewalDate) {
+        this.renewalDate = renewalDate;
+    }
+
+    Long assignId() {
+        this.id = idSequence.incrementAndGet();
+        return id;
+    }
+
+    private static final AtomicLong idSequence = new AtomicLong();
+
+}
diff --git a/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/java/sample/spring/mvc/basic/account/AccountController.java b/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/java/sample/spring/mvc/basic/account/AccountController.java
new file mode 100644
index 0000000000..d42ab7ec41
--- /dev/null
+++ b/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/java/sample/spring/mvc/basic/account/AccountController.java
@@ -0,0 +1,62 @@
+/*
+ * 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 sample.spring.mvc.basic.account;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+@Controller
+@RequestMapping(value = "/account")
+public class AccountController {
+
+    private Map<Long, Account> accounts = new ConcurrentHashMap<Long, Account>();
+
+    @RequestMapping(method = RequestMethod.GET)
+    public String getCreateForm(Model model) {
+        model.addAttribute(new Account());
+        return "account/createForm";
+    }
+
+    @RequestMapping(method = RequestMethod.POST)
+    public String create(/* @Valid */Account account, BindingResult result) {
+        if (result.hasErrors()) {
+            return "account/createForm";
+        }
+        this.accounts.put(account.assignId(), account);
+        return "redirect:account/" + account.getId();
+    }
+
+    @RequestMapping(value = "{id}", method = RequestMethod.GET)
+    public String getView(@PathVariable Long id, Model model) {
+        Account account = this.accounts.get(id);
+        if (account == null) {
+            throw new ResourceNotFoundException(id);
+        }
+        model.addAttribute(account);
+        return "account/view";
+    }
+
+}
diff --git a/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/java/sample/spring/mvc/basic/account/ResourceNotFoundException.java b/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/java/sample/spring/mvc/basic/account/ResourceNotFoundException.java
new file mode 100644
index 0000000000..91c88eeea0
--- /dev/null
+++ b/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/java/sample/spring/mvc/basic/account/ResourceNotFoundException.java
@@ -0,0 +1,37 @@
+/*
+ * 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 sample.spring.mvc.basic.account;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(value = HttpStatus.NOT_FOUND)
+public class ResourceNotFoundException extends RuntimeException {
+
+    private Long resourceId;
+
+    public ResourceNotFoundException(Long resourceId) {
+        this.resourceId = resourceId;
+    }
+
+    public Long getResourceId() {
+        return resourceId;
+    }
+
+}
diff --git a/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/messages/messages.properties b/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/messages/messages.properties
new file mode 100644
index 0000000000..666c18126b
--- /dev/null
+++ b/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/messages/messages.properties
@@ -0,0 +1,20 @@
+#
+# 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.    
+#
+welcome.title=Congratulations! Spring is running!
+typeMismatch=could not be parsed
\ No newline at end of file
diff --git a/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/sca/sca-context.xml b/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/sca/sca-context.xml
new file mode 100644
index 0000000000..03a0b89f2e
--- /dev/null
+++ b/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/sca/sca-context.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * 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.    
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:sca="http://www.springframework.org/schema/sca"
+    xsi:schemaLocation="
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
+
+    <bean id="GreetingServiceBean" class="sample.servlet.GreetingServiceImpl">
+        <property name="helloworld">
+            <ref parent="HelloworldBean" /> <!-- HelloworldBean is the WebApplicationContext at the web app level -->
+        </property>
+        <property name="messageService">
+            <ref bean="MessageServiceBean" />
+        </property>
+        <property name="dateService">
+            <ref bean="dateService" /> <!-- Pointing to an SCA reference -->
+        </property>
+    </bean>
+
+    <sca:reference name="dateService" type="sample.DateService" />
+    <sca:service name="greetingService" type="sample.servlet.GreetingService" target="GreetingServiceBean" />
+
+</beans>
\ No newline at end of file
diff --git a/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/sca/servlet.composite b/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/sca/servlet.composite
new file mode 100644
index 0000000000..d5eaa0c042
--- /dev/null
+++ b/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/sca/servlet.composite
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * 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.    
+-->
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" targetNamespace="http://sample"
+    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" name="servlet">
+
+    <component name="GreetingComponent">
+        <implementation.spring location="sca-context.xml" />
+        <service name="greetingService">
+            <tuscany:binding.jsonrpc />
+        </service>
+        <reference name="dateService" target="DateServiceComponent" />
+    </component>
+
+</composite>
diff --git a/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml b/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml
new file mode 100644
index 0000000000..b4ea86d1f9
--- /dev/null
+++ b/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.    
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+
+	<!-- Scans the classpath of this application for @Components to deploy as beans -->
+	<context:component-scan base-package="sample.spring.mvc.basic" />
+
+	<!-- Configures the @Controller programming model -->
+	<mvc:annotation-driven />
+
+	<!-- Forwards requests to the "/" resource to the "welcome" view -->
+	<mvc:view-controller path="/" view-name="welcome"/>
+
+	<!-- Configures Handler Interceptors -->	
+	<mvc:interceptors>
+		<!-- Changes the locale when a 'locale' request parameter is sent; e.g. /?locale=de -->
+		<bean class="org.springframework.web.servlet.i18n.LocaleChangeInterceptor" />
+	</mvc:interceptors>
+
+	<!-- Handles HTTP GET requests for /resources/** by efficiently serving up static resources in the ${webappRoot}/resources/ directory -->
+    <!--  
+	<mvc:resources mapping="/resources/**" location="/resources/" />
+    -->
+
+	<!-- Saves a locale change using a cookie -->
+	<bean id="localeResolver" class="org.springframework.web.servlet.i18n.CookieLocaleResolver" />
+
+	<!-- Application Message Bundle -->
+	<bean id="messageSource" class="org.springframework.context.support.ReloadableResourceBundleMessageSource">
+		<property name="basename" value="/WEB-INF/messages/messages" />
+		<property name="cacheSeconds" value="0" />
+	</bean>
+
+	<!-- Resolves view names to protected .jsp resources within the /WEB-INF/views directory -->
+	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+		<property name="prefix" value="/WEB-INF/views/"/>
+		<property name="suffix" value=".jsp"/>
+	</bean>
+    
+    <!-- Message conversion bean for the purpose of testing -->
+    <bean id="MessageServiceBean" class="sample.servlet.MessageServiceImpl"/>
+
+</beans>
diff --git a/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/views/account/createForm.jsp b/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/views/account/createForm.jsp
new file mode 100644
index 0000000000..94863c7e1d
--- /dev/null
+++ b/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/views/account/createForm.jsp
@@ -0,0 +1,68 @@
+<!--
+ * 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.    
+-->
+<%@page contentType="text/html;charset=UTF-8"%>
+<%@page pageEncoding="UTF-8"%>
+<%@ page session="false" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+
+<html>
+<head>
+	<META http-equiv="Content-Type" content="text/html;charset=UTF-8">
+	<title>Create Account</title>
+</head>	
+<body>
+<div class="container">
+	<h1>
+		Create Account
+	</h1>
+	<div class="span-12 last">	
+		<form:form modelAttribute="account" action="account" method="post">
+		  	<fieldset>		
+				<legend>Account Fields</legend>
+				<p>
+					<form:label	for="name" path="name" cssErrorClass="error">Name</form:label><br/>
+					<form:input path="name" /> <form:errors path="name" />			
+				</p>
+				<p>	
+					<form:label for="balance" path="balance" cssErrorClass="error">Balance</form:label><br/>
+					<form:input path="balance" /> <form:errors path="balance" />
+				</p>
+				<p>
+					<form:label for="equityAllocation" path="equityAllocation" cssErrorClass="error">Equity Allocation</form:label><br/>
+					<form:input path="equityAllocation" /> <form:errors path="equityAllocation" />
+				</p>
+				<p>	
+					<form:label for="renewalDate" path="renewalDate" cssErrorClass="error">Renewal Date</form:label><br/>
+					<form:input path="renewalDate" /> <form:errors path="renewalDate" />
+				</p>
+				<p>	
+					<input type="submit" />
+				</p>
+			</fieldset>
+		</form:form>
+	</div>
+	<hr>	
+	<ul>
+		<li> <a href="?locale=en_us">us</a> </li>
+	</ul>	
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/views/account/view.jsp b/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/views/account/view.jsp
new file mode 100644
index 0000000000..e913199aaf
--- /dev/null
+++ b/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/views/account/view.jsp
@@ -0,0 +1,65 @@
+<!--
+ * 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.    
+-->
+<%@page contentType="text/html;charset=UTF-8"%>
+<%@page pageEncoding="UTF-8"%>
+<%@ page session="false" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+
+<html>
+<head>
+	<META http-equiv="Content-Type" content="text/html;charset=UTF-8">
+	<title>@Controller Example</title>
+</head>	
+<body>
+<div class="container">
+	<h1>
+		View Account
+	</h1>
+	<div class="span-12 last">	
+		<form:form modelAttribute="account" action="${account.id}" method="post">
+		  	<fieldset>		
+				<legend>Account Fields</legend>
+				<p>
+					<form:label	for="name" path="name">Name</form:label><br/>
+					<form:input path="name" readonly="true"/>		
+				</p>
+				<p>	
+					<form:label for="balance" path="balance">Balance</form:label><br/>
+					<form:input path="balance" readonly="true"/>
+				</p>
+				<p>
+					<form:label for="equityAllocation" path="equityAllocation">Equity Allocation</form:label><br/>
+					<form:input path="equityAllocation" readonly="true"/>
+				</p>
+				<p>	
+					<form:label for="renewalDate" path="renewalDate">Renewal Date</form:label><br/>
+					<form:input path="renewalDate" readonly="true"/>
+				</p>
+			</fieldset>
+		</form:form>
+	</div>
+	<hr>	
+	<ul>
+		<li> <a href="?locale=en_us">us</a></li>
+	</ul>	
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/views/welcome.jsp b/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/views/welcome.jsp
new file mode 100644
index 0000000000..7d8f41060f
--- /dev/null
+++ b/sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/views/welcome.jsp
@@ -0,0 +1,46 @@
+<!--
+ * 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.    
+-->
+<%@page contentType="text/html;charset=UTF-8"%>
+<%@page pageEncoding="UTF-8"%>
+<%@ page session="false" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<html>
+<head>
+	<META http-equiv="Content-Type" content="text/html;charset=UTF-8">
+	<title><fmt:message key="welcome.title"/></title>
+</head>
+<body>
+<div class="container">  
+	<h1>
+		<fmt:message key="welcome.title"/>
+	</h1>
+	<p>
+		Locale = ${pageContext.response.locale}
+	</p>
+	<hr>	
+	<ul>
+		<li> <a href="?locale=en_us">us</a> </li>
+	</ul>
+	<ul>
+		<li><a href="account">@Controller Example</a></li>
+	</ul>
+</div>
+</body>
+</html>
\ No newline at end of file