Author: rineholt
Date: Fri Mar 24 05:43:04 2006
New Revision: 388523
URL: http://svn.apache.org/viewcvs?rev=388523&view=rev
Log:
Fix up readme to reflect head branch.
http://issues.apache.org/jira/browse/TUSCANY-135
Modified:
incubator/tuscany/java/samples/readme.htm
incubator/tuscany/java/testing/tomcat/build.xml
incubator/tuscany/java/testing/tomcat/pom.xml
Modified: incubator/tuscany/java/samples/readme.htm
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/readme.htm?rev=388523&r1=388522&r2=388523&view=diff
==============================================================================
--- incubator/tuscany/java/samples/readme.htm (original)
+++ incubator/tuscany/java/samples/readme.htm Fri Mar 24 05:43:04 2006
@@ -23,15 +23,20 @@
JAR files and the JAR files they depend on must be added to your J2SE
classpath.<br>Samples not requiring invoking web
services
-need at least the following jars in their classpath<br><a
name="#J2SEJARSNWS"></a><br><table style="text-align: left; width: 100%;"
border="1" cellpadding="2" cellspacing="2"><tbody><tr><td><pre
style="margin-left:
40px;">sca-api-SNAPSHOT.jar<br>sdo-api-SNAPSHOT.jar<br>tuscany-common-SNAPSHOT.jar<br>tuscany-core-SNAPSHOT.jar<br>tuscany-model-SNAPSHOT.jar<br>tuscany-container-java-SNAPSHOT.jar<br>tuscany-sdo-impl-SNAPSHOT.jar<br>axis-wsdl4j-1.2.jar<br>asm-2.2.jar<br>common-2.2.0-I200602160000.jar<br>ecore-2.2.0-I200602160000.jar<br>ecore-change-2.2.0-I200602160000.jar<br>ecore-xmi-2.2.0-I200602160000.jar<br>xsd-2.2.0-I200602160000.jar</pre></td></tr></tbody></table><br>If
+need at least the following jars in their classpath<br><a
name="#J2SEJARSNWS"></a><br><table style="text-align: left; width: 100%;"
border="1" cellpadding="2" cellspacing="2"><tbody><tr><td><pre
style="margin-left:
40px;">axis-wsdl4j-1.2.jar<br>common-2.2.0-I200602160000.jar<br>ecore-2.2.0-I200602160000.jar<br>ecore-change-2.2.0-I200602160000.jar<br>ecore-xmi-2.2.0-I200602160000.jar<br>sca-api-SNAPSHOT.jar<br>sdo-api-SNAPSHOT.jar<br>stax-api-1.0.jar<br>tuscany-common-SNAPSHOT.jar<br>tuscany-container-java-SNAPSHOT.jar<br>tuscany-core-SNAPSHOT.jar<br>tuscany-model-SNAPSHOT.jar<br>tuscany-sdo-impl-SNAPSHOT.jar<br>xsd-2.2.0-I200602160000.jar</pre></td></tr></tbody></table><span
style="font-style: italic;">There is an <a
href="http://ant.apache.org/bindownload.cgi" target="_blank">ant</a>
+script in java\testing\tomcat\build.xml that will produce in
+tuscany\java\testing\tomcat\target\j2se all the jars above once you
+have completed the full maven build at the root. Run "<span
style="font-weight: bold;">ant j2se</span>" Use in java -Djava.ext.dirs
to point to this directory to include all these jars.</span><br><br>If
you're planning to use SCA Web Service bindings from your Tuscany
-application, add the following JAR files to your classpath:<br><table
style="text-align: left; width: 100%;" border="1" cellpadding="2"
cellspacing="2"><tbody><tr><td><pre style="margin-left:
40px;">tuscany-binding-axis2-SNAPSHOT.jar<br>axis2-core-0.94.jar<br>commons-codec-1.3.jar<br>commons-httpclient-3.0.jar<br>commons-logging-1.0.4.jar<br>log4j-1.2.12.jar<br>stax-api-1.0.jar<br>ws-policy-SNAPSHOT.jar<br>wstx-asl-2.8.2.jar</pre></td></tr></tbody></table><br><br><h4><a
name="Tomcat_Setup"></a>Tomcat
+application, add the following JAR files to your classpath:<br><table
style="text-align: left; width: 100%;" border="1" cellpadding="2"
cellspacing="2"><tbody><tr><td><pre style="margin-left:
40px;">asm-2.2.jar<br>axiom-1.0-SNAPSHOT.jar<br>axis-wsdl4j-1.2.jar<br>axis2-common-0.95-SNAPSHOT.jar<br>axis2-core-0.95-SNAPSHOT.jar<br>axis2-wsdl-0.95-SNAPSHOT.jar<br>common-2.2.0-I200602160000.jar<br>commons-codec-1.3.jar<br>commons-httpclient-3.0.jar<br>commons-logging-1.0.4.jar<br>ecore-2.2.0-I200602160000.jar<br>ecore-change-2.2.0-I200602160000.jar<br>ecore-xmi-2.2.0-I200602160000.jar<br>log4j-1.2.12.jar<br>policy-0.92-SNAPSHOT.jar<br>sca-api-SNAPSHOT.jar<br>sdo-api-SNAPSHOT.jar<br>stax-api-1.0.jar<br>tuscany-binding-axis2-SNAPSHOT.jar<br>tuscany-common-SNAPSHOT.jar<br>tuscany-container-java-SNAPSHOT.jar<br>tuscany-core-SNAPSHOT.jar<br>tuscany-model-SNAPSHOT.jar<br>tuscany-sdo-impl-SNAPSHOT.jar<br>wstx-asl-2.8.2.jar<br>XmlSchema-1.0-SNAPSHOT.jar<br>xsd-2.2.0-I200602160000.jar</pre
></td></tr></tbody></table><span style="font-style: italic;">There is an <a
>href="http://ant.apache.org/bindownload.cgi" target="_blank">ant</a>
+script in java\testing\tomcat\build.xml that will produce in
+tuscany\java\testing\tomcat\target\j2sews all the jars above once you
+have completed the full maven build at the root. Run "<span
style="font-weight: bold;">ant j2sews</span> Use in java -Djava.ext.dirs
to point to this directory to include all these jars.</span><h4><a
name="Tomcat_Setup"></a>Tomcat
Setup</h4>
<p>The setup and configuration of the
Tomcat web server is a little more complex. If you are not
interested in the details the easiest means of configuring
-this environment is by running the the<a href="../acceptance/readme.htm"
target="_blank">
-Tuscany acceptance tests</a> that will configure a server that is
+this environment is by running "ant" in <span style="font-style:
italic;">java\testing\tomcat </span>that will configure a server that is
ready to run the samples and deploy your own SCA applications..</p><p>For
any other SCA application that is run in a Tomcat environment,
package it as a standard J2EE war file and deploy it as
@@ -51,9 +56,9 @@
autoDeploy="true" xmlValidation="false"
xmlNamespaceAware="false"><br><br></code></td></tr></tbody>
</table><p>The following jars need to be placed in tomcats
-common/lib directory</p><table style="text-align: left; width: 100%;"
border="1" cellpadding="2"
cellspacing="2"><tbody><tr><td><pre>common-2.2.0-i200602160000.jarecore-2.2.0-i200602160000.jar<br>ecore-change-2.2.0-i200602160000.jar<br>ecore-xmi-2.2.0-i200602160000.jar<br>sca-api-snapshot.jar<br>sdo-api-snapshot.jar<br>tuscany-sdo-impl-snapshot.jar<br>xsd-2.2.0-i200602160000.jar</pre></td></tr></tbody></table>
+common/lib directory</p><table style="text-align: left; width: 100%;"
border="1" cellpadding="2"
cellspacing="2"><tbody><tr><td><pre>common-2.2.0-i200602160000.jar<br>ecore-2.2.0-i200602160000.jar<br>ecore-change-2.2.0-i200602160000.jar<br>ecore-xmi-2.2.0-i200602160000.jar<br>sca-api-snapshot.jar<br>sdo-api-snapshot.jar<br>tuscany-das-rdb-snapshot.jar<br>tuscany-sdo-impl-snapshot.jar<br>xsd-2.2.0-i200602160000.jar<br>jsonrpc-snapshot.jar
<span style="font-style: italic;"><span style="font-weight: bold;">Optional if
you want javascript components</span></span><br>derby-10.1.2.1.jar <span
style="font-style: italic;"><span style="font-weight: bold;">Optional if you
want database support</span></span></pre></td></tr></tbody></table>
</li><li><p>The
-following jars need to go into the server/lib</p><table style="text-align:
left; width: 100%;" border="1" cellpadding="2"
cellspacing="2"><tbody><tr><td><pre>asm-2.2.jar<br>axis-wsdl4j-1.2.jar<br>axis2-core-0.94.jar<br>commons-codec-1.3.jar<br>commons-httpclient-3.0.jar<br>commons-logging-1.0.4.jar<br>log4j-1.2.12.jar<br>stax-api-1.0.jar<br>tuscany-binding-axis2-snapshot.jar<br>tuscany-common-snapshot.jar<br>tuscany-container-java-snapshot.jar<br>tuscany-core-snapshot.jar<br>tuscany-model-snapshot.jar<br>tuscany-tomcat-snapshot.jar<br>ws-policy-snapshot.jar<br>wstx-asl-2.8.2.jar</pre></td></tr></tbody></table><br></li><li>For
+following jars need to go into the server/lib</p><table style="text-align:
left; width: 100%;" border="1" cellpadding="2"
cellspacing="2"><tbody><tr><td><pre>asm-2.2.jar<br>axiom-1.0-snapshot.jar<br>axis-wsdl4j-1.2.jar<br>axis2-common-0.95-snapshot.jar<br>axis2-core-0.95-snapshot.jar<br>axis2-wsdl-0.95-snapshot.jar<br>commons-codec-1.3.jar<br>commons-httpclient-3.0.jar<br>commons-logging-1.0.4.jar<br>log4j-1.2.12.jar<br>policy-0.92-snapshot.jar<br>stax-api-1.0.jar<br>tuscany-binding-axis2-snapshot.jar<br>tuscany-binding-jsonrpc-snapshot.jar<br>tuscany-common-snapshot.jar<br>tuscany-container-java-snapshot.jar<br>tuscany-core-snapshot.jar<br>tuscany-model-snapshot.jar<br>tuscany-tomcat-snapshot.jar<br>wstx-asl-2.8.2.jar<br>xmlschema-1.0-snapshot.jar</pre></td></tr></tbody></table><br></li><li>For
the samples copy their war files to Tomcat's webapps
directory.</li></ul>
<h3>Sample Summary</h3>
Modified: incubator/tuscany/java/testing/tomcat/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/testing/tomcat/build.xml?rev=388523&r1=388522&r2=388523&view=diff
==============================================================================
--- incubator/tuscany/java/testing/tomcat/build.xml (original)
+++ incubator/tuscany/java/testing/tomcat/build.xml Fri Mar 24 05:43:04 2006
@@ -151,6 +151,11 @@
<target name="prepareTomcat"
depends='tuscany.tomcat.unzipWindows,tuscany.tomcat.unzipUnix,tuscany.tomcat.unzipMac,tuscany.tomcat.fixup,tuscany.deploy.samples'
description='Unzip tomcat, fix it up, and deploy samples'>
<dirname property='tuscany.acceptance.tc.dir.full'
file="${tuscany.acceptance.tc.dir}/bin" />
+ <echo level="info" message="Tomcat fixed up here:
${tuscany.acceptance.tc.dir.full}" />
+ <echo level="info"
message="http://localhost:8080/helloworldWeb-SNAPSHOT/" />
+
+ </target>
+ <target name="startTestServer" depends='prepareTomcat'
description='start server prepared to run tests'>
<waitfor maxwait="1" maxwaitunit="second" checkevery="200"
timeoutproperty="tuscany.tomcat.notstarted" >
<http url="http://localhost:8080"/>
</waitfor>
@@ -160,10 +165,8 @@
</not>
</condition>
<antcall target="startTomcat" />
- <echo level="info" message="Tomcat fixed up here:
${tuscany.acceptance.tc.dir.full}" />
- <echo level="info"
message="http://localhost:8080/tuscany-samples-helloworldWEB/" />
-
</target>
+
<target name="tuscany.tomcat.fixup"
depends='tuscany.tomcat.fixserverconfig' description='Fix up tomcat for
tuscany.'>
<mkdir dir="${tuscany.acceptance.target.dir}" />
@@ -226,7 +229,7 @@
<!-- provide a convenient -Djava.ext.dirs= to run j2se and webservice
export samples -->
<target name="j2sews" description='create a java extensions directory
to run J2SE tuscany applications.'>
- <property name="tuscany.acceptance.j2se.dir"
value='${tuscany.acceptance.target.dir}/js2sews' />
+ <property name="tuscany.acceptance.j2se.dir"
value='${tuscany.acceptance.target.dir}/j2sews' />
<antcall target="j2se" inheritAll='true' inheritRefs='true' >
</antcall>
Modified: incubator/tuscany/java/testing/tomcat/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/testing/tomcat/pom.xml?rev=388523&r1=388522&r2=388523&view=diff
==============================================================================
--- incubator/tuscany/java/testing/tomcat/pom.xml (original)
+++ incubator/tuscany/java/testing/tomcat/pom.xml Fri Mar 24 05:43:04 2006
@@ -83,7 +83,7 @@
<phase>process-test-resources</phase>
<configuration>
<tasks>
- <ant inheritRefs='true'
antfile="build.xml" dir="${basedir}/.." target="prepareTomcat">
+ <ant inheritRefs='true'
antfile="build.xml" dir="${basedir}/.." target="startTestServer">
<property name="user.home"
value="${user.home}" />
<!-- property
name="tuscany.maven.repos.dir" value="${maven.local.repo}"/ -->
</ant>