portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r513125 - /portals/jetspeed-2/trunk/installer/maven.xml
Date Thu, 01 Mar 2007 03:50:58 GMT
Author: ate
Date: Wed Feb 28 19:50:58 2007
New Revision: 513125

URL: http://svn.apache.org/viewvc?view=rev&rev=513125
Log:
cleanup formatting

Modified:
    portals/jetspeed-2/trunk/installer/maven.xml

Modified: portals/jetspeed-2/trunk/installer/maven.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer/maven.xml?view=diff&rev=513125&r1=513124&r2=513125
==============================================================================
--- portals/jetspeed-2/trunk/installer/maven.xml (original)
+++ portals/jetspeed-2/trunk/installer/maven.xml Wed Feb 28 19:50:58 2007
@@ -1,195 +1,194 @@
 <!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed 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.
-
+  Copyright 2004 The Apache Software Foundation
+  
+  Licensed 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.
+  
   $Id$
 -->
-<project default="all"
-         xmlns:j="jelly:core"
-         xmlns:maven="jelly:maven"
-         xmlns:u="jelly:util"
-         xmlns:ant="jelly:ant">
-         
+<project default="all" xmlns:j="jelly:core" xmlns:maven="jelly:maven" xmlns:u="jelly:util"
xmlns:ant="jelly:ant">
+
   <goal name="j2.plugin.properties">
     <!-- Setting up Jetspeed-2 maven plugin required properties specifically for generating
the installer portal -->
-    
-    <j:set var="org.apache.jetspeed.portal.home" value="${basedir}"/>
-    <j:set var="org.apache.jetspeed.server.home" value="${maven.build.dir}/tomcat"/>
-    <j:set var="org.apache.jetspeed.catalina.version.major" value="5.5"/>
-    <j:set var="org.apache.jetspeed.server.shared" value="${maven.build.dir}/tomcat/shared/lib"/>
-    <j:set var="org.apache.jetspeed.deploy.war.dir" value="${maven.build.dir}/tomcat/webapps"/>
-    <j:set var="org.apache.jetspeed.services.autodeployment.server" value="localhost"/>
-    <j:set var="org.apache.jetspeed.services.autodeployment.port" value="8080"/>
-    <j:set var="org.apache.jetspeed.services.autodeployment.user" value="j2deployer"/>
-    <j:set var="org.apache.jetspeed.services.autodeployment.password" value="j2deployer"/>
+
+    <j:set var="org.apache.jetspeed.portal.home" value="${basedir}" />
+    <j:set var="org.apache.jetspeed.server.home" value="${maven.build.dir}/tomcat" />
+    <j:set var="org.apache.jetspeed.catalina.version.major" value="5.5" />
+    <j:set var="org.apache.jetspeed.server.shared" value="${maven.build.dir}/tomcat/shared/lib"
/>
+    <j:set var="org.apache.jetspeed.deploy.war.dir" value="${maven.build.dir}/tomcat/webapps"
/>
+    <j:set var="org.apache.jetspeed.services.autodeployment.server" value="localhost"
/>
+    <j:set var="org.apache.jetspeed.services.autodeployment.port" value="8080" />
+    <j:set var="org.apache.jetspeed.services.autodeployment.user" value="j2deployer" />
+    <j:set var="org.apache.jetspeed.services.autodeployment.password" value="j2deployer"
/>
   </goal>
-  
+
   <goal name="buildInstaller" prereqs="j2.plugin.properties">
