tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From antel...@apache.org
Subject svn commit: r501055 - in /incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsOM: ./ pom.xml src/main/java/helloworldOM/HelloWorldService.java src/main/webapp/META-INF/ src/main/webapp/WEB-INF/default.scdl src/main/webapp/WEB-INF/web.xml
Date Mon, 29 Jan 2007 14:02:21 GMT
Author: antelder
Date: Mon Jan 29 06:02:20 2007
New Revision: 501055

URL: http://svn.apache.org/viewvc?view=rev&rev=501055
Log:
Get WS OM service running (doesn't work yet due to TUSCANY-1072)

Added:
    incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsOM/src/main/webapp/WEB-INF/default.scdl
      - copied, changed from r501029, incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsOM/src/main/webapp/META-INF/sca/default.scdl
Removed:
    incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsOM/src/main/webapp/META-INF/
Modified:
    incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsOM/   (props changed)
    incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsOM/pom.xml
    incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsOM/src/main/java/helloworldOM/HelloWorldService.java
    incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsOM/src/main/webapp/WEB-INF/web.xml

Propchange: incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsOM/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jan 29 06:02:20 2007
@@ -0,0 +1,14 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+

Modified: incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsOM/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsOM/pom.xml?view=diff&rev=501055&r1=501054&r2=501055
==============================================================================
--- incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsOM/pom.xml (original)
+++ incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsOM/pom.xml Mon Jan 29
06:02:20 2007
@@ -19,68 +19,90 @@
 -->
 <project>
     <parent>
-        <groupId>org.apache.tuscany.samples.sca</groupId>
+        <groupId>org.apache.tuscany.sca.extensions.axis2.samples</groupId>
         <artifactId>parent</artifactId>
         <version>1.0-incubator-SNAPSHOT</version>
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>sample-helloworldwsOM</artifactId>
     <packaging>war</packaging>
     <name>Tuscany HelloWorld Web Service Sample OM</name>
     <description>A sample HelloWorld Web Service OM.</description>
 
-    <properties>
-        <ws.type>axis2</ws.type>
-    </properties>
-
     <dependencies>
+
+        <!-- SCA API dependencies -->
         <dependency>
             <groupId>org.osoa</groupId>
             <artifactId>sca-api-r0.95</artifactId>
-            <scope>compile</scope>
         </dependency>
+        
+        <!-- Tuscany API dependencies -->
         <dependency>
             <groupId>org.apache.tuscany.sca.kernel</groupId>
-            <artifactId>core</artifactId>
-            <version>${pom.version}</version>
-            <scope>runtime</scope> <!-- runtime is need for webapp integration
to include jar -->
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca.services.bindings</groupId>
-            <artifactId>axis2</artifactId>
-            <version>${pom.version}</version>
-            <scope>runtime</scope> <!-- runtime is need for webapp integration
to include jar -->
+            <artifactId>tuscany-api</artifactId>
         </dependency>
+
+        <!-- runtime is need for webapp integration to include jar -->
         <dependency>
             <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
             <artifactId>webapp-api</artifactId>
-            <version>${pom.version}</version>
-            <scope>runtime</scope> <!-- runtime is need for webapp integration
to include jar -->
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.ws.commons.axiom</groupId>
+            <artifactId>axiom-api</artifactId>
+        </dependency>
+
         <dependency>
-          <groupId>ws-commons</groupId>
-          <artifactId>axiom-api</artifactId>
-          <version>SNAPSHOT</version>
-            <scope>compile</scope> 
+            <groupId>org.apache.ws.commons.axiom</groupId>
+            <artifactId>axiom-impl</artifactId>
         </dependency>
+
         <dependency>
-          <groupId>ws-commons</groupId>
-          <artifactId>axiom-impl</artifactId>
-          <version>SNAPSHOT</version>
-          <scope>runtime</scope>
+            <groupId>woodstox</groupId>
+            <artifactId>wstx-asl</artifactId>
         </dependency>
+
+        <!-- Unit testing -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>3.8.1</version>
-            <scope>test</scope>
         </dependency>
         
     </dependencies>
+
+    <build>
+        <defaultGoal>install</defaultGoal>
+        <finalName>sample-helloworldwsOM</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
+                <artifactId>tuscany-war-plugin</artifactId>
+                <version>${scaKernelVersion}</version>
+                <executions>
+                    <execution>
+                        <id>tuscany-war</id>
+                        <goals>
+                            <goal>tuscany-war</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <!-- Set to true to embed external jars for extensions in the WAR
-->
+                    <!-- Set to false to leave external jars for extensions to be resolved
from maven repository -->
+                    <loadExtensionDependencies>true</loadExtensionDependencies>
+                    <extensions>
+                        <dependency>
+                            <groupId>org.apache.tuscany.sca.extensions.axis2</groupId>
+                            <artifactId>tuscany-axis2</artifactId>
+                            <version>${extensionVersion}</version>
+                        </dependency>
+                    </extensions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

Modified: incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsOM/src/main/java/helloworldOM/HelloWorldService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsOM/src/main/java/helloworldOM/HelloWorldService.java?view=diff&rev=501055&r1=501054&r2=501055
==============================================================================
--- incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsOM/src/main/java/helloworldOM/HelloWorldService.java
(original)
+++ incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsOM/src/main/java/helloworldOM/HelloWorldService.java
Mon Jan 29 06:02:20 2007
@@ -19,10 +19,12 @@
 package helloworldOM;
 
 import org.apache.axiom.om.OMElement;
+import org.osoa.sca.annotations.Remotable;
 
 /**
  * This is the business interface of the HelloWorld greetings service.
  */
+@Remotable
 public interface HelloWorldService {
 
     public OMElement getGreetings(OMElement name);

Copied: incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsOM/src/main/webapp/WEB-INF/default.scdl
(from r501029, incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsOM/src/main/webapp/META-INF/sca/default.scdl)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsOM/src/main/webapp/WEB-INF/default.scdl?view=diff&rev=501055&p1=incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsOM/src/main/webapp/META-INF/sca/default.scdl&r1=501029&p2=incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsOM/src/main/webapp/WEB-INF/default.scdl&r2=501055
==============================================================================
--- incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsOM/src/main/webapp/META-INF/sca/default.scdl
(original)
+++ incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsOM/src/main/webapp/WEB-INF/default.scdl
Mon Jan 29 06:02:20 2007
@@ -19,18 +19,10 @@
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="helloworldws">
 
-    <service name="HelloWorldWebService"  target="http:///foo">
+    <service name="HelloWorldWebService">
         <!-- interface.wsdl interface="http://helloworldOM#wsdl.interface(HelloWorld)"/
-->
         <interface.java interface="helloworldOM.HelloWorldService"/>
-
-
-<!--FIXME the location attribute is a really bad hack here!  does not follow to spec at
all 
--->
-      <binding.ws endpoint="http://helloworldOM#wsdl.endpoint(HelloWorldService/HelloWorldSoapPort)"
-          conformanceURIs="http://ws-i.org/profiles/basic/1.1"
-          location="wsdl/helloworldOM.wsdl"
-         />
-
+        <binding.ws endpoint="http://helloworldOM#wsdl.endpoint(HelloWorldService/HelloWorldSoapPort)"
location="wsdl/helloworldOM.wsdl" />
         <reference>HelloWorldServiceComponent</reference>
     </service>
 

Modified: incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsOM/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsOM/src/main/webapp/WEB-INF/web.xml?view=diff&rev=501055&r1=501054&r2=501055
==============================================================================
--- incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsOM/src/main/webapp/WEB-INF/web.xml
(original)
+++ incubator/tuscany/java/sca/extensions/axis2/samples/helloworldwsOM/src/main/webapp/WEB-INF/web.xml
Mon Jan 29 06:02:20 2007
@@ -24,17 +24,12 @@
   <display-name>Tuscany HelloWorld Web Service Sample</display-name>
 
   <context-param>
-     <param-name>systemScdlPath</param-name>
-     <param-value>/META-INF/sca/webapp.system.scdl</param-value>
-  </context-param>
-
-  <context-param>
-     <param-name>applicationScdlPath</param-name>
-     <param-value>/META-INF/sca/default.scdl</param-value>
+     <param-name>tuscany.online</param-name>
+     <param-value>false</param-value>
   </context-param>
 
   <listener>
-     <listener-class>org.apache.tuscany.core.launcher.ServletLauncherListener</listener-class>
+     <listener-class>org.apache.tuscany.runtime.webapp.TuscanyContextListener</listener-class>
   </listener>
 
   <servlet>
@@ -45,7 +40,7 @@
   
   <servlet-mapping>
      <servlet-name>TuscanyServlet</servlet-name>
-     <url-pattern>/services/*</url-pattern>
+     <url-pattern>/*</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


Mime
View raw message