Author: rfeng
Date: Sun Oct 15 20:23:08 2006
New Revision: 464370
URL: http://svn.apache.org/viewvc?view=rev&rev=464370
Log:
Comment out idl.wsdl extension to avoid classloading issue (idl.wsdl extension
is included in axis2 extension)
Modified:
incubator/tuscany/java/sampleapps/bigbank/account/pom.xml
incubator/tuscany/java/sampleapps/bigbank/account/src/main/webapp/WEB-INF/tuscany/extensions/default.scdl
incubator/tuscany/java/sampleapps/bigbank/account/src/main/webapp/WEB-INF/web.xml
incubator/tuscany/java/sampleapps/bigbank/install.bat
incubator/tuscany/java/sampleapps/bigbank/starttc.bat
incubator/tuscany/java/sampleapps/bigbank/webclient/pom.xml
incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/webapp/WEB-INF/tuscany/extensions/default.scdl
incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/webapp/WEB-INF/web.xml
incubator/tuscany/java/samples/sca/helloworldws/pom.xml
incubator/tuscany/java/samples/sca/helloworldwsclient/pom.xml
Modified: incubator/tuscany/java/sampleapps/bigbank/account/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/account/pom.xml?view=diff&rev=464370&r1=464369&r2=464370
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/account/pom.xml (original)
+++ incubator/tuscany/java/sampleapps/bigbank/account/pom.xml Sun Oct 15
20:23:08 2006
@@ -1,58 +1,58 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- * 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.
-->
<project>
- <parent>
- <groupId>org.apache.tuscany.samples.bigbank</groupId>
- <artifactId>bigbank-scenario</artifactId>
- <version>1.0-incubator-M2-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>sample-bigbank-account</artifactId>
- <packaging>war</packaging>
- <name>Tuscany BigBank Account Module</name>
- <description>BigBank Scenario - Account Management Module</description>
- <dependencies>
-
-
- <dependency>
+ <parent>
+ <groupId>org.apache.tuscany.samples.bigbank</groupId>
+ <artifactId>bigbank-scenario</artifactId>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>sample-bigbank-account</artifactId>
+ <packaging>war</packaging>
+ <name>Tuscany BigBank Account Module</name>
+ <description>BigBank Scenario - Account Management Module</description>
+ <dependencies>
+
+
+ <dependency>
<groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>webapp</artifactId>
<version>${tuscanyVersion}</version>
</dependency>
-
- <!-- java.xml.stream API -->
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0.1</version>
- <scope>compile</scope>
- </dependency>
- <!-- StAX implementation -->
- <dependency>
- <groupId>woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>3.0.1</version>
- <scope>runtime</scope>
- </dependency>
-
-
+
+ <!-- java.xml.stream API -->
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <!-- StAX implementation -->
+ <dependency>
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>3.0.1</version>
+ <scope>runtime</scope>
+ </dependency>
+
+
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
@@ -62,168 +62,168 @@
</dependency>
- <dependency>
- <groupId>org.apache.tuscany.das</groupId>
- <artifactId>tuscany-das-rdb</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.1.2.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
-
-
-<!--TUSCANY-765 include here -->
- <dependency>
-
<groupId>org.apache.tuscany.sca.services.idl</groupId>
- <artifactId>wsdl</artifactId>
- <version>${sca.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
-
<groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-sdo</artifactId>
- <version>${sca.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
-
<groupId>org.apache.tuscany.sca.services.databinding</groupId>
-
<artifactId>databinding-axiom</artifactId>
- <version>${sca.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
-
<groupId>org.apache.tuscany.sca.services.bindings</groupId>
-
<artifactId>axis2</artifactId>
-
<version>${sca.version}</version>
- <scope>compile</scope>
- </dependency>
-
-<!-- move it to web-inf/lib -->
- <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>
-
-
-<!--TUSCANY-765 include here -->
-
- </dependencies>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- <resource>
- <directory>${notice.dir}</directory>
- <targetPath>META-INF</targetPath>
- <filtering>true</filtering>
- <includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-plugin</artifactId>
- <version>${sdo.version}</version>
- <executions>
- <execution>
- <configuration>
- <!--
schemaFile>${basedir}/src/main/resources/wsdl/AccountService.wsdl</schemaFile
-->
-
<schemaDir>${basedir}/src/main/resources/wsdl</schemaDir>
-
<noNotification>true</noNotification>
-
<noContainer>true</noContainer>
-
<noUnsettable>true</noUnsettable>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
-
<groupId>org.apache.tuscany.sca.plugins</groupId>
-
<artifactId>tuscany-plugin-wsdl2java</artifactId>
- <executions>
- <execution>
- <configuration>
- <wsdlFiles>
- <wsdlFile>
-
<fileName>${basedir}/src/main/resources/wsdl/stockquotes.webservicex.wsdl</fileName>
- <ports>
-
<port>StockQuoteSoap </port>
- </ports>
- </wsdlFile>
- <wsdlFile>
-
<fileName>${basedir}/src/main/resources/wsdl/AccountService.wsdl</fileName>
- </wsdlFile>
- </wsdlFiles>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
-
<groupId>org.apache.tuscany.sca.plugins</groupId>
- <artifactId>tuscany-war-plugin</artifactId>
- <executions>
- <execution>
- <id>tuscany-war</id>
- <goals>
- <goal>tuscany-war</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
-<!--TUSCANY-765
- <extensions>
- <dependency>
-
<groupId>org.apache.tuscany.sca.services.idl</groupId>
-
<artifactId>wsdl</artifactId>
-
<version>${sca.version}</version>
- </dependency>
- <dependency>
-
<groupId>org.apache.tuscany.sca.services.databinding</groupId>
-
<artifactId>databinding-sdo</artifactId>
-
<version>${sca.version}</version>
- </dependency>
- <dependency>
-
<groupId>org.apache.tuscany.sca.services.databinding</groupId>
-
<artifactId>databinding-axiom</artifactId>
- <version>${sca.version}</version>
- </dependency>
- <dependency>
-
<groupId>org.apache.tuscany.sca.services.bindings</groupId>
-
<artifactId>axis2</artifactId>
-
<version>${sca.version}</version>
- </dependency>
- </extensions>
--->
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <dependency>
+ <groupId>org.apache.tuscany.das</groupId>
+ <artifactId>tuscany-das-rdb</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.1.2.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+
+
+
+ <!--TUSCANY-765 include here
+ <dependency>
+ <groupId>org.apache.tuscany.sca.services.idl</groupId>
+ <artifactId>wsdl</artifactId>
+ <version>${sca.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca.services.databinding</groupId>
+ <artifactId>databinding-sdo</artifactId>
+ <version>${sca.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca.services.databinding</groupId>
+ <artifactId>databinding-axiom</artifactId>
+ <version>${sca.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca.services.bindings</groupId>
+ <artifactId>axis2</artifactId>
+ <version>${sca.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+
+
+
+ TUSCANY-765 include here -->
+
+ </dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ <resource>
+ <directory>${notice.dir}</directory>
+ <targetPath>META-INF</targetPath>
+ <filtering>true</filtering>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-plugin</artifactId>
+ <version>${sdo.version}</version>
+ <executions>
+ <execution>
+ <configuration>
+ <!--
schemaFile>${basedir}/src/main/resources/wsdl/AccountService.wsdl</schemaFile
-->
+
<schemaDir>${basedir}/src/main/resources/wsdl</schemaDir>
+ <noNotification>true</noNotification>
+ <noContainer>true</noContainer>
+ <noUnsettable>true</noUnsettable>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.tuscany.sca.plugins</groupId>
+ <artifactId>tuscany-plugin-wsdl2java</artifactId>
+ <executions>
+ <execution>
+ <configuration>
+ <wsdlFiles>
+ <wsdlFile>
+
<fileName>${basedir}/src/main/resources/wsdl/stockquotes.webservicex.wsdl</fileName>
+ <ports>
+ <port>StockQuoteSoap</port>
+ </ports>
+ </wsdlFile>
+ <wsdlFile>
+
<fileName>${basedir}/src/main/resources/wsdl/AccountService.wsdl</fileName>
+ </wsdlFile>
+ </wsdlFiles>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.tuscany.sca.plugins</groupId>
+ <artifactId>tuscany-war-plugin</artifactId>
+ <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>false</loadExtensionDependencies>
+
+ <extensions>
+ <dependency>
+
<groupId>org.apache.tuscany.sca.services.databinding</groupId>
+ <artifactId>databinding-sdo</artifactId>
+ <version>${sca.version}</version>
+ </dependency>
+ <!--
+ <dependency>
+
<groupId>org.apache.tuscany.sca.services.idl</groupId>
+ <artifactId>wsdl</artifactId>
+ <version>${sca.version}</version>
+ </dependency>
+ <dependency>
+
<groupId>org.apache.tuscany.sca.services.databinding</groupId>
+ <artifactId>databinding-axiom</artifactId>
+ <version>${sca.version}</version>
+ </dependency>
+ -->
+ <dependency>
+
<groupId>org.apache.tuscany.sca.services.bindings</groupId>
+ <artifactId>axis2</artifactId>
+ <version>${sca.version}</version>
+ </dependency>
+ </extensions>
+
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified:
incubator/tuscany/java/sampleapps/bigbank/account/src/main/webapp/WEB-INF/tuscany/extensions/default.scdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/account/src/main/webapp/WEB-INF/tuscany/extensions/default.scdl?view=diff&rev=464370&r1=464369&r2=464370
==============================================================================
---
incubator/tuscany/java/sampleapps/bigbank/account/src/main/webapp/WEB-INF/tuscany/extensions/default.scdl
(original)
+++
incubator/tuscany/java/sampleapps/bigbank/account/src/main/webapp/WEB-INF/tuscany/extensions/default.scdl
Sun Oct 15 20:23:08 2006
@@ -22,7 +22,7 @@
<!--
<include name="org.apache.tuscany.runtime.webapp.System"
scdlLocation="includes/webapp.scdl"/>
- -->
+
<component name="scope.httpsession">
<system:implementation.system
class="org.apache.tuscany.core.component.scope.HttpSessionScopeObjectFactory"/>
@@ -31,5 +31,5 @@
<include name="org.apache.tuscany.binding.axis2.WebServiceBinding"
scdlLocation="includes/axis.scdl"/>
<include name="org.apache.tuscany.databinding.sdo"
scdlLocation="includes/databinding.sdo.scdl"/>
<include name="org.apache.tuscany.databinding.Axiom"
scdlLocation="includes/databinding.axiom.scdl"/>
-
+ -->
</composite>
Modified:
incubator/tuscany/java/sampleapps/bigbank/account/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/account/src/main/webapp/WEB-INF/web.xml?view=diff&rev=464370&r1=464369&r2=464370
==============================================================================
---
incubator/tuscany/java/sampleapps/bigbank/account/src/main/webapp/WEB-INF/web.xml
(original)
+++
incubator/tuscany/java/sampleapps/bigbank/account/src/main/webapp/WEB-INF/web.xml
Sun Oct 15 20:23:08 2006
@@ -34,6 +34,12 @@
<param-value>/META-INF/sca/default.scdl</param-value>
</context-param -->
+ <context-param>
+ <param-name>tuscany.online</param-name>
+ <param-value>false</param-value>
+ </context-param>
+
+
<listener>
<listener-class>org.apache.tuscany.runtime.webapp.TuscanyContextListener</listener-class>
</listener>
Modified: incubator/tuscany/java/sampleapps/bigbank/install.bat
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/install.bat?view=diff&rev=464370&r1=464369&r2=464370
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/install.bat (original)
+++ incubator/tuscany/java/sampleapps/bigbank/install.bat Sun Oct 15 20:23:08
2006
@@ -1,11 +1,11 @@
rmdir test /s /q
mkdir test
-set TC_VERSION=apache-tomcat-5.5.20
+set TC_VERSION=apache-tomcat-5.5.17
rem unzip apache-tomcat-5.5.17.zip -d test
pushd test
jar -xvf ..\%TC_VERSION%.zip
popd
-rem copy /y server.xml test\apache-tomcat-5.5.17\conf
+copy /y server.xml test\%TC_VERSION%\conf
copy account\target\sample-bigbank-account-1.0-incubator-M2-SNAPSHOT.war
test\%TC_VERSION%\webapps
copy webclient\target\sample-bigbank-webclient-1.0-incubator-M2-SNAPSHOT.war
test\%TC_VERSION%\webapps
Modified: incubator/tuscany/java/sampleapps/bigbank/starttc.bat
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/starttc.bat?view=diff&rev=464370&r1=464369&r2=464370
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/starttc.bat (original)
+++ incubator/tuscany/java/sampleapps/bigbank/starttc.bat Sun Oct 15 20:23:08
2006
@@ -1,4 +1,4 @@
-set TC_VERSION=apache-tomcat-5.5.20
+set TC_VERSION=apache-tomcat-5.5.17
set catalina_opts=
set catalina_opts=-Xdebug -Xnoagent
-Xrunjdwp:transport=dt_socket,address=3720,server=y,suspend=n
erase /s /q test\%TC_VERSION%\logs\*.*
Modified: incubator/tuscany/java/sampleapps/bigbank/webclient/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/webclient/pom.xml?view=diff&rev=464370&r1=464369&r2=464370
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/webclient/pom.xml (original)
+++ incubator/tuscany/java/sampleapps/bigbank/webclient/pom.xml Sun Oct 15
20:23:08 2006
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- * 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.
-->
<project>
<parent>
@@ -31,19 +31,47 @@
<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>${tuscanyVersion}</version>
+ <scope>compile</scope>
+ </dependency>
+ <!-- SDO's XMLStreamHelper requires StAX API and impl (it's not pulled
by
+ tuscany-sdo-impl because the maven dependency scope is provided -->
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>3.0.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
<version>${sca.version}</version>
<scope>compile</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>webapp</artifactId>
<version>${tuscanyVersion}</version>
+ <scope>runtime</scope>
</dependency>
-
-
+
+
<dependency>
<groupId>tomcat</groupId>
<artifactId>servlet-api</artifactId>
@@ -63,56 +91,51 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca.kernel</groupId>
- <artifactId>tuscany-api</artifactId>
- <version>${sca.version}</version>
- <scope>provided</scope>
- </dependency>
-
-
-
-<!--TUSCANY-765 include here -->
- <dependency>
-
<groupId>org.apache.tuscany.sca.services.idl</groupId>
- <artifactId>wsdl</artifactId>
- <version>${sca.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
-
<groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-sdo</artifactId>
- <version>${sca.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
-
<groupId>org.apache.tuscany.sca.services.databinding</groupId>
-
<artifactId>databinding-axiom</artifactId>
- <version>${sca.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
-
<groupId>org.apache.tuscany.sca.services.bindings</groupId>
-
<artifactId>axis2</artifactId>
-
<version>${sca.version}</version>
- <scope>compile</scope>
- </dependency>
-
-<!-- move it to web-inf/lib -->
- <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>
-
-
-<!--TUSCANY-765 include here -->
-
-
-
-
+ <!--
+ <dependency>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
+ <artifactId>tuscany-api</artifactId>
+ <version>${sca.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ -->
+
+
+ <!--TUSCANY-765 include here -->
+ <!--
+ <dependency>
+ <groupId>org.apache.tuscany.sca.services.idl</groupId>
+ <artifactId>wsdl</artifactId>
+ <version>${sca.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca.services.databinding</groupId>
+ <artifactId>databinding-sdo</artifactId>
+ <version>${sca.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca.services.databinding</groupId>
+ <artifactId>databinding-axiom</artifactId>
+ <version>${sca.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca.services.bindings</groupId>
+ <artifactId>axis2</artifactId>
+ <version>${sca.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ -->
+ <!-- move it to web-inf/lib -->
+
+
+ <!--TUSCANY-765 include here -->
+
+
+
+
</dependencies>
<build>
@@ -165,45 +188,53 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.tuscany.sca.plugins</groupId>
- <artifactId>tuscany-war-plugin</artifactId>
- <executions>
- <execution>
- <id>tuscany-war</id>
- <goals>
- <goal>tuscany-war</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
-<!--TUSCANY-765
- <extensions>
- <dependency>
-
<groupId>org.apache.tuscany.sca.services.idl</groupId>
- <artifactId>wsdl</artifactId>
- <version>${sca.version}</version>
- </dependency>
- <dependency>
-
<groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-sdo</artifactId>
- <version>${sca.version}</version>
- </dependency>
- <dependency>
-
<groupId>org.apache.tuscany.sca.services.databinding</groupId>
-
<artifactId>databinding-axiom</artifactId>
- <version>${sca.version}</version>
- </dependency>
- <dependency>
-
<groupId>org.apache.tuscany.sca.services.bindings</groupId>
-
<artifactId>axis2</artifactId>
-
<version>${sca.version}</version>
- </dependency>
-
- </extensions>
--->
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.tuscany.sca.plugins</groupId>
+ <artifactId>tuscany-war-plugin</artifactId>
+ <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>false</loadExtensionDependencies>
+
+ <!--TUSCANY-765 -->
+ <extensions>
+ <dependency>
+
<groupId>org.apache.tuscany.sca.services.databinding</groupId>
+ <artifactId>databinding-sdo</artifactId>
+ <version>${sca.version}</version>
+ </dependency>
+ <!-- HACK: comment out databinding-axiom extension to
work around the inter-extension
+ dependency issue -->
+ <!--
+ <dependency>
+
<groupId>org.apache.tuscany.sca.services.idl</groupId>
+ <artifactId>wsdl</artifactId>
+ <version>${sca.version}</version>
+ </dependency>
+ <dependency>
+
<groupId>org.apache.tuscany.sca.services.databinding</groupId>
+ <artifactId>databinding-axiom</artifactId>
+ <version>${sca.version}</version>
+ </dependency>
+ -->
+ <dependency>
+
<groupId>org.apache.tuscany.sca.services.bindings</groupId>
+ <artifactId>axis2</artifactId>
+ <version>${sca.version}</version>
+ </dependency>
+
+ </extensions>
+ <!-- TUSCANY-765 -->
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Modified:
incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/webapp/WEB-INF/tuscany/extensions/default.scdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/webapp/WEB-INF/tuscany/extensions/default.scdl?view=diff&rev=464370&r1=464369&r2=464370
==============================================================================
---
incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/webapp/WEB-INF/tuscany/extensions/default.scdl
(original)
+++
incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/webapp/WEB-INF/tuscany/extensions/default.scdl
Sun Oct 15 20:23:08 2006
@@ -23,7 +23,7 @@
<!--
<include name="org.apache.tuscany.runtime.webapp.System"
scdlLocation="includes/webapp.scdl"/>
-->
-
+<!--
<component name="scope.httpsession">
<system:implementation.system
class="org.apache.tuscany.core.component.scope.HttpSessionScopeObjectFactory"/>
</component>
@@ -31,5 +31,5 @@
<include name="org.apache.tuscany.binding.axis2.WebServiceBinding"
scdlLocation="includes/axis.scdl"/>
<include name="org.apache.tuscany.databinding.sdo"
scdlLocation="includes/databinding.sdo.scdl"/>
<include name="org.apache.tuscany.databinding.Axiom"
scdlLocation="includes\databinding.axiom.scdl"/>
-
+-->
</composite>
Modified:
incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/webapp/WEB-INF/web.xml?view=diff&rev=464370&r1=464369&r2=464370
==============================================================================
---
incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/webapp/WEB-INF/web.xml
(original)
+++
incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/webapp/WEB-INF/web.xml
Sun Oct 15 20:23:08 2006
@@ -35,6 +35,12 @@
<url-pattern>/*</url-pattern>
</filter-mapping>
+ <context-param>
+ <param-name>tuscany.online</param-name>
+ <param-value>false</param-value>
+ </context-param>
+
+
<listener>
<listener-class>org.apache.tuscany.runtime.webapp.TuscanyContextListener</listener-class>
</listener>
Modified: incubator/tuscany/java/samples/sca/helloworldws/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldws/pom.xml?view=diff&rev=464370&r1=464369&r2=464370
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldws/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/helloworldws/pom.xml Sun Oct 15 20:23:08
2006
@@ -124,14 +124,14 @@
<artifactId>axis2</artifactId>
<version>${tuscanyVersion}</version>
</dependency>
+ <!-- HACK: comment out wsdl and databinding-axiom
extensions to work around the inter-extension
+ dependency issue -->
+ <!--
<dependency>
<groupId>org.apache.tuscany.sca.services.idl</groupId>
<artifactId>wsdl</artifactId>
<version>${tuscanyVersion}</version>
</dependency>
- <!-- HACK: comment out databinding-axiom extension to
work around the inter-extension
- dependency issue -->
- <!--
<dependency>
<groupId>org.apache.tuscany.sca.services.databinding</groupId>
<artifactId>databinding-axiom</artifactId>
Modified: incubator/tuscany/java/samples/sca/helloworldwsclient/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldwsclient/pom.xml?view=diff&rev=464370&r1=464369&r2=464370
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldwsclient/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/helloworldwsclient/pom.xml Sun Oct 15
20:23:08 2006
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- * 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.
-->
<project>
<parent>
@@ -33,7 +33,7 @@
</properties>
<dependencies>
-
+
<dependency>
<groupId>commonj</groupId>
<artifactId>sdo-api-r2.0.1</artifactId>
@@ -50,19 +50,19 @@
<groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>tuscany-api</artifactId>
<version>${tuscanyVersion}</version>
- <scope>compile</scope>
- </dependency>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>core</artifactId>
<version>${tuscanyVersion}</version>
- <scope>provided</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca.services.bindings</groupId>
<artifactId>axis2</artifactId>
<version>${tuscanyVersion}</version>
- <scope>provided</scope>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -85,10 +85,11 @@
<version>${tuscanyVersion}</version>
<scope>test</scope>
</dependency>
-
+
</dependencies>
-
- <build>
+
+ <build>
+
<finalName>sample-helloworldwsclient-1.0-incubator-M2-SNAPSHOT</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -101,8 +102,53 @@
</archive>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.tuscany.sca.plugins</groupId>
+ <artifactId>tuscany-war-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>tuscany-zip</id>
+ <goals>
+ <goal>tuscany-zip</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>
+ <overwrite>true</overwrite>
+ <extensions>
+ <dependency>
+
<groupId>org.apache.tuscany.sca.services.bindings</groupId>
+ <artifactId>axis2</artifactId>
+ <version>${tuscanyVersion}</version>
+ </dependency>
+ <dependency>
+
<groupId>org.apache.tuscany.sca.services.idl</groupId>
+ <artifactId>wsdl</artifactId>
+ <version>${tuscanyVersion}</version>
+ </dependency>
+ <!-- HACK: comment out databinding-axiom extension to
work around the inter-extension
+ dependency issue -->
+ <!--
+ <dependency>
+
<groupId>org.apache.tuscany.sca.services.databinding</groupId>
+ <artifactId>databinding-axiom</artifactId>
+ <version>${tuscanyVersion}</version>
+ </dependency>
+ -->
+ <dependency>
+
<groupId>org.apache.tuscany.sca.services.databinding</groupId>
+ <artifactId>databinding-sdo</artifactId>
+ <version>${tuscanyVersion}</version>
+ </dependency>
+ </extensions>
+ </configuration>
+ </plugin>
</plugins>
</build>
-
-
+
+
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
