You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ri...@apache.org on 2006/08/02 15:09:28 UTC
svn commit: r427971 - in /incubator/tuscany/java: distribution/sca/web/
distribution/sca/web/src/main/assembly/ samples/sca/eagerinit/
samples/sca/helloworldws/ samples/sca/helloworldws/src/
samples/sca/helloworldws/src/main/resources/ samples/sca/hell...
Author: rineholt
Date: Wed Aug 2 06:09:26 2006
New Revision: 427971
URL: http://svn.apache.org/viewvc?rev=427971&view=rev
Log:
TUSCANY-575
http://issues.apache.org/jira/browse/TUSCANY-575
Add axis binding to web distribution.
helloworldws testcase to bring up under tomcat.
move axis binding default scdl to right location.
*work in progress*
Added:
incubator/tuscany/java/samples/sca/helloworldws/
- copied from r424728, incubator/tuscany/branches/java-post-M1/samples/sca/helloworldws/
incubator/tuscany/java/samples/sca/helloworldws/.ruleset
- copied unchanged from r427968, incubator/tuscany/java/sca/core/.ruleset
incubator/tuscany/java/samples/sca/helloworldws/pom.xml
- copied, changed from r427968, incubator/tuscany/branches/java-post-M1/samples/sca/helloworldws/pom.xml
incubator/tuscany/java/samples/sca/helloworldws/readme.htm
- copied unchanged from r427968, incubator/tuscany/branches/java-post-M1/samples/sca/helloworldws/readme.htm
incubator/tuscany/java/samples/sca/helloworldws/setup.bat
incubator/tuscany/java/samples/sca/helloworldws/src/
- copied from r427968, incubator/tuscany/branches/java-post-M1/samples/sca/helloworldws/src/
incubator/tuscany/java/samples/sca/helloworldws/src/main/resources/META-INF/sca/
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/sca/
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/sca/default.scdl
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/resources/META-INF/
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/resources/META-INF/sca/
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/resources/META-INF/sca/default.scdl
- copied unchanged from r427803, incubator/tuscany/java/sca/bindings/binding.axis2/src/main/resources/default.scdl
Removed:
incubator/tuscany/java/samples/sca/helloworldws/build.xml
incubator/tuscany/java/samples/sca/helloworldws/src/main/resources/sca.module
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/resources/default.scdl
Modified:
incubator/tuscany/java/distribution/sca/web/pom.xml
incubator/tuscany/java/distribution/sca/web/src/main/assembly/servlet.xml
incubator/tuscany/java/samples/sca/eagerinit/run.bat
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/WEB-INF/web.xml
Modified: incubator/tuscany/java/distribution/sca/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/distribution/sca/web/pom.xml?rev=427971&r1=427970&r2=427971&view=diff
==============================================================================
--- incubator/tuscany/java/distribution/sca/web/pom.xml (original)
+++ incubator/tuscany/java/distribution/sca/web/pom.xml Wed Aug 2 06:09:26 2006
@@ -38,6 +38,11 @@
<artifactId>launcher</artifactId>
<version>${sca.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.bindings</groupId>
+ <artifactId>axis2</artifactId>
+ <version>${sca.version}</version>
+ </dependency>
</dependencies>
<pluginRepositories>
Modified: incubator/tuscany/java/distribution/sca/web/src/main/assembly/servlet.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/distribution/sca/web/src/main/assembly/servlet.xml?rev=427971&r1=427970&r2=427971&view=diff
==============================================================================
--- incubator/tuscany/java/distribution/sca/web/src/main/assembly/servlet.xml (original)
+++ incubator/tuscany/java/distribution/sca/web/src/main/assembly/servlet.xml Wed Aug 2 06:09:26 2006
@@ -40,6 +40,7 @@
<include>org.osoa:sca-api</include>
<include>org.apache.tuscany:launcher</include>
<include>org.apache.tuscany:core</include>
+ <include>org.apache.tuscany.bindings:axis2</include>
</includes>
<fileMode>644</fileMode>
</dependencySet>
Modified: incubator/tuscany/java/samples/sca/eagerinit/run.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/eagerinit/run.bat?rev=427971&r1=427970&r2=427971&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/eagerinit/run.bat (original)
+++ incubator/tuscany/java/samples/sca/eagerinit/run.bat Wed Aug 2 06:09:26 2006
@@ -1,6 +1,5 @@
echo off
-rem set java_debug_set =-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,address=3720,server=y,suspend=y
-
+rem set java_debug_set=-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,address=3720,server=y,suspend=y
mkdir target\standalone
pushd target\standalone
jar -xf "%USERPROFILE%\.m2\repository\org\apache\tuscany\standalone\1.0-SNAPSHOT\standalone-1.0-SNAPSHOT-bin.zip"
Copied: incubator/tuscany/java/samples/sca/helloworldws/pom.xml (from r427968, incubator/tuscany/branches/java-post-M1/samples/sca/helloworldws/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldws/pom.xml?p2=incubator/tuscany/java/samples/sca/helloworldws/pom.xml&p1=incubator/tuscany/branches/java-post-M1/samples/sca/helloworldws/pom.xml&r1=427968&r2=427971&rev=427971&view=diff
==============================================================================
--- incubator/tuscany/branches/java-post-M1/samples/sca/helloworldws/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/helloworldws/pom.xml Wed Aug 2 06:09:26 2006
@@ -18,14 +18,13 @@
<parent>
<groupId>org.apache.tuscany.samples.sca</groupId>
<artifactId>tuscany-samples-sca</artifactId>
- <version>incubating-M1</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>sample-helloworldws</artifactId>
<packaging>war</packaging>
<name>Tuscany HelloWorld Web Service Sample</name>
<description>A sample HelloWorld Web Service.</description>
- <version>incubating-M1</version>
<properties>
<ws.type>axis2</ws.type>
@@ -35,13 +34,13 @@
<dependency>
<groupId>org.apache.tuscany</groupId>
- <artifactId>tuscany-core</artifactId>
+ <artifactId>core</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.containers</groupId>
- <artifactId>tuscany-container-java</artifactId>
+ <groupId>org.apache.tuscany.bindings</groupId>
+ <artifactId>axis2</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
Added: incubator/tuscany/java/samples/sca/helloworldws/setup.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldws/setup.bat?rev=427971&view=auto
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldws/setup.bat (added)
+++ incubator/tuscany/java/samples/sca/helloworldws/setup.bat Wed Aug 2 06:09:26 2006
@@ -0,0 +1,13 @@
+@echo off
+pushd target
+jar -xf ..\apache-tomcat-5.5.17.zip
+popd
+copy target\sample-helloworldws-1.0-SNAPSHOT.war target\apache-tomcat-5.5.17\webapps
+rem pushd target\apache-tomcat-5.5.17\webapps
+rem md sample-helloworldws-1.0-SNAPSHOT
+rem cd sample-helloworldws-1.0-SNAPSHOT
+rem jar -xf ..\sample-helloworldws-1.0-SNAPSHOT.war
+pushd target\apache-tomcat-5.5.17\shared
+rem jar -xf "%USERPROFILE%\.m2\repository\org\apache\tuscany\web\1.0-SNAPSHOT\web-1.0-SNAPSHOT-bin.zip"
+jar -xf "%USERPROFILE%\.m2\repository\org\apache\tuscany\web\1.0-SNAPSHOT\web-1.0-SNAPSHOT-bin.zip"
+popd
Added: incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/sca/default.scdl?rev=427971&view=auto
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/sca/default.scdl (added)
+++ incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/sca/default.scdl Wed Aug 2 06:09:26 2006
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+
+ Licensed 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://www.osoa.org/xmlns/sca/1.0" name="helloworldws">
+
+ <service name="HelloWorldWebService">
+ <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"/>
+ <binding.ws port="http://helloworld#wsdl.endpoint(HelloWorldService/HelloWorldSoapPort)"/>
+ <reference>HelloWorldServiceComponent/HelloWorldService</reference>
+ </service>
+
+ <component name="HelloWorldServiceComponent">
+ <implementation.java class="helloworld.HelloWorldImpl"/>
+ </component>
+
+</composite>
Modified: incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/WEB-INF/web.xml?rev=427971&r1=427968&r2=427971&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/WEB-INF/web.xml Wed Aug 2 06:09:26 2006
@@ -18,6 +18,38 @@
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
- <display-name>Tuscany HelloWorld Web Service Sample</display-name>
+ <display-name>Tuscany HelloWorld Web Service Sample</display-name>
+
+ <context-param>
+ <param-name>applicationScdlPath</param-name>
+ <param-value>/META-INF/sca/default.scdl</param-value>
+ </context-param>
+ <listener>
+ <listener-class>org.apache.tuscany.core.launcher.ServletLauncherListener</listener-class>
+ org.apache.tuscany.binding.axis2
+ </listener>
+
+
+
+ <servlet>
+ <servlet-name>TuscanyAxisServlet</servlet-name>
+ <display-name>Tuscany Apache-Axis Servlet</display-name>
+ <servlet-class>org.apache.tuscany.binding.axis2.WebServiceBinding</servlet-class>
+ <!--<init-param>-->
+ <!--<param-name>axis2.xml.path</param-name>-->
+ <!--<param-value>/WEB-INF/conf/axis2.xml</param-value>-->
+ <!--<param-name>axis2.xml.url</param-name>-->
+ <!--<param-value>http://localhot/myrepo/axis2.xml</param-value>-->
+ <!--<param-name>axis2.repository.path</param-name>-->
+ <!--<param-value>/WEB-INF</param-value>-->
+ <!--<param-name>axis2.repository.url</param-name>-->
+ <!--<param-value>http://localhot/myrepo</param-value>-->
+ <!--</init-param>-->
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>TuscanyAxisServlet</servlet-name>
+ <url-pattern>/services/*</url-pattern>
+ </servlet-mapping>
</web-app>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org