summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'sca-java-2.x/contrib')
-rw-r--r--sca-java-2.x/contrib/samples/servlet-callback/README8
-rw-r--r--sca-java-2.x/contrib/samples/servlet-callback/pom.xml46
-rw-r--r--sca-java-2.x/contrib/samples/servlet-callback/src/main/java/sample/CallbackServlet.java18
-rw-r--r--sca-java-2.x/contrib/samples/servlet-callback/src/main/webapp/META-INF/MANIFEST.MF3
4 files changed, 27 insertions, 48 deletions
diff --git a/sca-java-2.x/contrib/samples/servlet-callback/README b/sca-java-2.x/contrib/samples/servlet-callback/README
index 2e9a1203e0..d2abdf1b44 100644
--- a/sca-java-2.x/contrib/samples/servlet-callback/README
+++ b/sca-java-2.x/contrib/samples/servlet-callback/README
@@ -1,7 +1 @@
-The README in the <distribution-unpack-dir>/samples directory provides
-general instructions about building and running samples. (where
-distribution-unpack-dir is the directory in which you unpacked the tuscany
-binary distribution archive). Take a look there first (noting at you read it that this sample
-is not a new style sample).
-
-TODO - finish \ No newline at end of file
+This sample demonstrates that the Tuscany runtime does not support callbacks for implementation.web and how it reacts in such a situation. \ No newline at end of file
diff --git a/sca-java-2.x/contrib/samples/servlet-callback/pom.xml b/sca-java-2.x/contrib/samples/servlet-callback/pom.xml
index d1fd22ac35..9eb12a8a80 100644
--- a/sca-java-2.x/contrib/samples/servlet-callback/pom.xml
+++ b/sca-java-2.x/contrib/samples/servlet-callback/pom.xml
@@ -26,12 +26,13 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>sample-helloworld-servlet-webapp</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>sample-servlet-callback-webapp</artifactId>
+ <version>1.0</version>
<packaging>war</packaging>
- <name>Apache Tuscany SCA Sample Helloworld Servlet</name>
+ <name>servlet-callback</name>
<dependencies>
-
<dependency>
<groupId>org.apache.tuscany.sca.shades</groupId>
<artifactId>tuscany-base-nodep</artifactId>
@@ -62,44 +63,7 @@
</dependencies>
<build>
- <finalName>helloworld-servlet</finalName>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.18</version>
- <configuration>
- <contextPath>helloworld-servlet</contextPath>
- <stopKey>foo</stopKey>
- <stopPort>9999</stopPort>
- </configuration>
- <executions>
- <execution>
- <id>start-jetty</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <scanIntervalSeconds>0</scanIntervalSeconds>
- <daemon>true</daemon>
- <connectors>
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
- <port>8085</port>
- </connector>
- </connectors>
- </configuration>
- </execution>
- <execution>
- <id>stop-jetty</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>stop</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ <finalName>servlet-callback</finalName>
</build>
</project>
diff --git a/sca-java-2.x/contrib/samples/servlet-callback/src/main/java/sample/CallbackServlet.java b/sca-java-2.x/contrib/samples/servlet-callback/src/main/java/sample/CallbackServlet.java
index 9a17a41172..fb08f65f4e 100644
--- a/sca-java-2.x/contrib/samples/servlet-callback/src/main/java/sample/CallbackServlet.java
+++ b/sca-java-2.x/contrib/samples/servlet-callback/src/main/java/sample/CallbackServlet.java
@@ -1,3 +1,21 @@
+/*
+ * 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;
diff --git a/sca-java-2.x/contrib/samples/servlet-callback/src/main/webapp/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/samples/servlet-callback/src/main/webapp/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..5e9495128c
--- /dev/null
+++ b/sca-java-2.x/contrib/samples/servlet-callback/src/main/webapp/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+