From 8ef8cae3deb705e67aa0f10886ea4a15d25bfadf Mon Sep 17 00:00:00 2001 From: rfeng Date: Mon, 21 Mar 2011 21:39:36 +0000 Subject: Adding missing files git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1083972 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/java/sample/servlet/GreetingService.java | 31 +++++++ .../java/sample/servlet/GreetingServiceImpl.java | 63 ++++++++++++++ .../java/sample/servlet/MessageServiceImpl.java | 29 +++++++ .../sample/spring/mvc/basic/account/Account.java | 95 ++++++++++++++++++++++ .../mvc/basic/account/AccountController.java | 62 ++++++++++++++ .../basic/account/ResourceNotFoundException.java | 37 +++++++++ .../webapp/WEB-INF/messages/messages.properties | 20 +++++ .../src/main/webapp/WEB-INF/sca/sca-context.xml | 41 ++++++++++ .../src/main/webapp/WEB-INF/sca/servlet.composite | 31 +++++++ .../WEB-INF/spring/appServlet/servlet-context.xml | 66 +++++++++++++++ .../webapp/WEB-INF/views/account/createForm.jsp | 68 ++++++++++++++++ .../src/main/webapp/WEB-INF/views/account/view.jsp | 65 +++++++++++++++ .../src/main/webapp/WEB-INF/views/welcome.jsp | 46 +++++++++++ 13 files changed, 654 insertions(+) create mode 100644 sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/java/sample/servlet/GreetingService.java create mode 100644 sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/java/sample/servlet/GreetingServiceImpl.java create mode 100644 sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/java/sample/servlet/MessageServiceImpl.java create mode 100644 sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/java/sample/spring/mvc/basic/account/Account.java create mode 100644 sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/java/sample/spring/mvc/basic/account/AccountController.java create mode 100644 sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/java/sample/spring/mvc/basic/account/ResourceNotFoundException.java create mode 100644 sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/messages/messages.properties create mode 100644 sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/sca/sca-context.xml create mode 100644 sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/sca/servlet.composite create mode 100644 sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml create mode 100644 sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/views/account/createForm.jsp create mode 100644 sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/views/account/view.jsp create mode 100644 sandbox/rfeng/sca-java-2.x/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/views/welcome.jsp (limited to 'sandbox') 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 accounts = new ConcurrentHashMap(); + + @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 @@ + + + + + + + + + + + + + + + + + + + + \ 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 @@ + + + + + + + + + + + + + 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ + +<%@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" %> + + + + + Create Account + + +
+

+ Create Account +

+
+ +
+ Account Fields +

+ Name
+ +

+

+ Balance
+ +

+

+ Equity Allocation
+ +

+

+ Renewal Date
+ +

+

+ +

+
+ +
+
+ +
+ + \ 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 @@ + +<%@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" %> + + + + + @Controller Example + + +
+

+ View Account +

+
+ +
+ Account Fields +

+ Name
+ +

+

+ Balance
+ +

+

+ Equity Allocation
+ +

+

+ Renewal Date
+ +

+
+ +
+
+ +
+ + \ 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 @@ + +<%@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" %> + + + + <fmt:message key="welcome.title"/> + + +
+

+ +

+

+ Locale = ${pageContext.response.locale} +

+
+ + +
+ + \ No newline at end of file -- cgit v1.2.3