-    <maven:property name="build_type" defaultValue="minimal"/>
-    <attainGoal name="clean"/>
-    
-     <mkdir dir="${basedir}/resources"/>
-		<get usetimestamp="true" dest="${basedir}/resources/tomcat-5.5.20.zip" src="http://www.bluesunrise.com/maven/tomcat/dist/tomcat-5.5.20.zip"
/>
-		<get usetimestamp="true" dest="${basedir}/resources/tomcat-5.5.20-compat.zip" src="http://www.bluesunrise.com/maven/tomcat/dist/tomcat-5.5.20-compat.zip"
/>
-
-		<unzip src="${basedir}/resources/tomcat-5.5.20.zip" dest="${maven.build.dir}/tomcat"
/>
-		<unzip src="${basedir}/resources/tomcat-5.5.20-compat.zip" dest="${maven.build.dir}/tomcat-compat"
/>	
-		
-		<delete dir="${maven.build.dir}/tomcat/webapps"/>
-		
-		<copy todir="${maven.build.dir}/tomcat" overwrite="true">
-		  <fileset dir="${basedir}/etc/tomcat"/>
-		</copy>
-		
-		<mkdir dir="${maven.build.dir}/tomcat/webapps/jetspeed"/>
-		
-    <attainGoal name="j2:portal.copy.webapp"/>
-    <attainGoal name="j2:portal.conf.ojb"/>
-    <attainGoal name="j2:portal.conf.jetspeed"/>
-   
+    <maven:property name="build_type" defaultValue="minimal" />
+    <attainGoal name="clean" />
+
+    <mkdir dir="${basedir}/resources" />
+    <get usetimestamp="true" dest="${basedir}/resources/tomcat-5.5.20.zip"
+      src="http://www.bluesunrise.com/maven/tomcat/dist/tomcat-5.5.20.zip" />
+    <get usetimestamp="true" dest="${basedir}/resources/tomcat-5.5.20-compat.zip"
+      src="http://www.bluesunrise.com/maven/tomcat/dist/tomcat-5.5.20-compat.zip" />
+
+    <unzip src="${basedir}/resources/tomcat-5.5.20.zip" dest="${maven.build.dir}/tomcat"
/>
+    <unzip src="${basedir}/resources/tomcat-5.5.20-compat.zip" dest="${maven.build.dir}/tomcat-compat"
/>
+
+    <delete dir="${maven.build.dir}/tomcat/webapps" />
+
+    <copy todir="${maven.build.dir}/tomcat" overwrite="true">
+      <fileset dir="${basedir}/etc/tomcat" />
+    </copy>
+
+    <mkdir dir="${maven.build.dir}/tomcat/webapps/jetspeed" />
+
+    <attainGoal name="j2:portal.copy.webapp" />
+    <attainGoal name="j2:portal.conf.ojb" />
+    <attainGoal name="j2:portal.conf.jetspeed" />
+
     <move todir="${maven.build.dir}/tomcat/webapps/jetspeed">
-      <fileset dir="${maven.build.dir}/jetspeed"/>
+      <fileset dir="${maven.build.dir}/jetspeed" />
     </move>
-    
+
     <mkdir dir="${maven.build.dir}/database" />
     <copy todir="${maven.build.dir}/database/lib">
-			<fileset dir="${maven.repo.local}/tyrex/jars/">
-				<include name="tyrex-1.0.1.jar" />
-			</fileset>
-			<fileset dir="${maven.repo.local}/${org.apache.jetspeed.portal.groupId}/jars/">
-				<include name="ant-tasks-${jetspeed.version}.jar" />
-			</fileset>
+      <fileset dir="${maven.repo.local}/tyrex/jars/">
+        <include name="tyrex-1.0.1.jar" />
+      </fileset>
+      <fileset dir="${maven.repo.local}/${org.apache.jetspeed.portal.groupId}/jars/">
+        <include name="ant-tasks-${jetspeed.version}.jar" />
+      </fileset>
     </copy>
 
-    <copy file="${basedir}/../etc/sql/drop.sql" todir="${maven.build.dir}/database"/>
+    <copy file="${basedir}/../etc/sql/drop.sql" todir="${maven.build.dir}/database" />
     <copy todir="${maven.build.dir}/database/derby">
