Menu
▾
▴
[Drawbridge-developers] SF.net SVN: drawbridge: [39] trunk/drawbridge
|
From: <bla...@us...> - 2008-04-19 23:16:04
|
Revision: 39
http://drawbridge.svn.sourceforge.net/drawbridge/?rev=39&view=rev
Author: blamonica
Date: 2008-04-19 16:16:00 -0700 (Sat, 19 Apr 2008)
Log Message:
-----------
Please put the database setup in the servers context.xml.
Got cruise working.
Modified Paths:
--------------
trunk/drawbridge/WebContent/META-INF/context.xml
trunk/drawbridge/src/canoo/build.xml
trunk/drawbridge/src/cruise/config.xml
trunk/drawbridge/src/cruise/cruise-build.xml
Modified: trunk/drawbridge/WebContent/META-INF/context.xml
===================================================================
--- trunk/drawbridge/WebContent/META-INF/context.xml 2008-04-17 00:54:37 UTC (rev 38)
+++ trunk/drawbridge/WebContent/META-INF/context.xml 2008-04-19 23:16:00 UTC (rev 39)
@@ -1,9 +1,4 @@
<Context docBase="drawbridge" path="/drawbridge" reloadable="true" source="org.eclipse.jst.jee.server:drawbridge">
- <Resource name="jdbc/DrawbridgeDataSource" auth="Container" type="javax.sql.DataSource"
- maxActive="100" maxIdle="30" maxWait="10000"
- username="drawbridge_user" password="drawbridge" driverClassName="com.mysql.jdbc.Driver"
- url="jdbc:mysql://localhost:3306/drawbridge"/>
-
</Context>
Modified: trunk/drawbridge/src/canoo/build.xml
===================================================================
--- trunk/drawbridge/src/canoo/build.xml 2008-04-17 00:54:37 UTC (rev 38)
+++ trunk/drawbridge/src/canoo/build.xml 2008-04-19 23:16:00 UTC (rev 39)
@@ -4,7 +4,7 @@
This is a (nearly) empty WebTest project containing just a few examples for a quick start
-->
-<project name="example" default="wt.full">
+<project name="drawbridge.webtest" default="wt.full">
<property environment="env"/>
@@ -13,12 +13,15 @@
<import file="definitions.xml" description="Import custom definitions (if any)"/>
<import file="${webtest.home}/webtest.xml" description="Import all functionalities for a full build"/>
- <property name="wt.testInWork" value="tests/allTests.xml"/>
+ <property name="wt.testInWork" value="${basedir}}/tests/allTests.xml"/>
-<!--
+ <!-- run in headless mode -->
+ <property name="wt.headless" value="true"/>
+
+ <!--
Activate this if you are behind a proxy and want to test a server outside your local network
See http://ant.apache.org/manual/OptionalTasks/setproxy.html
<setproxy proxyhost="myProxy" proxyport="1234"/>
--->
+ -->
</project>
Modified: trunk/drawbridge/src/cruise/config.xml
===================================================================
--- trunk/drawbridge/src/cruise/config.xml 2008-04-17 00:54:37 UTC (rev 38)
+++ trunk/drawbridge/src/cruise/config.xml 2008-04-19 23:16:00 UTC (rev 39)
@@ -1,3 +1,42 @@
<cruisecontrol>
+ <project name="drawbridge" buildafterfailed="true">
+ <property file="email.properties"/>
+ <listeners>
+ <currentbuildstatuslistener file="logs/drawbridge/buildstatus.txt"/>
+ </listeners>
+ <bootstrappers>
+ </bootstrappers>
+
+ <!-- Defines where cruise looks for changes, to decide whether to run the build -->
+ <modificationset quietperiod="10">
+ <svn localworkingcopy="checkout/drawbridge"/>
+ </modificationset>
+
+ <!-- Configures the actual build loop, how often and which build file/target -->
+ <schedule interval="60">
+ <ant antscript="/usr/bin/ant"
+ buildfile="cruise-build.xml"
+ target="all"
+ uselogger="true"
+ usedebug="false"/>
+ </schedule>
+
+ <!-- directory to write build logs to -->
+ <log dir="logs/drawbridge"/>
+
+ <!-- Publishers are run *after* a build completes -->
+ <publishers>
+ <currentbuildstatuspublisher file="logs/drawbridge/buildstatus.txt"/>
+ <email mailhost="${email.host}" mailport="${email.port}"
+ returnaddress="${email.returnaddress}" username="${email.username}"
+ password="${email.password}" usessl="${email.ssl}"
+ buildresultsurl="http://pojo.is-a-geek.net:8751/cc/buildresults/drawbridge"
+ skipusers="true" spamwhilebroken="false">
+ <always address="ben...@gm..."/>
+ <!--always address="dra...@li..."/-->
+ </email>
+ </publishers>
+
+ </project>
</cruisecontrol>
Modified: trunk/drawbridge/src/cruise/cruise-build.xml
===================================================================
--- trunk/drawbridge/src/cruise/cruise-build.xml 2008-04-17 00:54:37 UTC (rev 38)
+++ trunk/drawbridge/src/cruise/cruise-build.xml 2008-04-19 23:16:00 UTC (rev 39)
@@ -1,7 +1,7 @@
<project name="drawbridge" default="all" basedir=".">
<property file="./db.properties"/>
- <target name="all" depends="sync,build,reset.database,deploy"/>
+ <target name="all" depends="sync,build,reset.database,deploy,webtest"/>
<target name="sync">
<exec executable="svn">
@@ -12,7 +12,7 @@
</target>
<target name="build">
- <ant dir="checkout/drawbridge" antfile="build.xml" inheritall="false"/>
+ <ant dir="checkout/drawbridge" antfile="build.xml" inheritall="false"/>
</target>
<target name="reset.database">
@@ -27,7 +27,18 @@
</exec>
</target>
+ <property name="tomcat.webapps" value="/opt/tomcat6/webapps"/>
+
<target name="deploy">
- <copy tofile="/opt/tomcat6/webapps/drawbridge.war" file="checkout/drawbridge/target/drawbridge.war"/>
+ <echo>Deploying drawbridge to local tomcat.</echo>
+ <delete dir="${tomcat.webapps}/drawbridge.war"/>
+ <delete dir="${tomcat.webapps}/drawbridge"/>
+ <copy tofile="${tomcat.webapps}/drawbridge.war" file="checkout/drawbridge/target/drawbridge.war"/>
</target>
+
+ <target name="webtest">
+ <echo>Sleeping for 10 seconds so that tomcat deploys correctly.</echo>
+ <sleep seconds="10"/>
+ <ant dir="checkout/drawbridge" antfile="build.xml" inheritall="false" target="webtest"/>
+ </target>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
