Author: lresende
Date: Tue Jan 22 13:33:55 2008
New Revision: 614331
URL: http://svn.apache.org/viewvc?rev=614331&view=rev
Log:
TUSCANY-2006 - A strawman of a helloworld-ws-secure-webapp
Added:
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure-webapp/
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure-webapp/README
- copied unchanged from r613195,
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/README
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure-webapp/build.xml
- copied unchanged from r613195,
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/build.xml
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure-webapp/helloworld-ws-service-secure.png
- copied unchanged from r613195,
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure-webapp/helloworld-ws-service-secure.svg
- copied unchanged from r613195,
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure-webapp/pom.xml
- copied, changed from r613195,
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/pom.xml
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure-webapp/src/
- copied from r613195,
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/src/
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure-webapp/src/main/webapp/
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure-webapp/src/main/webapp/META-INF/
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
- copied, changed from r613195,
incubator/tuscany/java/sca/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure-webapp/src/main/webapp/WEB-INF/
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
- copied, changed from r613195,
incubator/tuscany/java/sca/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure-webapp/src/main/webapp/WEB-INF/web.xml
- copied, changed from r613195,
incubator/tuscany/java/sca/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml
Copied:
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure-webapp/pom.xml
(from r613195,
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/pom.xml)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-ws-service-secure-webapp/pom.xml?p2=incubator/tuscany/java/sca/samples/helloworld-ws-service-secure-webapp/pom.xml&p1=incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/pom.xml&r1=613195&r2=614331&rev=614331&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/pom.xml
(original)
+++
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure-webapp/pom.xml
Tue Jan 22 13:33:55 2008
@@ -25,8 +25,9 @@
<version>1.2-incubating-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>sample-helloworld-ws-service-secure</artifactId>
- <name>Apache Tuscany SCA HelloWorld Secure Web Service Sample</name>
+ <artifactId>sample-helloworld-ws-service-secure-webapp</artifactId>
+ <packaging>war</packaging>
+ <name>Apache Tuscany SCA HelloWorld Secure Web Service Sample Webapp</name>
<repositories>
<repository>
@@ -38,15 +39,9 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-host-webapp</artifactId>
<version>1.2-incubating-SNAPSHOT</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.ws.security</groupId>
- <artifactId>wss4j</artifactId>
- <version>1.5.3</version>
- </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
@@ -61,14 +56,28 @@
<version>1.2-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.ws.security</groupId>
+ <artifactId>wss4j</artifactId>
+ <version>1.5.3</version>
+ </dependency>
+
+ <!-- marking dependency as provided to exclude from war file -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-tomcat</artifactId>
<version>1.2-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Copied:
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
(from r613195,
incubator/tuscany/java/sca/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-ws-service-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml?p2=incubator/tuscany/java/sca/samples/helloworld-ws-service-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml&p1=incubator/tuscany/java/sca/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml&r1=613195&r2=614331&rev=614331&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
(original)
+++
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
Tue Jan 22 13:33:55 2008
@@ -18,7 +18,7 @@
* under the License.
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0";
- targetNamespace="http://sample";
- xmlns:sample="http://sample";>
- <deployable composite="sample:Calculator"/>
+ targetNamespace="http://helloworld";
+ xmlns:helloworld="http://helloworld";>
+ <deployable composite="helloworld:helloworldws"/>
</contribution>
Copied:
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
(from r613195,
incubator/tuscany/java/sca/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-ws-service-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml?p2=incubator/tuscany/java/sca/samples/helloworld-ws-service-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml&p1=incubator/tuscany/java/sca/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml&r1=613195&r2=614331&rev=614331&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
(original)
+++
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
Tue Jan 22 13:33:55 2008
@@ -23,7 +23,7 @@
<d:environment>
<d:moduleId>
<d:groupId>org.apache.tuscany.sca</d:groupId>
- <d:artifactId>sample-helloworld-ws-service-webapp</d:artifactId>
+
<d:artifactId>sample-helloworld-ws-service-secure-webapp</d:artifactId>
<d:version>1.2-incubating-SNAPSHOT</d:version>
<d:type>war</d:type>
</d:moduleId>
Copied:
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure-webapp/src/main/webapp/WEB-INF/web.xml
(from r613195,
incubator/tuscany/java/sca/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-ws-service-secure-webapp/src/main/webapp/WEB-INF/web.xml?p2=incubator/tuscany/java/sca/samples/helloworld-ws-service-secure-webapp/src/main/webapp/WEB-INF/web.xml&p1=incubator/tuscany/java/sca/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml&r1=613195&r2=614331&rev=614331&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml
(original)
+++
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure-webapp/src/main/webapp/WEB-INF/web.xml
Tue Jan 22 13:33:55 2008
@@ -22,7 +22,7 @@
Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<web-app>
- <display-name>Apache Tuscany HelloWorld Web Service Sample</display-name>
+ <display-name>Apache Tuscany HelloWorld Secure Web Service Sample
Webapp</display-name>
<listener>
<listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class>
@@ -39,6 +39,7 @@
</servlet-mapping>
<welcome-file-list id="WelcomeFileList">
+ <welcome-file>helloworld.jsp</welcome-file>
<welcome-file>/SCA/HelloWorldComponent/HelloWorldService?wsdl</welcome-file>
</welcome-file-list>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