-        <fileset dir="${basedir}/../etc/sql/derby/schema"/>
-     </copy>
-     <j:set var="org.apache.jetspeed.production.database.default.name" value="mysql"/>
-    <attainGoal name="j2:portal.conf.sql"/>
+      <fileset dir="${basedir}/../etc/sql/derby/schema" />
+    </copy>
+    <j:set var="org.apache.jetspeed.production.database.default.name" value="mysql" />
+    <attainGoal name="j2:portal.conf.sql" />
+    <j:choose>
+      <j:when test="${build_type=='minimal'}">
+        <copy todir="${maven.build.dir}/database">
+          <fileset dir="${maven.build.dir}/portal-sql/min" includes="j2-seed.xml" />
+        </copy>
+      </j:when>
+      <j:otherwise>
+        <copy todir="${maven.build.dir}/database">
+          <fileset dir="${maven.build.dir}/portal-sql" includes="j2-seed.xml" />
+        </copy>
+      </j:otherwise>
+    </j:choose>
+    <copy todir="${maven.build.dir}/database/mysql">
+      <fileset dir="${maven.build.dir}/portal-sql/mysql/schema" excludes="*.generation,*.map"
/>
+    </copy>
+    <j:set var="org.apache.jetspeed.production.database.default.name" value="mssql" />
+    <attainGoal name="j2:portal.conf.sql" />
+    <copy todir="${maven.build.dir}/database/mssql">
+      <fileset dir="${maven.build.dir}/portal-sql/mssql/schema" excludes="*.generation,*.map"
/>
+    </copy>
+    <j:set var="org.apache.jetspeed.production.database.default.name" value="oracle" />
+    <attainGoal name="j2:portal.conf.sql" />
+    <copy todir="${maven.build.dir}/database/oracle">
+      <fileset dir="${maven.build.dir}/portal-sql/oracle/schema" excludes="*.generation,*.map"
/>
+    </copy>
+    <j:set var="org.apache.jetspeed.production.database.default.name" value="db2" />
+    <attainGoal name="j2:portal.conf.sql" />
+    <copy todir="${maven.build.dir}/database/db2">
+      <fileset dir="${maven.build.dir}/portal-sql/db2/schema" excludes="*.generation,*.map"
/>
+    </copy>
+    <j:set var="org.apache.jetspeed.production.database.default.name" value="sapdb" />
+    <attainGoal name="j2:portal.conf.sql" />
+    <copy todir="${maven.build.dir}/database/sapdb">
+      <fileset dir="${maven.build.dir}/portal-sql/sapdb/schema" excludes="*.generation,*.map"
/>
+    </copy>
+    <j:set var="org.apache.jetspeed.production.database.default.name" value="postgres"
/>
+    <attainGoal name="j2:portal.conf.sql" />
+    <copy todir="${maven.build.dir}/database/postgres">
+      <fileset dir="${maven.build.dir}/portal-sql/postgres/schema" excludes="*.generation,*.map"
/>
+    </copy>
+
+    <filter token="CONTEXT" value="jetspeed" />
+    <copy file="${basedir}/../etc/conf/tomcat/jetspeed-tomcat-5.5.xml" tofile="${maven.build.dir}/database/jetspeed.xml"
+      filtering="true" />
+
+    <attainGoal name="j2:copy.shared.deps" />
+    <attainGoal name="j2:pam.layoutdeploy" />
+    <attainGoal name="j2:pam.admindeploy" />
+
     <j:choose>
       <j:when test="${build_type=='minimal'}">
