You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ri...@apache.org on 2006/02/16 03:11:21 UTC
svn commit: r378141 - in /incubator/tuscany/java:
samples/helloworld/helloworldws/pom.xml testing/tomcat/build.xml
testing/tomcat/pom.xml
Author: rineholt
Date: Wed Feb 15 18:11:20 2006
New Revision: 378141
URL: http://svn.apache.org/viewcvs?rev=378141&view=rev
Log:
get at least hello ws test to run.. htmlunit maven dependencies download is broken
Modified:
incubator/tuscany/java/samples/helloworld/helloworldws/pom.xml
incubator/tuscany/java/testing/tomcat/build.xml
incubator/tuscany/java/testing/tomcat/pom.xml
Modified: incubator/tuscany/java/samples/helloworld/helloworldws/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/helloworld/helloworldws/pom.xml?rev=378141&r1=378140&r2=378141&view=diff
==============================================================================
--- incubator/tuscany/java/samples/helloworld/helloworldws/pom.xml (original)
+++ incubator/tuscany/java/samples/helloworld/helloworldws/pom.xml Wed Feb 15 18:11:20 2006
@@ -27,6 +27,26 @@
<description>Sample classic helloworld SCA Service</description>
<version>SNAPSHOT</version>
+<build>
+
+ <plugins>
+
+ <plugin>
+
+ <artifactId>maven-war-plugin</artifactId>
+
+
+ <configuration>
+
+ <warName>tuscany-samples-helloworldws-service</warName>
+
+ </configuration>
+
+ </plugin>
+
+ </plugins>
+
+ </build>
<dependencies>
<dependency>
<groupId>org.apache.tuscany</groupId>
Modified: incubator/tuscany/java/testing/tomcat/build.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/testing/tomcat/build.xml?rev=378141&r1=378140&r2=378141&view=diff
==============================================================================
--- incubator/tuscany/java/testing/tomcat/build.xml (original)
+++ incubator/tuscany/java/testing/tomcat/build.xml Wed Feb 15 18:11:20 2006
@@ -16,9 +16,10 @@
-->
<project name="setup tomcat " default="prepareTomcat" basedir='.'>
<property environment="env" />
+ <property file="${user.home}/tuscany/build.properties" />
<property file="${user.home}/build.properties" />
- <property name="tuscany.acceptance.tomcat.version" value='5.5.12' />
+ <property name="tuscany.acceptance.tomcat.version" value='5.5.15' />
<condition property="tuscany.acceptance.tomcat.zipped" value='apache-tomcat-${tuscany.acceptance.tomcat.version}.zip'>
<os family="windows"/>
</condition>
@@ -35,10 +36,15 @@
<property name="tuscany.acceptance.target.dir" value='target' />
<property name="tuscany.acceptance.scaspec.dir" value='../spec/sca' />
- <property name="tuscany.acceptance.groupId" value='osoa' />
+ <property name="tuscany.acceptance.groupId" value='org/apache/tuscany' />
<property name="tuscany.acceptance.version" value='SNAPSHOT' />
+ <property name="tuscany.sca.acceptance.groupId" value='org/osoa' />
+ <property name="tuscany.sca.acceptance.version" value='SNAPSHOT' />
+
<property name="tuscany.acceptance.samples.dir" value='../../samples' />
+ <!-- property name="tuscany.maven.repos.dir" value='${user.home}\.maven\repository' / -->
+ <!-- change for maven 2.0 -->
<property name="tuscany.maven.repos.dir" value='${user.home}\.m2\repository' />
<condition property="isWindows">
<os family="windows"/>
@@ -51,7 +57,6 @@
</condition>
<target name="init">
- <echo message="user.home = ${user.home}" />
<available property='tomcat.is.available' file='${tuscany.acceptance.tc.dir}/server/lib/catalina.jar' type='file' />
<available property='tuscany.acceptance.tomcat.zipped.available' file='${tuscany.acceptance.tomcat.zipped}' type='file' />
<available property='tuscany.acceptance.tomcat.serverxmlorg.available' file='${tuscany.acceptance.tc.dir}/conf/server.xml.original' />
@@ -71,36 +76,42 @@
<include name="**/${tuscany.acceptance.groupId}/tuscany-binding-axis/${tuscany.acceptance.version}/tuscany-binding-axis-${tuscany.acceptance.version}.jar" />
<include name="**/${tuscany.acceptance.groupId}/tuscany-common/${tuscany.acceptance.version}/tuscany-common-${tuscany.acceptance.version}.jar" />
<include name="**/${tuscany.acceptance.groupId}/tuscany-container-java/${tuscany.acceptance.version}/tuscany-container-java-${tuscany.acceptance.version}.jar" />
+ <include name="**/${tuscany.acceptance.groupId}/tuscany-container-js/${tuscany.acceptance.version}/tuscany-container-js-${tuscany.acceptance.version}.jar" />
<include name="**/${tuscany.acceptance.groupId}/tuscany-core/${tuscany.acceptance.version}/tuscany-core-${tuscany.acceptance.version}.jar" />
<include name="**/${tuscany.acceptance.groupId}/tuscany-model/${tuscany.acceptance.version}/tuscany-model-${tuscany.acceptance.version}.jar" />
+
+
+ <include name="**/${tuscany.sca.acceptance.groupId}/sca-api/${tuscany.sca.acceptance.version}/sca-api-${tuscany.sca.acceptance.version}.jar" />
+
+
<!-- Kevin's mod to include DAS jar -->
- <include name="**/${tuscany.acceptance.groupId}/tuscany-das-jdbc/${tuscany.acceptance.version}/tuscany-das-jdbc-${tuscany.acceptance.version}.jar" />
+ <include name="**/${tuscany.acceptance.groupId}/tuscany-das-jdbc-${tuscany.acceptance.version}.jar" />
</patternset>
<patternset id="tuscany.acceptance.tc.server"> <!--jars which need to go into tomcat server/lib -->
<include name="**/${tuscany.acceptance.groupId}/tuscany-tomcat/${tuscany.acceptance.version}/tuscany-tomcat-${tuscany.acceptance.version}.jar" />
</patternset>
<patternset id="tuscany.acceptance.dependencies">
- <include name="**/axis/1.2.1/axis-1.2.1.jar" />
- <include name="**/axis-jaxrpc/1.2.1/axis-jaxrpc-1.2.1.jar" />
- <include name="**/axis-saaj/1.2.1/axis-saaj-1.2.1.jar" />
- <include name="**/axis-wsdl4j/1.5.1/axis-wsdl4j-1.5.1.jar" />
-
- <include name="**/eclipse/emf/commonj-sdo/2.1.0/commonj-sdo-2.1.0.jar" />
- <include name="**/commons-discovery/0.2/commons-discovery-0.2.jar" />
-
- <include name="**/eclipse/emf/common/2.1.0/common-2.1.0.jar" />
- <include name="**/eclipse/emf/ecore/2.1.0/ecore-2.1.0.jar" />
- <include name="**/eclipse/emf/ecore-change/2.1.0/ecore-change-2.1.0.jar" />
- <include name="**/eclipse/emf/ecore-sdo/2.1.1/ecore-sdo-2.1.1.jar" />
- <include name="**/eclipse/emf/ecore-xmi/2.1.0/ecore-xmi-2.1.0.jar" />
- <include name="**/eclipse/wtp/wsdl/1.0.0/wsdl-1.0.0.jar" />
- <include name="**/eclipse/xsd/xsd/2.1.1/xsd-2.1.1.jar" />
+ <include name="**/axis/axis/1.2.1/axis-1.2.1.jar" />
+ <include name="**/axis/axis-jaxrpc/1.2.1/axis-jaxrpc-1.2.1.jar" />
+ <include name="**/axis/axis-saaj/1.2.1/axis-saaj-1.2.1.jar" />
+ <include name="**/axis/axis-wsdl4j/1.5.1/axis-wsdl4j-1.5.1.jar" />
+
+ <include name="**/org/eclipse/emf/commonj-sdo/2.1.0/commonj-sdo-2.1.0.jar" />
+ <include name="**/org/eclipse/emf/common/2.1.0/common-2.1.0.jar" />
+
+ <include name="**/org/eclipse/emf/common/2.1.0/common-2.1.0.jar" />
+ <include name="**/org/eclipse/emf/ecore/2.1.0/ecore-2.1.0.jar" />
+ <include name="**/org/eclipse/emf/ecore-change/2.1.0/ecore-change-2.1.0.jar" />
+ <include name="**/org/eclipse/emf/ecore-sdo/2.1.1/ecore-sdo-2.1.1.jar" />
+ <include name="**/org/eclipse/emf/ecore-xmi/2.1.0/ecore-xmi-2.1.0.jar" />
+ <include name="**/org/eclipse/wtp/wsdl/1.0.0/wsdl-1.0.0.jar" />
+ <include name="**/org/eclipse/xsd/xsd/2.1.1/xsd-2.1.1.jar" />
- <include name="**/commons-logging/1.0.4/commons-logging-1.0.4.jar" />
- <include name="**/commons-discovery/0.2/commons-discovery-0.2.jar" />
+ <include name="**/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" />
+ <include name="**/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar" />
<!-- Kevin's mod to include Derby jar -->
- <include name="**/org/apache/derby/10.1.2.1/derby-10.1.2.1.jar" />
+ <include name="**/org.apache.derby/derby/10.1.2.1/derby-10.1.2.1.jar" />
</patternset>
<target name="tuscany.tomcat.unzipWindows" if="isWindows" depends='init,check.for.zip' description='Just unzip tomcat' unless='tomcat.is.available'>
@@ -133,7 +144,7 @@
<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}" />
@@ -144,7 +155,7 @@
</fileset>
<fileset dir="${tuscany.maven.repos.dir}">
<patternset>
- <include name="**/org/osoa/sca-api/${tuscany.acceptance.version}/sca-api-${tuscany.acceptance.version}.jar" />
+ <include name="**/org.osoa/jars/sca-api-${tuscany.acceptance.version}.jar" />
</patternset>
</fileset>
<fileset dir="${tuscany.maven.repos.dir}">
@@ -159,14 +170,7 @@
</target>
<target name="tuscany.deploy.samples" description='Deploy tuscany example wars to tomcat webapps.'>
- <copy todir="${tuscany.acceptance.tc.dir}/webapps" flatten="true">
- <!--
- rename the destination war files to avoid Tomcat deployer
- expanding the wars into directories that include the version
- string
- -->
- <mapper type="regexp" from="^(.*)tuscany-samples-(.+)-SNAPSHOT\.war" to="tuscany-samples-\2\.war" />
-
+ <copy todir="${tuscany.acceptance.tc.dir}/webapps" flatten='true'>
<fileset dir="${tuscany.acceptance.samples.dir}">
<include name="**/*.war" />
</fileset>
@@ -181,7 +185,7 @@
<target name="tuscany.tomcat.fixserverconfig" depends='tuscany.tomcat.fixserverxml,tuscany.tomcat.fixcontextxml' description='Add listeners' />
<target name="tuscany.tomcat.fixserverxml" depends='init,backup.server.xml' unless='tuscany.acceptance.tomcat.serverxmlorg.available'>
<property name="tuscany.acceptance.tomcat.serverxmlorg.available" value='true' />
-
+
<xslt
in="${tuscany.acceptance.tc.dir}/conf/server.xml.original"
style="server.xsl" out="${tuscany.acceptance.tc.dir}/conf/server.xml"
@@ -191,7 +195,7 @@
</target>
<target name="tuscany.tomcat.fixcontextxml" depends='init,backup.context.xml' unless='tuscany.acceptance.tomcat.contextxmlorg.available'>
<property name="tuscany.acceptance.tomcat.contextxmlorg.available" value='true' />
-
+
<xslt
in="${tuscany.acceptance.tc.dir}/conf/context.xml.original"
style="context.xsl" out="${tuscany.acceptance.tc.dir}/conf/context.xml"
@@ -199,7 +203,7 @@
</xslt>
</target>
-
+
<target name="startTomcatWindows" if="isWindows" unless='tuscany.tomcat.alreadystarted' >
<exec spawn='true' vmlauncher="false" failonerror='false' dir="${tuscany.acceptance.tc.dir}\bin" executable="cmd.exe" >
<arg line="/C start " Tomcat running ${tuscany.acceptance.tc.dir}" catalina run && exit" />
@@ -213,15 +217,15 @@
</target>
<target name="startTomcatMac" if="isMac" unless='tuscany.tomcat.alreadystarted' >
<antcall target="startTomcatUnix" /> <!--just use unix for now -->
-<!--
+<!--
<java classname="org.apache.catalina.startup.Bootstrap" fork="true" spawn='true' failonerror="false" maxmemory="65m" dir='E:\dev\beajanus\trunk\acceptance\target\apache-tomcat-5.5.12\bin'>
- <jvmarg value="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" />
- <jvmarg value="-Djava.util.logging.config.file=${catalina.base}\conf\logging.properties" />
- <jvmarg value="-Djava.endorsed.dirs=E:\dev\beajanus\trunk\acceptance\target\apache-tomcat-5.5.12\common\endorsed" />
- <jvmarg value="-Dcatalina.base=E:\dev\beajanus\trunk\acceptance\target\apache-tomcat-5.5.12" />
- <jvmarg value="-Djava.io.tmpdir=E:\dev\beajanus\trunk\acceptance\target\apache-tomcat-5.5.12\temp" />
- <jvmarg value="-D-Dcatalina.home=E:\dev\beajanus\trunk\acceptance\target\apache-tomcat-5.5.12" />
- <arg value="start"/>
+ <jvmarg value="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" />
+ <jvmarg value="-Djava.util.logging.config.file=${catalina.base}\conf\logging.properties" />
+ <jvmarg value="-Djava.endorsed.dirs=E:\dev\beajanus\trunk\acceptance\target\apache-tomcat-5.5.12\common\endorsed" />
+ <jvmarg value="-Dcatalina.base=E:\dev\beajanus\trunk\acceptance\target\apache-tomcat-5.5.12" />
+ <jvmarg value="-Djava.io.tmpdir=E:\dev\beajanus\trunk\acceptance\target\apache-tomcat-5.5.12\temp" />
+ <jvmarg value="-D-Dcatalina.home=E:\dev\beajanus\trunk\acceptance\target\apache-tomcat-5.5.12" />
+ <arg value="start"/>
<classpath>
<pathelement path="E:/bin/jdk1.5.0_05/lib/tools.jar:E:/dev/beajanus/trunk/acceptance/target/apache-tomcat-5.5.12\bin/bootstrap.jar"/>
@@ -239,7 +243,7 @@
<waitfor maxwait="12" maxwaitunit="second" checkevery="200">
<http url="http://localhost:8080"/>
</waitfor>
-
+
</target>
<target name="clean" description='Clean out all built artifacts'>
Modified: incubator/tuscany/java/testing/tomcat/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/testing/tomcat/pom.xml?rev=378141&r1=378140&r2=378141&view=diff
==============================================================================
--- incubator/tuscany/java/testing/tomcat/pom.xml (original)
+++ incubator/tuscany/java/testing/tomcat/pom.xml Wed Feb 15 18:11:20 2006
@@ -26,13 +26,21 @@
<name>Tuscany Testing in Tomcat</name>
<version>SNAPSHOT</version>
+
<modules>
- <module>helloworldweb</module>
+ <module>helloworldws</module>
<!--
- <module>bigbank</module>
<module>helloworldaxis</module>
+ these can't seem to run cause they need htmlunit and the dependencies download
+ seems broken for htmlunit
+ htmlunit:htmlunit:jar:1.7
+ dom4j:dom4j:jar:1.5
+ javax.xml:jsr173:jar:1.0 jar seems to be missing here http://www.ibiblio.org/maven2/javax/xml/jsr173/1.0/
+
+
+ <module>helloworldweb</module>
+ <module>bigbank</module>
<module>helloworldwebdas</module>
- <module>helloworldws</module>
-->
</modules>