Author: rfeng
Date: Wed Feb 13 09:31:10 2008
New Revision: 627537
URL: http://svn.apache.org/viewvc?rev=627537&view=rev
Log:
Convert the large-sdo-ws to work w/ the itest web framework
Added:
incubator/tuscany/java/sca/itest/large-sdo-ws/src/main/resources/META-INF/
incubator/tuscany/java/sca/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml
(with props)
Modified:
incubator/tuscany/java/sca/itest/large-sdo-ws/pom.xml
incubator/tuscany/java/sca/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl
incubator/tuscany/java/sca/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java
incubator/tuscany/java/sca/itest/pom.xml
Modified: incubator/tuscany/java/sca/itest/large-sdo-ws/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/large-sdo-ws/pom.xml?rev=627537&r1=627536&r2=627537&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/large-sdo-ws/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/large-sdo-ws/pom.xml Wed Feb 13 09:31:10
2008
@@ -58,13 +58,6 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
- <version>1.2-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version> <!-- to keep compatible with older servlet
containers -->
@@ -80,6 +73,24 @@
</dependencies>
+ <!-- Declare tuscany-host-tomcat dependency in the default profile so that
it can be replaced -->
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-tomcat</artifactId>
+ <version>1.2-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<build>
<finalName>${artifactId}</finalName>
<plugins>
Added:
incubator/tuscany/java/sca/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml?rev=627537&view=auto
==============================================================================
---
incubator/tuscany/java/sca/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml
(added)
+++
incubator/tuscany/java/sca/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml
Wed Feb 13 09:31:10 2008
@@ -0,0 +1,23 @@
+<?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.
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0";
targetNamespace="http://trninqcomposite";
+ xmlns:t="http://trninqcomposite";>
+ <deployable composite="t:TestService" />
+</contribution>
\ No newline at end of file
Propchange:
incubator/tuscany/java/sca/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
incubator/tuscany/java/sca/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl?rev=627537&r1=627536&r2=627537&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl
(original)
+++
incubator/tuscany/java/sca/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl
Wed Feb 13 09:31:10 2008
@@ -51,7 +51,7 @@
</binding>
<service name="TrnInqSvc">
<port name="TrnInqSvcPort" binding="tns:trninq">
- <soap:address
location="http://localhost:8085/TestService/services/TrnInqService"; />
+ <soap:address
location="http://localhost:8085/itest-large-sdo-ws/TrnInqService"; />
</port>
</service>
</definitions>
Modified:
incubator/tuscany/java/sca/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java?rev=627537&r1=627536&r2=627537&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java
(original)
+++
incubator/tuscany/java/sca/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java
Wed Feb 13 09:31:10 2008
@@ -39,12 +39,14 @@
*/
public class TrnInqServiceTestCase extends TestCase {
- private SCADomain scaDomain;
+ private static SCADomain scaDomain;
private TrninqInterface trnInq;
@Override
protected void setUp() throws Exception {
- scaDomain = SCADomain.newInstance("trnInq.composite");
+ if (scaDomain == null) {
+ scaDomain = SCADomain.newInstance("trnInq.composite");
+ }
trnInq = scaDomain.getService(TrninqInterface.class,
"TransactionInquiryClientComponent");
}
Modified: incubator/tuscany/java/sca/itest/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/pom.xml?rev=627537&r1=627536&r2=627537&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/pom.xml Wed Feb 13 09:31:10 2008
@@ -181,6 +181,7 @@
<module>interfaces</module>
<module>wires</module>
<module>scopes</module>
+ <module>large-sdo-ws</module>
</modules>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
