Author: slaws
Date: Fri Aug 24 08:39:55 2007
New Revision: 569425
URL: http://svn.apache.org/viewvc?rev=569425&view=rev
Log:
fix test and build files
Added:
incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/test/java/calculator/CalculatorTestCaseOFF.java
- copied, changed from r569264,
incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/test/java/calculator/CalculatorTestCaseFIXME.java
Removed:
incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/test/java/calculator/CalculatorTestCaseFIXME.java
Modified:
incubator/tuscany/java/sca/samples/calculator-webapp-ws/README
incubator/tuscany/java/sca/samples/calculator-webapp-ws/build.xml
incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/main/resources/Calculator.composite
incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/main/resources/wsdl/add.wsdl
incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/main/webapp/WEB-INF/web.xml
Modified: incubator/tuscany/java/sca/samples/calculator-webapp-ws/README
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-webapp-ws/README?rev=569425&r1=569424&r2=569425&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-webapp-ws/README (original)
+++ incubator/tuscany/java/sca/samples/calculator-webapp-ws/README Fri Aug 24
08:39:55 2007
@@ -11,14 +11,8 @@
that contains the sample is copied to your web app container. If you just want
to give this sample a go deploy the WAR file
(target/sample-calculator-webapp.war)
to you web application server.
-
-The war file that is build here contains a Tuscany JETTY binding to allow the
-sample to be tested as part of the main maven build. This needs to be removed.
-Once the war has been expanded remove.
-
- tuscnay-host-jetty-*.jar file from WEB-INF/lib
-You may also find that you need to remove the servlet-api jars in WEB-INF/lib
+You may find that you need to remove the servlet-api jars in WEB-INF/lib
depending on which app server you are using.
Once the web app is deployed use your browser to visit the following URL;
Modified: incubator/tuscany/java/sca/samples/calculator-webapp-ws/build.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-webapp-ws/build.xml?rev=569425&r1=569424&r2=569425&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-webapp-ws/build.xml (original)
+++ incubator/tuscany/java/sca/samples/calculator-webapp-ws/build.xml Fri Aug
24 08:39:55 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<project name="calculator-web" default="package">
+<project name="calculator-webap-ws" default="package">
<target name="init">
<mkdir dir="target/classes"/>
@@ -30,50 +30,109 @@
target="1.5">
<classpath>
<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
+ <pathelement path="target/classes"/>
</classpath>
</javac>
<copy todir="target/classes">
<fileset dir="src/main/resources"/>
+
</copy>
</target>
<target name="package" depends="compile">
- <war destfile="target/sample-calculator-web.war"
+ <war destfile="target/sample-calculator-webapp-ws.war"
webxml="src/main/webapp/WEB-INF/web.xml">
<fileset dir="src/main/webapp"/>
<zipfileset dir="../../modules" prefix="WEB-INF/lib">
- <include name="sca-api-0.90-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-assembly-1.0-incubating-SNAPSHOT.jar"/>
- <include
name="tuscany-assembly-xml-1.0-incubating-SNAPSHOT.jar"/>
- <include
name="tuscany-binding-ws-1.0-incubating-SNAPSHOT.jar"/>
+ <include name="sca-api-1.0-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-assembly-1.0-incubating-SNAPSHOT.jar"/>
+ <include
name="tuscany-assembly-xml-1.0-incubating-SNAPSHOT.jar"/>
+ <include
name="tuscany-binding-feed-1.0-incubating-SNAPSHOT.jar"/>
+ <include
name="tuscany-binding-jsonrpc-1.0-incubating-SNAPSHOT.jar"/>
+ <include
name="tuscany-binding-sca-1.0-incubating-SNAPSHOT.jar"/>
+ <include
name="tuscany-binding-sca-xml-1.0-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-ws-1.0-incubating-SNAPSHOT.jar"/>
<include
name="tuscany-binding-ws-axis2-1.0-incubating-SNAPSHOT.jar"/>
<include
name="tuscany-binding-ws-xml-1.0-incubating-SNAPSHOT.jar"/>
- <include
name="tuscany-contribution-1.0-incubating-SNAPSHOT.jar"/>
- <include
name="tuscany-contribution-impl-1.0-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-1.0-incubating-SNAPSHOT.jar"/>
- <include
name="tuscany-core-databinding-1.0-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-spi-1.0-incubating-SNAPSHOT.jar"/>
- <include
name="tuscany-databinding-1.0-incubating-SNAPSHOT.jar"/>
- <include
name="tuscany-host-embedded-1.0-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-host-http-1.0-incubating-SNAPSHOT.jar"/>
- <include
name="tuscany-host-webapp-1.0-incubating-SNAPSHOT.jar"/>
- <include
name="tuscany-implementation-java-1.0-incubating-SNAPSHOT.jar"/>
- <include
name="tuscany-implementation-java-runtime-1.0-incubating-SNAPSHOT.jar"/>
- <include
name="tuscany-implementation-java-xml-1.0-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-1.0-incubating-SNAPSHOT.jar"/>
- <include
name="tuscany-interface-java-1.0-incubating-SNAPSHOT.jar"/>
- <include
name="tuscany-interface-java-xml-1.0-incubating-SNAPSHOT.jar"/>
- <include
name="tuscany-interface-wsdl-1.0-incubating-SNAPSHOT.jar"/>
- <include
name="tuscany-interface-wsdl-xml-1.0-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-policy-1.0-incubating-SNAPSHOT.jar"/>
+ <include
name="tuscany-contribution-1.0-incubating-SNAPSHOT.jar"/>
+ <include
name="tuscany-contribution-impl-1.0-incubating-SNAPSHOT.jar"/>
+ <include
name="tuscany-contribution-java-1.0-incubating-SNAPSHOT.jar"/>
+ <include
name="tuscany-contribution-namespace-1.0-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-core-1.0-incubating-SNAPSHOT.jar"/>
+ <include
name="tuscany-core-databinding-1.0-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-core-spi-1.0-incubating-SNAPSHOT.jar"/>
+ <include
name="tuscany-databinding-1.0-incubating-SNAPSHOT.jar"/>
+ <include
name="tuscany-databinding-axiom-1.0-incubating-SNAPSHOT.jar"/>
+ <include
name="tuscany-databinding-jaxb-1.0-incubating-SNAPSHOT.jar"/>
+ <include
name="tuscany-databinding-sdo-1.0-incubating-SNAPSHOT.jar"/>
+ <include
name="tuscany-distributed-1.0-incubating-SNAPSHOT.jar"/>
+ <include
name="tuscany-extension-helper-1.0-incubating-SNAPSHOT.jar"/>
+ <include
name="tuscany-host-embedded-1.0-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-host-http-1.0-incubating-SNAPSHOT.jar"/>
+ <include
name="tuscany-host-webapp-1.0-incubating-SNAPSHOT.jar"/>
+ <include
name="tuscany-implementation-java-1.0-incubating-SNAPSHOT.jar"/>
+ <include
name="tuscany-implementation-java-runtime-1.0-incubating-SNAPSHOT.jar"/>
+ <include
name="tuscany-implementation-java-xml-1.0-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-1.0-incubating-SNAPSHOT.jar"/>
+ <include
name="tuscany-interface-java-1.0-incubating-SNAPSHOT.jar"/>
+ <include
name="tuscany-interface-java-xml-1.0-incubating-SNAPSHOT.jar"/>
+ <include
name="tuscany-interface-wsdl-1.0-incubating-SNAPSHOT.jar"/>
+ <include
name="tuscany-interface-wsdl-runtime-1.0-incubating-SNAPSHOT.jar"/>
+ <include
name="tuscany-interface-wsdl-xml-1.0-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-policy-1.0-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-policy-xml-1.0-incubating-SNAPSHOT.jar"/>
</zipfileset>
<lib dir="../../lib">
- <include name="stax-api-1.0.1.jar"/>
- <include name="wsdl4j-1.6.2.jar"/>
- <include name="wstx-asl-3.2.0.jar"/>
- <include name="XmlSchema-1.3.1.jar"/>
- <include name="**/../../modules/*.jar"/>
- </lib>
+ <include name="XmlSchema-1.3.1.jar"/>
+ <include name="activation-1.1.jar"/>
+ <include name="annogen-0.1.0.jar"/>
+ <include name="ant-1.7.0.jar"/>
+ <include name="ant-launcher-1.7.0.jar"/>
+ <include name="axiom-api-1.2.4.jar"/>
+ <include name="axiom-dom-1.2.4.jar"/>
+ <include name="axiom-impl-1.2.4.jar"/>
+ <include name="axis2-java2wsdl-1.2.jar"/>
+ <include name="axis2-kernel-1.2.jar"/>
+ <include name="backport-util-concurrent-2.2.jar"/>
+ <include name="backport-util-concurrent-3.0.jar"/>
+ <include name="cglib-nodep-2.1_3.jar"/>
+ <include name="common-2.2.3.jar"/>
+ <include name="commons-codec-1.3.jar"/>
+ <include name="commons-fileupload-1.1.1.jar"/>
+ <include name="commons-httpclient-3.0.1.jar"/>
+ <include name="commons-io-1.1.jar"/>
+ <include name="commons-logging-1.1.jar"/>
+ <include name="ecore-2.2.3.jar"/>
+ <include name="ecore-change-2.2.3.jar"/>
+ <include name="ecore-xmi-2.2.3.jar"/>
+ <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
+ <include name="geronimo-jms_1.1_spec-1.1.jar"/>
+ <include name="jakarta-httpcore-4.0-alpha4.jar"/>
+ <include name="jaxb-api-2.1.jar"/>
+ <include name="jaxb-impl-2.1.4.jar"/>
+ <include name="jaxen-1.1-beta-9.jar"/>
+ <include name="jaxws-api-2.1.jar"/>
+ <include name="jdom-1.0.jar"/>
+ <include name="json-rpc-1.0.jar"/>
+ <include name="jsr181-api-1.0-MR1.jar"/>
+ <include name="jsr250-api-1.0.jar"/>
+ <include name="mail-1.4.jar"/>
+ <include name="neethi-2.0.1.jar"/>
+ <include name="rome-0.9.jar"/>
+ <include name="saaj-api-1.3.jar"/>
+ <include name="sca-api-1.0-incubating-SNAPSHOT.jar"/>
+ <include name="stax-api-1.0-2.jar"/>
+ <include name="stax-api-1.0.1.jar"/>
+ <include name="woden-1.0-incubating-M7a.jar"/>
+ <include name="wsdl4j-1.6.2.jar"/>
+ <include name="wstx-asl-3.2.1.jar"/>
+ <include name="xercesImpl-2.8.1.jar"/>
+ <include name="xml-apis-1.3.03.jar"/>
+ <include name="xsd-2.2.3.jar"/>
+ <include
name="tuscany-sdo-api-r2.1-1.0-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-sdo-impl-1.0-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-sdo-lib-1.0-incubating-SNAPSHOT.jar"/>
+ </lib>
<classes dir="target/classes"/>
</war>
</target>
Modified:
incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/main/resources/Calculator.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/main/resources/Calculator.composite?rev=569425&r1=569424&r2=569425&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/main/resources/Calculator.composite
(original)
+++
incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/main/resources/Calculator.composite
Fri Aug 24 08:39:55 2007
@@ -26,7 +26,7 @@
<implementation.java class="calculator.CalculatorServiceImpl"/>
<reference name="addService" >
<interface.java interface="calculator.AddService" />
- <binding.ws
wsdlElement="http://calculator#wsdl.port(AddService/AddSoapPort)"/>
+ <binding.ws
wsdlElement="http://calculator#wsdl.port(AddService/AddSoapPort)"/>
</reference>
<reference name="subtractService"
target="SubtractServiceComponent"></reference>
<reference name="multiplyService"
target="MultiplyServiceComponent"></reference>
@@ -36,7 +36,8 @@
<component name="AddServiceComponent">
<implementation.java class="calculator.AddServiceImpl"/>
<service name="AddService">
- <interface.java interface="calculator.AddService" />
+ <interface.java interface="calculator.AddService" />
+ <!--interface.wsdl
interface="http://calculator#wsdl.interface(Add)" /-->
<binding.ws
wsdlElement="http://calculator#wsdl.port(AddService/AddSoapPort)"/>
</service>
</component>
Modified:
incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/main/resources/wsdl/add.wsdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/main/resources/wsdl/add.wsdl?rev=569425&r1=569424&r2=569425&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/main/resources/wsdl/add.wsdl
(original)
+++
incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/main/resources/wsdl/add.wsdl
Fri Aug 24 08:39:55 2007
@@ -80,7 +80,7 @@
<wsdl:service name="AddService">
<wsdl:port binding="tns:AddSoapBinding" name="AddSoapPort">
- <wsdlsoap:address
location="http://localhost:8085/sample-calculator-webapp-ws/services/AddService"/>
+ <wsdlsoap:address
location="http://localhost:8080/sample-calculator-webapp-ws/services/AddService"/>
</wsdl:port>
</wsdl:service>
Modified:
incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/main/webapp/WEB-INF/web.xml?rev=569425&r1=569424&r2=569425&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/main/webapp/WEB-INF/web.xml
(original)
+++
incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/main/webapp/WEB-INF/web.xml
Fri Aug 24 08:39:55 2007
@@ -25,12 +25,12 @@
<display-name>Tuscany Calculator Web Service Sample</display-name>
<listener>
-
<listener-class>org.apache.tuscany.sca.webapp.TuscanyContextListener</listener-class>
- </listener>
+
<listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class>
+ </listener>
<servlet>
<servlet-name>TuscanyServlet</servlet-name>
-
<servlet-class>org.apache.tuscany.sca.webapp.TuscanyServlet</servlet-class>
+
<servlet-class>org.apache.tuscany.sca.host.webapp.TuscanyServlet</servlet-class>
</servlet>
<servlet-mapping>
Copied:
incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/test/java/calculator/CalculatorTestCaseOFF.java
(from r569264,
incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/test/java/calculator/CalculatorTestCaseFIXME.java)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/test/java/calculator/CalculatorTestCaseOFF.java?p2=incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/test/java/calculator/CalculatorTestCaseOFF.java&p1=incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/test/java/calculator/CalculatorTestCaseFIXME.java&r1=569264&r2=569425&rev=569425&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/test/java/calculator/CalculatorTestCaseFIXME.java
(original)
+++
incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/test/java/calculator/CalculatorTestCaseOFF.java
Fri Aug 24 08:39:55 2007
@@ -25,8 +25,12 @@
/**
* This shows how to test the Calculator service component.
+ *
+ * This test is turned off so as not to mess up the daily build. It assumes
+ * that the web services will run on port 8080 (see the wsdl) which is already
+ * in the use on the build machine.
*/
-public class CalculatorTestCaseFIXME extends TestCase {
+public class CalculatorTestCaseOFF extends TestCase {
private SCADomain scaDomain;
private CalculatorService calculatorService;
@@ -48,10 +52,6 @@
//System.out.println(eprInspector.eprAsString());
// Calculate
- /*
- These will only work in the context of an external web container
- that we don;t have here
-*/
assertEquals(calculatorService.add(3, 2), 5.0);
assertEquals(calculatorService.subtract(3, 2), 1.0);
assertEquals(calculatorService.multiply(3, 2), 6.0);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