-        <copy todir="${maven.build.dir}/database" >
-          <fileset dir="${maven.build.dir}/portal-sql/min" includes="j2-seed.xml"/>
-       </copy>
-     </j:when>
-     <j:otherwise>
-        <copy todir="${maven.build.dir}/database" >
-          <fileset dir="${maven.build.dir}/portal-sql" includes="j2-seed.xml"/>
-       </copy>
-     </j:otherwise>
-    </j:choose> 
-    <copy todir="${maven.build.dir}/database/mysql" >
-        <fileset dir="${maven.build.dir}/portal-sql/mysql/schema" excludes="*.generation,*.map"/>
-     </copy> 
-     <j:set var="org.apache.jetspeed.production.database.default.name" value="mssql"/>
-    <attainGoal name="j2:portal.conf.sql"/>  
-    <copy todir="${maven.build.dir}/database/mssql" >
-        <fileset dir="${maven.build.dir}/portal-sql/mssql/schema" excludes="*.generation,*.map"/>
-     </copy> 
-     <j:set var="org.apache.jetspeed.production.database.default.name" value="oracle"/>
-    <attainGoal name="j2:portal.conf.sql"/>  
-    <copy todir="${maven.build.dir}/database/oracle" >
-        <fileset dir="${maven.build.dir}/portal-sql/oracle/schema" excludes="*.generation,*.map"/>
-     </copy> 
-     <j:set var="org.apache.jetspeed.production.database.default.name" value="db2"/>
-    <attainGoal name="j2:portal.conf.sql"/>  
-    <copy todir="${maven.build.dir}/database/db2" >
-        <fileset dir="${maven.build.dir}/portal-sql/db2/schema" excludes="*.generation,*.map"/>
-     </copy> 
-     <j:set var="org.apache.jetspeed.production.database.default.name" value="sapdb"/>
-    <attainGoal name="j2:portal.conf.sql"/>  
-    <copy todir="${maven.build.dir}/database/sapdb" >
-        <fileset dir="${maven.build.dir}/portal-sql/sapdb/schema" excludes="*.generation,*.map"/>
-     </copy> 
-     <j:set var="org.apache.jetspeed.production.database.default.name" value="postgres"/>
-    <attainGoal name="j2:portal.conf.sql"/>  
-    <copy todir="${maven.build.dir}/database/postgres" >
-        <fileset dir="${maven.build.dir}/portal-sql/postgres/schema" excludes="*.generation,*.map"/>
-     </copy> 
-
-     <filter token="CONTEXT" value="jetspeed"/>
-     <copy file="${basedir}/../etc/conf/tomcat/jetspeed-tomcat-5.5.xml" tofile="${maven.build.dir}/database/jetspeed.xml"
filtering="true"/>
-
-      <attainGoal name="j2:copy.shared.deps"/>
-      <attainGoal name="j2:pam.layoutdeploy"/>
-      <attainGoal name="j2:pam.admindeploy"/>
-      
+        <delete dir="${maven.build.dir}/tomcat/webapps/jetspeed/WEB-INF/pages" />
+        <move todir="${maven.build.dir}/tomcat/webapps/jetspeed/WEB-INF/pages">
+          <fileset dir="${maven.build.dir}/tomcat/webapps/jetspeed/WEB-INF/min-pages"
/>
+        </move>
+      </j:when>
+      <j:otherwise>
+        <delete dir="${maven.build.dir}/tomcat/webapps/jetspeed/WEB-INF/min-pages" />
+        <attainGoal name="j2:pam.demodeploy" />
+        <attainGoal name="j2:pam.jsfdeploy" />
+        <attainGoal name="j2:pam.rssdeploy" />
+        <attainGoal name="j2:pam.jpetstoredeploy" />
+      </j:otherwise>
+    </j:choose>
+
+    <zip file="${maven.build.dir}/installpack.zip">
+      <zipfileset dir="${maven.build.dir}/tomcat" prefix="portal" excludes="shared/lib/derby*"
/>
+      <zipfileset dir="${maven.build.dir}/tomcat-compat" prefix="jdk14" />
+      <zipfileset dir="${maven.build.dir}/database" prefix="database" />
+    </zip>
+
     <j:choose>
       <j:when test="${build_type=='minimal'}">
-	      <delete dir="${maven.build.dir}/tomcat/webapps/jetspeed/WEB-INF/pages"/>
-	      <move todir="${maven.build.dir}/tomcat/webapps/jetspeed/WEB-INF/pages">
-	        <fileset dir="${maven.build.dir}/tomcat/webapps/jetspeed/WEB-INF/min-pages"/>
-	      </move>
+        <j:set var="build_name" value="" />
       </j:when>
       <j:otherwise>
