Author: antelder
Date: Thu Jun 24 10:36:45 2010
New Revision: 957499
URL: http://svn.apache.org/viewvc?rev=957499&view=rev
Log:
TUSCANY-3517: Apply latest updates to callback sample in
servlet-callback-0.0.2.zip
Added:
tuscany/sca-java-2.x/contrib/samples/servlet-callback/src/main/java/sample/ServletCallback.java
(with props)
Modified:
tuscany/sca-java-2.x/contrib/samples/servlet-callback/src/main/java/sample/HelloworldService.java
tuscany/sca-java-2.x/contrib/samples/servlet-callback/src/main/java/sample/HelloworldServiceImpl.java
tuscany/sca-java-2.x/contrib/samples/servlet-callback/src/main/java/sample/HelloworldServlet.java
tuscany/sca-java-2.x/contrib/samples/servlet-callback/src/main/webapp/WEB-INF/web.composite
Modified:
tuscany/sca-java-2.x/contrib/samples/servlet-callback/src/main/java/sample/HelloworldService.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/contrib/samples/servlet-callback/src/main/java/sample/HelloworldService.java?rev=957499&r1=957498&r2=957499&view=diff
==============================================================================
---
tuscany/sca-java-2.x/contrib/samples/servlet-callback/src/main/java/sample/HelloworldService.java
(original)
+++
tuscany/sca-java-2.x/contrib/samples/servlet-callback/src/main/java/sample/HelloworldService.java
Thu Jun 24 10:36:45 2010
@@ -22,7 +22,7 @@ import org.oasisopen.sca.annotation.Call
import org.oasisopen.sca.annotation.Remotable;
@Remotable
-...@callback(CallbackServlet.class)
+...@callback(ServletCallback.class)
public interface HelloworldService {
void sayHello(String name);
Modified:
tuscany/sca-java-2.x/contrib/samples/servlet-callback/src/main/java/sample/HelloworldServiceImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/contrib/samples/servlet-callback/src/main/java/sample/HelloworldServiceImpl.java?rev=957499&r1=957498&r2=957499&view=diff
==============================================================================
---
tuscany/sca-java-2.x/contrib/samples/servlet-callback/src/main/java/sample/HelloworldServiceImpl.java
(original)
+++
tuscany/sca-java-2.x/contrib/samples/servlet-callback/src/main/java/sample/HelloworldServiceImpl.java
Thu Jun 24 10:36:45 2010
@@ -24,10 +24,14 @@ import org.oasisopen.sca.annotation.Serv
@Service(HelloworldService.class)
public class HelloworldServiceImpl implements HelloworldService {
+ private ServletCallback callback;
+
@Callback
- private CallbackServlet callback;
-
- public void sayHello(String name) {
+ public void setCallback(ServletCallback callback) {
+ this.callback = callback;
+ }
+
+ public void sayHello(String name) {
callback.sendGreeting("Hello " + name + "!");
}
Modified:
tuscany/sca-java-2.x/contrib/samples/servlet-callback/src/main/java/sample/HelloworldServlet.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/contrib/samples/servlet-callback/src/main/java/sample/HelloworldServlet.java?rev=957499&r1=957498&r2=957499&view=diff
==============================================================================
---
tuscany/sca-java-2.x/contrib/samples/servlet-callback/src/main/java/sample/HelloworldServlet.java
(original)
+++
tuscany/sca-java-2.x/contrib/samples/servlet-callback/src/main/java/sample/HelloworldServlet.java
Thu Jun 24 10:36:45 2010
@@ -31,8 +31,8 @@ import org.oasisopen.sca.ComponentContex
import org.oasisopen.sca.annotation.Reference;
import org.oasisopen.sca.annotation.Service;
-...@service(CallbackServlet.class)
-public class HelloworldServlet extends HttpServlet implements CallbackServlet {
+...@service(ServletCallback.class)
+public class HelloworldServlet extends HttpServlet implements ServletCallback {
private static final long serialVersionUID = 1L;
private HttpServletResponse response;
Added:
tuscany/sca-java-2.x/contrib/samples/servlet-callback/src/main/java/sample/ServletCallback.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/contrib/samples/servlet-callback/src/main/java/sample/ServletCallback.java?rev=957499&view=auto
==============================================================================
---
tuscany/sca-java-2.x/contrib/samples/servlet-callback/src/main/java/sample/ServletCallback.java
(added)
+++
tuscany/sca-java-2.x/contrib/samples/servlet-callback/src/main/java/sample/ServletCallback.java
Thu Jun 24 10:36:45 2010
@@ -0,0 +1,28 @@
+/*
+ * 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;
+
+import org.oasisopen.sca.annotation.Remotable;
+
+...@remotable
+public interface ServletCallback {
+
+ void sendGreeting(String greeting);
+
+}
Propchange:
tuscany/sca-java-2.x/contrib/samples/servlet-callback/src/main/java/sample/ServletCallback.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/sca-java-2.x/contrib/samples/servlet-callback/src/main/java/sample/ServletCallback.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
tuscany/sca-java-2.x/contrib/samples/servlet-callback/src/main/webapp/WEB-INF/web.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/contrib/samples/servlet-callback/src/main/webapp/WEB-INF/web.composite?rev=957499&r1=957498&r2=957499&view=diff
==============================================================================
---
tuscany/sca-java-2.x/contrib/samples/servlet-callback/src/main/webapp/WEB-INF/web.composite
(original)
+++
tuscany/sca-java-2.x/contrib/samples/servlet-callback/src/main/webapp/WEB-INF/web.composite
Thu Jun 24 10:36:45 2010
@@ -25,7 +25,7 @@
<component name="foo">
<implementation.web web-uri=""/>
<reference name="service" target="HelloworldComponent">
- <java.interface interface="HelloworldService"
callbackInterface="CallbackServlet"/>
+ <interface.java interface="sample.HelloworldService"
callbackInterface="sample.ServletCallback"/>
</reference>
</component>
