continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r915579 - in /continuum/branches/continuum-1.3.x/continuum-buildagent: continuum-buildagent-core/src/main/resources/META-INF/ continuum-buildagent-jetty/ continuum-buildagent-webapp/ continuum-buildagent-webapp/src/appserver-base/conf/ cont...
Date Tue, 23 Feb 2010 23:11:25 GMT
Author: ctan
Date: Tue Feb 23 23:11:25 2010
New Revision: 915579

URL: http://svn.apache.org/viewvc?rev=915579&view=rev
Log:
use appserver.base instead of CONTINUUM_BUILDAGENT_HOME and use target/data for the working
directory and build output directory when running mvn jetty:run from webapp
merge -r 904327 of trunk


Added:
    continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/src/test/
    continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/src/test/tomcat/
    continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/src/test/tomcat/tomcat-context-continuum-buildagent.xml
Modified:
    continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/resources/META-INF/spring-context.xml
    continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-jetty/pom.xml
    continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/pom.xml
    continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/src/appserver-base/conf/continuum-buildagent.xml
    continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/src/main/resources/log4j.xml

Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/resources/META-INF/spring-context.xml?rev=915579&r1=915578&r2=915579&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/resources/META-INF/spring-context.xml
(original)
+++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/resources/META-INF/spring-context.xml
Tue Feb 23 23:11:25 2010
@@ -36,7 +36,7 @@
   
   <bean id="buildAgentConfiguration" class="org.apache.continuum.buildagent.configuration.DefaultBuildAgentConfiguration"
      init-method="initialize">
-    <property name="configurationFile" value="file:${CONTINUUM_BUILDAGENT_HOME}/conf/continuum-buildagent.xml"
/>
+    <property name="configurationFile" value="file:${appserver.base}/conf/continuum-buildagent.xml"
/>
   </bean>
 </beans>
 	
\ No newline at end of file

Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-jetty/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-jetty/pom.xml?rev=915579&r1=915578&r2=915579&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-jetty/pom.xml
(original)
+++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-jetty/pom.xml
Tue Feb 23 23:11:25 2010
@@ -129,7 +129,7 @@
               <jvmSettings>
                 <systemProperties>
                   <systemProperty>appserver.home=.</systemProperty>
-                  <systemProperty>CONTINUUM_BUILDAGENT_HOME=%CONTINUUM_BUILDAGENT_BASE%</systemProperty>
+                  <systemProperty>appserver.base=%CONTINUUM_BUILDAGENT_BASE%</systemProperty>
                   <systemProperty>jetty.logs=%CONTINUUM_BUILDAGENT_BASE%/logs</systemProperty>
                   <systemProperty>java.io.tmpdir=%CONTINUUM_BUILDAGENT_BASE%/tmp</systemProperty>
                 </systemProperties>

Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/pom.xml?rev=915579&r1=915578&r2=915579&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/pom.xml
(original)
+++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/pom.xml
Tue Feb 23 23:11:25 2010
@@ -130,17 +130,6 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-clean-plugin</artifactId>
-        <configuration>
-          <filesets>
-            <fileset>
-              <directory>${basedir}/data</directory>
-            </fileset>
-          </filesets>
-        </configuration>
-      </plugin>
-      <plugin>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>maven-jetty-plugin</artifactId>
         <configuration>
@@ -157,13 +146,25 @@
           </connectors>
           <systemProperties>
             <systemProperty>
-              <name>CONTINUUM_BUILDAGENT_HOME</name>
+              <name>appserver.base</name>
               <value>${project.build.directory}/appserver-base</value>
             </systemProperty>
           </systemProperties>
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>tomcat-maven-plugin</artifactId>
+        <configuration>
+          <path>/continuum-buildagent</path>
+          <port>9191</port>
+          <contextFile>${basedir}/src/test/tomcat/tomcat-context-continuum.xml</contextFile>
+          <systemProperties>
+            <appserver.base>${project.build.directory}/appserver-base</appserver.base>
+          </systemProperties>          
+        </configuration>
+      </plugin>
+      <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <execution>

Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/src/appserver-base/conf/continuum-buildagent.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/src/appserver-base/conf/continuum-buildagent.xml?rev=915579&r1=915578&r2=915579&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/src/appserver-base/conf/continuum-buildagent.xml
(original)
+++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/src/appserver-base/conf/continuum-buildagent.xml
Tue Feb 23 23:11:25 2010
@@ -20,6 +20,6 @@
 
 <continuum-buildagent-configuration>
   <continuumServerUrl>http://localhost:9090/master-xmlrpc</continuumServerUrl>
-  <buildOutputDirectory>data/build-output-directory</buildOutputDirectory>
-  <workingDirectory>data/working-directory</workingDirectory>
+  <buildOutputDirectory>target/data/build-agent/build-output-directory</buildOutputDirectory>
+  <workingDirectory>target/data/build-agent/working-directory</workingDirectory>
 </continuum-buildagent-configuration>
\ No newline at end of file

Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/src/main/resources/log4j.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/src/main/resources/log4j.xml?rev=915579&r1=915578&r2=915579&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/src/main/resources/log4j.xml
(original)
+++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/src/main/resources/log4j.xml
Tue Feb 23 23:11:25 2010
@@ -3,7 +3,7 @@
 
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
   <appender name="rolling" class="org.apache.log4j.DailyRollingFileAppender">
-    <param name="file" value="${CONTINUUM_BUILDAGENT_HOME}/logs/continuum-buildagent.log"
/>
+    <param name="file" value="${appserver.base}/logs/continuum-buildagent.log" />
     <param name="append" value="true" />
     <param name="datePattern" value="'.'yyyy-MM-dd" />
     <layout class="org.apache.log4j.PatternLayout">

Added: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/src/test/tomcat/tomcat-context-continuum-buildagent.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/src/test/tomcat/tomcat-context-continuum-buildagent.xml?rev=915579&view=auto
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/src/test/tomcat/tomcat-context-continuum-buildagent.xml
(added)
+++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/src/test/tomcat/tomcat-context-continuum-buildagent.xml
Tue Feb 23 23:11:25 2010
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+  <Context path="/continuum" />
+  
\ No newline at end of file



Mime
View raw message