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/03/03 16:33:29 UTC

svn commit: r382868 - in /incubator/tuscany/java/samples/helloworld/helloworldws: pom.xml src/main/webapp/WEB-INF/web.xml

Author: rineholt
Date: Fri Mar  3 07:33:29 2006
New Revision: 382868

URL: http://svn.apache.org/viewcvs?rev=382868&view=rev
Log:
These are changes to build for the shallow integration scenario
all SCA and dependent jars are in the webapp.  

This also enables for axis 2.0 binding 


Modified:
    incubator/tuscany/java/samples/helloworld/helloworldws/pom.xml
    incubator/tuscany/java/samples/helloworld/helloworldws/src/main/webapp/WEB-INF/web.xml

Modified: incubator/tuscany/java/samples/helloworld/helloworldws/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/helloworld/helloworldws/pom.xml?rev=382868&r1=382867&r2=382868&view=diff
==============================================================================
--- incubator/tuscany/java/samples/helloworld/helloworldws/pom.xml (original)
+++ incubator/tuscany/java/samples/helloworld/helloworldws/pom.xml Fri Mar  3 07:33:29 2006
@@ -29,6 +29,7 @@
 
 <build>
 
+     <!--
      <plugins>
 
        <plugin>
@@ -45,26 +46,42 @@
        </plugin>
 
      </plugins>
+     -->
 
    </build>
     <dependencies>
+
+    <name>SCA API</name>
+        <dependency>
+            <groupId>org.osoa</groupId>
+            <artifactId>sca-api</artifactId>
+            <version>${pom.version}</version>
+            <scope>compile</scope> 
+        </dependency>
+
         <dependency>
             <groupId>org.apache.tuscany</groupId>
             <artifactId>tuscany-core</artifactId>
             <version>${pom.version}</version>
-            <scope>provided</scope> <!-- use provided so tuscany infrastructue is not inc. in the war-->
+            <scope>runtime</scope> <!-- use provided so tuscany infrastructue is not inc. in the war-->
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany</groupId>
             <artifactId>tuscany-container-java</artifactId>
             <version>${pom.version}</version>
-            <scope>provided</scope> <!-- use provided so tuscany infrastructue is not inc. in the war-->
+            <scope>runtime</scope> <!-- use provided so tuscany infrastructue is not inc. in the war-->
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany</groupId>
+            <artifactId>tuscany-binding-axis2</artifactId>
+            <version>${pom.version}</version>
+            <scope>runtime</scope> <!-- use provided so tuscany infrastructue is not inc. in the war-->
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany</groupId>
-            <artifactId>tuscany-binding-axis</artifactId>
+            <artifactId>tuscany-tomcat</artifactId>
             <version>${pom.version}</version>
-            <scope>provided</scope> <!-- use provided so tuscany infrastructue is not inc. in the war-->
+            <scope>runtime</scope>
         </dependency>
     </dependencies>
 </project>

Modified: incubator/tuscany/java/samples/helloworld/helloworldws/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/helloworld/helloworldws/src/main/webapp/WEB-INF/web.xml?rev=382868&r1=382867&r2=382868&view=diff
==============================================================================
--- incubator/tuscany/java/samples/helloworld/helloworldws/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/tuscany/java/samples/helloworld/helloworldws/src/main/webapp/WEB-INF/web.xml Fri Mar  3 07:33:29 2006
@@ -14,17 +14,25 @@
   See the License for the specific language governing permissions and
   limitations under the License.
  -->
+
 <!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 sample HelloWorld WS</display-name>
+    <context-param>
+          <param-name>org.apache.tuscany.core.webapp.ModuleComponentName</param-name>
+          <param-value>testStandalone</param-value>
+     </context-param>
+    <listener>
+          <listener-class>org.apache.tuscany.core.webapp.TuscanyServletListener</listener-class>
+    </listener>
 
 	<!--  TODO register this servlet automatically so that the app developer doesn't have to add it to his web.xml -->
 
     <servlet>
         <servlet-name>WebServiceEntryPointServlet</servlet-name>
-        <servlet-class>org.apache.tuscany.binding.axis.handler.WebServiceEntryPointServlet</servlet-class>
+        <!-- for axis 1.0 servlet-class>org.apache.tuscany.binding.axis.handler.WebServiceEntryPointServlet</servlet-class -->
+        <servlet-class>org.apache.tuscany.binding.axis2.handler.WebServiceEntryPointServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>WebServiceEntryPointServlet</servlet-name>