You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2006/05/16 08:07:50 UTC
svn commit: r406850 - in /incubator/tuscany/java:
distribution/tomcat-overlay/configureTomcat.xml
distribution/tomcat-overlay/datasource.xsl sampleapps/pom.xml samples/pom.xml
Author: jsdelfino
Date: Mon May 15 23:07:49 2006
New Revision: 406850
URL: http://svn.apache.org/viewcvs?rev=406850&view=rev
Log:
Fix for TUSCANY-364, automated configuration of datasource for DAS sample deployed to binary distribution
Added:
incubator/tuscany/java/distribution/tomcat-overlay/datasource.xsl
Modified:
incubator/tuscany/java/distribution/tomcat-overlay/configureTomcat.xml
incubator/tuscany/java/sampleapps/pom.xml
incubator/tuscany/java/samples/pom.xml
Modified: incubator/tuscany/java/distribution/tomcat-overlay/configureTomcat.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/distribution/tomcat-overlay/configureTomcat.xml?rev=406850&r1=406849&r2=406850&view=diff
==============================================================================
--- incubator/tuscany/java/distribution/tomcat-overlay/configureTomcat.xml (original)
+++ incubator/tuscany/java/distribution/tomcat-overlay/configureTomcat.xml Mon May 15 23:07:49 2006
@@ -44,6 +44,10 @@
<property name="tuscany.acceptance.tc.dir" value='${tuscany.acceptance.target.dir}/apache-tomcat-${tuscany.acceptance.tomcat.version}' />
+ <!-- KJW define property for the complete path of apache dir -->
+ <property name="fullpath.tuscany.acceptance.tc.dir" value= '${tuscany.acceptance.tc.dir}' />
+
+
<property name="tuscany.acceptance.groupId" value='org/apache/tuscany' />
<property name="tuscany.acceptance.version" value='incubating-M1' />
@@ -64,6 +68,10 @@
<property name="tuscany.acceptance.sca.samples.dir" value='../../samples' />
<property name="tuscany.acceptance.samples.dir" value='../../sampleapps' />
<property name="tuscany.acceptance.interop.dir" value='../../testing/interop' />
+
+ <!--KJW Define location of canned Derby database -->
+ <property name="tuscany.acceptance.das.samples.companyweb.dir" value='../../samples/das/companyweb' />
+
<!-- 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' />
@@ -193,7 +201,7 @@
<!-- just use unix for now -->
</target>
- <target name="prepareTomcat" depends='tuscany.tomcat.unzipWindows,tuscany.tomcat.unzipUnix,tuscany.tomcat.unzipMac,tuscany.tomcat.fixup,tuscany.deploy.samples,tuscany.deploy.interop' description='Unzip tomcat, fix it up, and deploy samples'>
+ <target name="prepareTomcat" depends='tuscany.tomcat.unzipWindows,tuscany.tomcat.unzipUnix,tuscany.tomcat.unzipMac,tuscany.tomcat.fixup,tuscany.deploy.samples,tuscany.deploy.interop,tuscany.deploy.das.standalone' 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}" />
@@ -276,6 +284,22 @@
</fileset>
</copy>
</target>
+
+ <!-- DAS standalone target -->
+ <target name="tuscany.deploy.das.standalone" description='Deploy DAS stand alone sample to tomcat.'>
+
+
+ <!-- Create directory for the derby database -->
+ <property name="tuscany.acceptance.target.databases.dir" value='${tuscany.acceptance.tc.dir}/Databases' />
+ <mkdir dir="${tuscany.acceptance.target.databases.dir}" />
+
+ <!-- Copy over the Derby database -->
+ <copy todir="${tuscany.acceptance.target.databases.dir}">
+ <fileset dir="${tuscany.acceptance.das.samples.companyweb.dir}">
+ <include name="**/dastest/**" />
+ </fileset>
+ </copy>
+ </target>
<!-- provide a convenient -Djava.ext.dirs= to run j2se samples -->
<target name="j2se" description='create a java extensions directory to run J2SE tuscany applications.'>
@@ -321,9 +345,20 @@
<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 processor="trax" in="${tuscany.acceptance.tc.dir}/conf/server.xml.original" style="server.xsl" out="${tuscany.acceptance.tc.dir}/conf/server.xml">
+ <!-- KJW save results to server_temp.xml -->
+ <xslt processor="trax"
+ in="${tuscany.acceptance.tc.dir}/conf/server.xml.original"
+ style="server.xsl"
+ out="${tuscany.acceptance.tc.dir}/conf/server_temp.xml">
+ </xslt>
+
+ <!--KJW modify server.xml to include derby database resource -->
+ <echo level="info" message="Running datasource.xsl" />
+ <xslt processor="trax"
+ in="${tuscany.acceptance.tc.dir}/conf/server_temp.xml" style="datasource.xsl" out="${tuscany.acceptance.tc.dir}/conf/server.xml">
+ <param name="database_location" expression="jdbc:derby:${fullpath.tuscany.acceptance.tc.dir}/Databases/dastest"/>
+ </xslt>
- </xslt>
<!-- echo message='${user.home}/.axis2/axis2.xml '/ -->
<!-- copy file='axis2.xml' tofile='${user.home}/.axis2/axis2.xml' / -->
</target>
Added: incubator/tuscany/java/distribution/tomcat-overlay/datasource.xsl
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/distribution/tomcat-overlay/datasource.xsl?rev=406850&view=auto
==============================================================================
--- incubator/tuscany/java/distribution/tomcat-overlay/datasource.xsl (added)
+++ incubator/tuscany/java/distribution/tomcat-overlay/datasource.xsl Mon May 15 23:07:49 2006
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
+
+<xsl:output method="xml" indent="yes"/>
+
+ <xsl:param name="database_location"/>
+
+<!--Add derby database resource-->
+<xsl:template match="GlobalNamingResources">
+
+ <xsl:copy>
+ <!--Copy existing-->
+ <xsl:apply-templates select="@* | node()" />
+
+ <xsl:comment> Global Datasource for Derby dastest database </xsl:comment>
+ <xsl:text>
+ </xsl:text>
+ <!--Append this-->
+ <Resource name="jdbc/dastest"
+ type="javax.sql.DataSource" auth="Container"
+ description="Derby database for DAS Company sample"
+ maxActive="100" maxIdle="30" maxWait="10000"
+ username="" password=""
+ driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
+ url="{$database_location}"/>
+
+ </xsl:copy>
+
+</xsl:template>
+
+<!--Copy everything!-->
+<xsl:template match="node() | @*">
+ <xsl:copy>
+ <xsl:apply-templates select="@* | node()" />
+ </xsl:copy>
+</xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
Modified: incubator/tuscany/java/sampleapps/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sampleapps/pom.xml?rev=406850&r1=406849&r2=406850&view=diff
==============================================================================
--- incubator/tuscany/java/sampleapps/pom.xml (original)
+++ incubator/tuscany/java/sampleapps/pom.xml Mon May 15 23:07:49 2006
@@ -28,7 +28,67 @@
<name>Tuscany Scenario Samples</name>
<version>incubating-M1</version>
+ <prerequisites>
+ <maven>2.0</maven>
+ </prerequisites>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <repositories>
+ <repository>
+ <id>ibiblio</id>
+ <name>ibiblio</name>
+ <url>http://www.ibiblio.org/maven2</url>
+ </repository>
+ </repositories>
+
<modules>
<module>bigbank</module>
</modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.componentType</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+
+ <testResources>
+ <testResource>
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**/*.componentType</include>
+ </includes>
+ </testResource>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ </testResources>
+ <defaultGoal>install</defaultGoal>
+
+ </build>
+
</project>
Modified: incubator/tuscany/java/samples/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/pom.xml?rev=406850&r1=406849&r2=406850&view=diff
==============================================================================
--- incubator/tuscany/java/samples/pom.xml (original)
+++ incubator/tuscany/java/samples/pom.xml Mon May 15 23:07:49 2006
@@ -15,11 +15,6 @@
* limitations under the License.
-->
<project>
- <parent>
- <groupId>org.apache.tuscany</groupId>
- <artifactId>tuscany-project</artifactId>
- <version>incubating-M1</version>
- </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tuscany.samples</groupId>
<artifactId>tuscany-samples</artifactId>
@@ -27,8 +22,68 @@
<name>Tuscany Samples</name>
<version>incubating-M1</version>
+ <prerequisites>
+ <maven>2.0</maven>
+ </prerequisites>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <repositories>
+ <repository>
+ <id>ibiblio</id>
+ <name>ibiblio</name>
+ <url>http://www.ibiblio.org/maven2</url>
+ </repository>
+ </repositories>
+
<modules>
<module>das</module>
<module>sca</module>
</modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.componentType</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+
+ <testResources>
+ <testResource>
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**/*.componentType</include>
+ </includes>
+ </testResource>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ </testResources>
+ <defaultGoal>install</defaultGoal>
+
+ </build>
+
</project>