Author: rfeng
Date: Wed Oct 25 16:19:17 2006
New Revision: 467807
URL: http://svn.apache.org/viewvc?view=rev&rev=467807
Log:
lean up creditws
Added:
incubator/tuscany/sandbox/rfeng/samples/creditws/src/main/webapp/WEB-INF/default.scdl
- copied unchanged from r465937,
incubator/tuscany/sandbox/rfeng/samples/creditws/src/main/webapp/META-INF/sca/default.scdl
Removed:
incubator/tuscany/sandbox/rfeng/samples/creditws/src/main/webapp/META-INF/sca/
incubator/tuscany/sandbox/rfeng/samples/creditws/src/main/webapp/META-INF/tuscany/binding.axis2.scdl
incubator/tuscany/sandbox/rfeng/samples/creditws/src/main/webapp/META-INF/tuscany/databinding.axiom.scdl
incubator/tuscany/sandbox/rfeng/samples/creditws/src/main/webapp/META-INF/tuscany/databinding.sdo.scdl
incubator/tuscany/sandbox/rfeng/samples/creditws/src/main/webapp/META-INF/tuscany/interface.wsdl.scdl
Modified:
incubator/tuscany/sandbox/rfeng/samples/creditws/pom.xml
incubator/tuscany/sandbox/rfeng/samples/creditws/src/main/webapp/META-INF/tuscany/webapp.scdl
incubator/tuscany/sandbox/rfeng/samples/creditws/src/main/webapp/WEB-INF/web.xml
Modified: incubator/tuscany/sandbox/rfeng/samples/creditws/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/samples/creditws/pom.xml?view=diff&rev=467807&r1=467806&r2=467807
==============================================================================
--- incubator/tuscany/sandbox/rfeng/samples/creditws/pom.xml (original)
+++ incubator/tuscany/sandbox/rfeng/samples/creditws/pom.xml Wed Oct 25
16:19:17 2006
@@ -19,88 +19,47 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.samples.sca</groupId>
+ <groupId>org.apache.tuscany.sca.samples</groupId>
<artifactId>parent</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>sample-creditws</artifactId>
<packaging>war</packaging>
- <name>Tuscany CreditCheck Web Service Sample</name>
- <description>A sample CreditCheck Web Service.</description>
+ <name>Tuscany credit Web Service Sample</name>
+ <description>A sample credit Web Service.</description>
<properties>
<ws.type>axis2</ws.type>
</properties>
<dependencies>
+
+ <!-- SCA API dependencies -->
<dependency>
<groupId>org.osoa</groupId>
<artifactId>sca-api-r0.95</artifactId>
- <version>1.0-incubator-M2-SNAPSHOT</version>
+ <version>${scaVersion}</version>
<scope>compile</scope>
</dependency>
+
+ <!-- Tuscany API dependencies -->
<dependency>
<groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>tuscany-api</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope><!-- runtime is need for webapp integration
to include jar -->
- </dependency>
-
- <dependency>
- <groupId>commonj</groupId>
- <artifactId>sdo-api-r2.0.1</artifactId>
- <version>1.0-incubator-M2-SNAPSHOT</version>
+ <version>${scaVersion}</version>
<scope>compile</scope>
</dependency>
- <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 -->
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-axiom</artifactId>
- <version>${pom.version}</version>
- <scope>runtime</scope><!-- runtime is need for webapp integration
to include jar -->
- </dependency>
+
+ <!-- runtime is need for webapp integration to include jar -->
<dependency>
<groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>webapp</artifactId>
- <version>${pom.version}</version>
- <scope>runtime</scope><!-- runtime is need for webapp integration
to include jar -->
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.runtime</groupId>
- <artifactId>webapp-host</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>
- <version>1.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-impl</artifactId>
- <version>1.1</version>
+ <version>${scaVersion}</version>
<scope>runtime</scope>
</dependency>
+
+ <!-- Unit testing -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -111,6 +70,7 @@
</dependencies>
<build>
+ <defaultGoal>install</defaultGoal>
<finalName>credit</finalName>
<plugins>
<plugin>
@@ -124,6 +84,18 @@
</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>false</loadExtensionDependencies>
+ <extensions>
+ <dependency>
+
<groupId>org.apache.tuscany.sca.services.bindings</groupId>
+ <artifactId>axis2</artifactId>
+ <version>${scaVersion}</version>
+ </dependency>
+ </extensions>
+ </configuration>
</plugin>
</plugins>
</build>
Modified:
incubator/tuscany/sandbox/rfeng/samples/creditws/src/main/webapp/META-INF/tuscany/webapp.scdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/samples/creditws/src/main/webapp/META-INF/tuscany/webapp.scdl?view=diff&rev=467807&r1=467806&r2=467807
==============================================================================
---
incubator/tuscany/sandbox/rfeng/samples/creditws/src/main/webapp/META-INF/tuscany/webapp.scdl
(original)
+++
incubator/tuscany/sandbox/rfeng/samples/creditws/src/main/webapp/META-INF/tuscany/webapp.scdl
Wed Oct 25 16:19:17 2006
@@ -20,7 +20,7 @@
<!--
Default system configuration for the launcher environment.
- $Rev: 449867 $ $Date: 2006-09-25 17:01:40 -0700 (Mon, 25 Sep 2006) $
+ $Rev: 454491 $ $Date: 2006-10-09 13:20:56 -0700 (Mon, 09 Oct 2006) $
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT";
@@ -78,6 +78,10 @@
<system:implementation.system
class="org.apache.tuscany.core.component.scope.StatelessScopeObjectFactory"/>
</component>
+ <component name="scope.httpsession">
+ <system:implementation.system
class="org.apache.tuscany.core.component.scope.HttpSessionScopeObjectFactory"/>
+ </component>
+
<!-- include loader configuration -->
<include name="org.apache.tuscany.launcher.Loader"
scdlResource="org/apache/tuscany/core/loader.scdl"/>
@@ -109,14 +113,14 @@
<component name="workScheduler">
<system:implementation.system
class="org.apache.tuscany.core.services.work.jsr237.Jsr237WorkScheduler"/>
</component>
-
+
<!-- Web app ServletHost -->
<component name="servletHost">
<system:implementation.system
class="org.apache.tuscany.runtime.webapp.ServletHostImpl"/>
</component>
<component name="policyBuilderRegistry">
- <system:implementation.system
class="org.apache.tuscany.core.policy.PolicyBuilderRegistryImpl"/>
+ <system:implementation.system
class="org.apache.tuscany.core.policy.PolicyBuilderRegistryImpl"/>
</component>
<component name="propertyFactory">
@@ -124,15 +128,12 @@
</component>
<component name="artifactRepository">
- <system:implementation.system
class="org.apache.tuscany.core.services.artifact.LocalMavenRepository"/>
- <!-- this value needs to change to a correct one -->
- <property name = "repository">.</property>
+ <system:implementation.system
class="org.apache.tuscany.services.maven.MavenArtifactRepository"/>
+ <property
name="remoteRepoUrl">http://repo1.maven.org/maven2/,http://people.apache.org/repo/m2-snapshot-repository,http://people.apache.org/repo/m2-incubating-repository/,http://people.apache.org/repo/m1-snapshot-repository/</property>
</component>
- <include name="databinding.sdo" scdlLocation="databinding.sdo.scdl"/>
- <include name="databinding.axiom" scdlLocation="databinding.axiom.scdl"/>
- <include name="binding.axis2" scdlLocation="binding.axis2.scdl"/>
- <include name="interface.wsdl" scdlLocation="interface.wsdl.scdl"/>
-
-
+ <component name="extender" initLevel="90">
+ <system:implementation.system
class="org.apache.tuscany.runtime.webapp.WebResourceScanExtender"/>
+ <property name="path">/WEB-INF/tuscany/extensions/</property>
+ </component>
</composite>
Modified:
incubator/tuscany/sandbox/rfeng/samples/creditws/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/samples/creditws/src/main/webapp/WEB-INF/web.xml?view=diff&rev=467807&r1=467806&r2=467807
==============================================================================
---
incubator/tuscany/sandbox/rfeng/samples/creditws/src/main/webapp/WEB-INF/web.xml
(original)
+++
incubator/tuscany/sandbox/rfeng/samples/creditws/src/main/webapp/WEB-INF/web.xml
Wed Oct 25 16:19:17 2006
@@ -1,51 +1,41 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
- * 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.
+ * 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.
-->
<!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 Credit Check Web Service Sample</display-name>
- <context-param>
- <param-name>tuscany.systemScdlPath</param-name>
- <param-value>/META-INF/tuscany/webapp.scdl</param-value>
- </context-param>
+ <listener>
+
<listener-class>org.apache.tuscany.runtime.webapp.TuscanyContextListener</listener-class>
+ </listener>
- <context-param>
- <param-name>tuscany.applicationScdlPath</param-name>
- <param-value>/META-INF/sca/default.scdl</param-value>
- </context-param>
+ <servlet>
+ <servlet-name>TuscanyServlet</servlet-name>
+ <display-name>Tuscany Servlet</display-name>
+
<servlet-class>org.apache.tuscany.runtime.webapp.TuscanyServlet</servlet-class>
+ </servlet>
- <listener>
-
<listener-class>org.apache.tuscany.runtime.webapp.TuscanyContextListener</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>TuscanyServlet</servlet-name>
- <display-name>Tuscany Servlet</display-name>
-
<servlet-class>org.apache.tuscany.runtime.webapp.TuscanyServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TuscanyServlet</servlet-name>
- <url-pattern>/services/*</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>TuscanyServlet</servlet-name>
+ <url-pattern>/services/*</url-pattern>
+ </servlet-mapping>
</web-app>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