-	      <delete dir="${maven.build.dir}/tomcat/webapps/jetspeed/WEB-INF/min-pages"/>
-        <attainGoal name="j2:pam.demodeploy"/>
-        <attainGoal name="j2:pam.jsfdeploy"/>
-        <attainGoal name="j2:pam.rssdeploy"/>
-        <attainGoal name="j2:pam.jpetstoredeploy"/>
+        <j:set var="build_name" value="-demo" />
       </j:otherwise>
     </j:choose>
-      
-		  <zip file="${maven.build.dir}/installpack.zip">
-  			<zipfileset dir="${maven.build.dir}/tomcat" prefix="portal" excludes="shared/lib/derby*"/>
-  			<zipfileset dir="${maven.build.dir}/tomcat-compat" prefix="jdk14"/>
-  			<zipfileset dir="${maven.build.dir}/database" prefix="database"/>
-      </zip>
-      
-      <j:choose>
-         <j:when test="${build_type=='minimal'}">
-           <j:set var="build_name" value=""/>
-         </j:when>
-        <j:otherwise>
-           <j:set var="build_name" value="-demo"/>
-        </j:otherwise>
-      </j:choose>
-      
-		  <jar file="${maven.build.dir}/jetspeed-${jetspeed.version}${build_name}-installer.jar"
compress="true">
-			<manifest>
-				<attribute name="Manifest-Version" value="1.0" />
-				<attribute name="Main-Class" value="org.tp23.antinstaller.selfextract.SelfExtractor"
/>
-				<attribute name="Look-And-Feel" value="org.tp23.jgoodies.plaf.plastic.PlasticXPLookAndFeel"
/>
-			</manifest>
-			<zipgroupfileset dir="${basedir}/etc/ant-installer/lib" includes="*.jar" />
-			<fileset dir="${basedir}/etc/ant-installer">
-				<include name="resources/*" prefix="resources"/>
-				<include name="license/*"/>
-				<include name="build.xml"/>
-				<include name="$antinstall-config{build_name}.xml"/>
-			</fileset>
-			<fileset dir="${maven.build.dir}/tomcat/shared/lib">
-				<include name="derby*"/>
-			</fileset>
-			<fileset dir="${maven.build.dir}">
-				<include name="installpack.zip"/>
-			</fileset>
-			<fileset dir="${basedir}/..">
-				<include name="LICENSE.TXT"/>
-			</fileset>
-		</jar>
-      
+
+    <jar file="${maven.build.dir}/jetspeed-${jetspeed.version}${build_name}-installer.jar"
compress="true">
+      <manifest>
+        <attribute name="Manifest-Version" value="1.0" />
+        <attribute name="Main-Class" value="org.tp23.antinstaller.selfextract.SelfExtractor"
/>
+        <attribute name="Look-And-Feel" value="org.tp23.jgoodies.plaf.plastic.PlasticXPLookAndFeel"
/>
+      </manifest>
+      <zipgroupfileset dir="${basedir}/etc/ant-installer/lib" includes="*.jar" />
+      <fileset dir="${basedir}/etc/ant-installer">
+        <include name="resources/*" prefix="resources" />
+        <include name="license/*" />
+        <include name="build.xml" />
+        <include name="$antinstall-config{build_name}.xml" />
+      </fileset>
+      <fileset dir="${maven.build.dir}/tomcat/shared/lib">
+        <include name="derby*" />
+      </fileset>
+      <fileset dir="${maven.build.dir}">
+        <include name="installpack.zip" />
+      </fileset>
+      <fileset dir="${basedir}/..">
+        <include name="LICENSE.TXT" />
+      </fileset>
+    </jar>
+
   </goal>
-  
+
   <goal name="build">
-    <attainGoal name="buildInstaller"/>
+    <attainGoal name="buildInstaller" />
   </goal>
 
   <goal name="buildDemo">
-    <j:set var="build_type" value="demo"/>
-    <attainGoal name="buildInstaller"/>
+    <j:set var="build_type" value="demo" />
+    <attainGoal name="buildInstaller" />
   </goal>
 
 </project>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message