[Yanel-commits] rev 21169 - in public/yanel/trunk/src/build: . targets

[michi at wyona.com]

Author: michi
Date: 2006-12-27 10:37:41 +0100 (Wed, 27 Dec 2006)
New Revision: 21169

Added:
   public/yanel/trunk/src/build/targets/install-tomcat.xml
Removed:
   public/yanel/trunk/src/build/install-tomcat.xml
Modified:
   public/yanel/trunk/src/build/build.xml
Log:
move install tomcat target into targets dir

Modified: public/yanel/trunk/src/build/build.xml
===================================================================
--- public/yanel/trunk/src/build/build.xml	2006-12-27 09:22:01 UTC (rev 21168)
+++ public/yanel/trunk/src/build/build.xml	2006-12-27 09:37:41 UTC (rev 21169)
@@ -16,7 +16,7 @@
 
   <import file="dependencies.xml"/>
   <import file="continuous-integration.xml"/>
-  <import file="install-tomcat.xml"/>
+  <import file="targets/install-tomcat.xml"/>
   <import file="targets/add-third-party-realm.xml"/>
   <import file="targets/create-new-resource.xml"/>
   

Deleted: public/yanel/trunk/src/build/install-tomcat.xml
===================================================================
--- public/yanel/trunk/src/build/install-tomcat.xml	2006-12-27 09:22:01 UTC (rev 21168)
+++ public/yanel/trunk/src/build/install-tomcat.xml	2006-12-27 09:37:41 UTC (rev 21169)
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="install-default-tomcat" default="install-default-tomcat" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-  <description>Install Default Tomcat</description>
-  
-  <target name="install-default-tomcat" description="Install Default Tomcat" depends="init" if="yes.install.default.tomcat">
-    <echo>Install Default Tomcat ...</echo>
-
-    <artifact:remoteRepository id="wyona.org.remote.repository" url="http://www.wyona.org/maven2/"/>
-
-    <artifact:dependencies pathId="maven2.tomcat.classpath" filesetId="maven2.tomcat.fileset">
-      <remoteRepository refid="wyona.org.remote.repository"/>
-      <dependency groupId="apache-org" artifactId="apache-tomcat" version="5.5.20" scope="provided"/>
-    </artifact:dependencies>
-
-    <mkdir dir="${yanel.home.dir}/local"/>
-    <unzip dest="${yanel.home.dir}/local">
-      <fileset refid="maven2.tomcat.fileset"/>
-    </unzip>
-    <delete dir="${yanel.home.dir}/local/META-INF"/>
-
-    <condition property="isJava1.4">
-      <equals arg1="${ant.java.version}" arg2="1.4"/>
-    </condition>
-    <antcall target="copy-java1.4-libs"/>
-    
-    <replace file="${yanel.home.dir}/src/build/local.build.properties" value="tomcat1.http.port=8080">
-      <replacetoken>#tomcat1.http.port=9190</replacetoken>
-    </replace>
-    <replace file="${yanel.home.dir}/src/build/local.build.properties" value="tomcat1.ssl.port=8443">
-      <replacetoken>#tomcat1.ssl.port=9143</replacetoken>
-    </replace>
-  </target>
-  
-  <target name="copy-java1.4-libs" if="isJava1.4" description="Copy jars specific to java 1.4" depends="init">
-    <copy file="${yanel.home.dir}/tools/apache-tomcat/java-1.4/apache-tomcat-5.5.20/bin/jmx.jar" todir="${default.tomcat.home.dir}/bin"/>
-  </target>
-    
-</project>

Copied: public/yanel/trunk/src/build/targets/install-tomcat.xml (from rev 21164, public/yanel/trunk/src/build/install-tomcat.xml)