You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@excalibur.apache.org by le...@apache.org on 2004/07/17 04:43:06 UTC

svn commit: rev 22988 - excalibur/trunk/buildsystem

Author: leif
Date: Fri Jul 16 19:43:05 2004
New Revision: 22988

Modified:
   excalibur/trunk/buildsystem/maven.xml
Log:
Clean up the indentation.  No other changes.

Modified: excalibur/trunk/buildsystem/maven.xml
==============================================================================
--- excalibur/trunk/buildsystem/maven.xml	(original)
+++ excalibur/trunk/buildsystem/maven.xml	Fri Jul 16 19:43:05 2004
@@ -1,35 +1,35 @@
 <?xml version="1.0"?>
 <!--
- 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
+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.
 
-   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.
+See the License for the specific language governing permissions and
+limitations under the License.
 -->
 <project default="java:jar" xmlns:excalibur="excalibur" xmlns:deploy="deploy" xmlns:artifact="artifact" xmlns:maven="jelly:maven" xmlns:define="jelly:define" xmlns:j="jelly:core" xmlns:ant="jelly:ant">
-
+    
     <define:taglib uri="excalibur">
         <!--
-         @name the name of file to deploy
-         @dir the name of the directory the file lives in
-         @type the maven "type". Slightly different behaviour: if you want a trailing 's' you 
-               should add it (ie "jars" instead of "jar")
+        @name the name of file to deploy
+        @dir the name of the directory the file lives in
+        @type the maven "type". Slightly different behaviour: if you want a trailing 's' you 
+        should add it (ie "jars" instead of "jar")
         -->
         <define:tag name="deploy">
             <j:set var="pass" value='-i "${maven.repo.default.privatekey}"'/>
             <j:set var="acct" value="${maven.repo.default.username}@${maven.repo.default.host}"/>
             <j:set var="deployDir" value="${maven.repo.default.directory}/${pom.groupId}/${type}"/>
             <j:set var="grp" value="${maven.repo.default.group}"/>
-
+            
             <ant:exec dir="${dir}" executable="ssh" failonerror="true">
                 <ant:arg line="${pass} ${acct} 'mkdir -p ${deployDir}'"/>
             </ant:exec>
@@ -39,14 +39,14 @@
             <ant:exec dir="${dir}" executable="ssh" failonerror="true">
                 <ant:arg line="${pass} ${acct} 'chgrp -R ${grp} ${deployDir};chmod -R a+r ${deployDir}; chmod -R g+w ${deployDir}'"/>
             </ant:exec>
-	</define:tag>
-
+        </define:tag>
+        
         <!--
-         @name the name of file to deploy
-         @dir the name of the directory the file lives in
-         @linkname the name of the symlink
-         @type the maven "type". Slightly different behaviour: if you want a trailing 's' you 
-               should add it (ie "jars" instead of "jar")
+        @name the name of file to deploy
+        @dir the name of the directory the file lives in
+        @linkname the name of the symlink
+        @type the maven "type". Slightly different behaviour: if you want a trailing 's' you 
+        should add it (ie "jars" instead of "jar")
         -->
         <define:tag name="symlink">
             <j:set var="pass" value='-i "${maven.repo.default.privatekey}"'/>
@@ -54,25 +54,25 @@
             <j:set var="deployDir" value="${maven.repo.default.directory}/${pom.groupId}/${type}"/>
             <j:set var="symlinkDir" value="${maven.repo.default.directory}/${pom.groupId}"/>
             <j:set var="grp" value="${maven.repo.default.group}"/>
-
+            
             <ant:exec dir="${dir}" executable="ssh" failonerror="true">
                 <ant:arg line="${pass} ${acct} 'rm -f ${symlinkDir}/${linkname}; ln -s ${deployDir}/${name} ${symlinkDir}/${linkname}'"/>
             </ant:exec>
-	</define:tag>
-
+        </define:tag>
+        
         <!--
-         @name the name of file to gpg
-         @dir the name of the directory the file lives in
+        @name the name of file to gpg
+        @dir the name of the directory the file lives in
         -->
         <define:tag name="gpg">
             <ant:exec dir="${dir}" executable="gpg" failonerror="true">
                 <ant:arg line="--yes -v --output ${name}.asc --detach-sig --armor ${name}"/>
             </ant:exec>
         </define:tag>
-
+        
         
     </define:taglib>
-
+    
     <goal name="excalibur:tagRelease">
         <j:set var="repoBase" value="https://svn.apache.org/repos/asf/excalibur"/>
         <j:set var="tagName" value="${pom.artifactId}-${pom.currentVersion}-Release"/>
@@ -81,14 +81,14 @@
             <ant:arg line="copy -m &quot;${tagMsg}&quot; ${repoBase}/trunk ${repoBase}/tags/${tagName}"/>
         </ant:exec>
     </goal>
-
+    
     <postGoal name="dist:build-src">
         <excalibur:gpg name="${pom.artifactId}-${pom.currentVersion}-src.zip"
             dir="${maven.dist.dir}"/>
         <excalibur:gpg name="${pom.artifactId}-${pom.currentVersion}-src.tar.gz"
-             dir="${maven.dist.dir}"/>
+            dir="${maven.dist.dir}"/>
     </postGoal>
-
+    
     <postGoal name="dist:build-bin">
         <excalibur:gpg name="${pom.artifactId}-${pom.currentVersion}.zip"
             dir="${maven.dist.dir}"/>
@@ -97,7 +97,7 @@
         <excalibur:gpg name="${pom.artifactId}-${pom.currentVersion}.jar"
             dir="${maven.build.dir}"/>
     </postGoal>
-
+    
     <goal name="dist:deploy-src" prereqs="dist:build-src">
         <excalibur:deploy name="${pom.artifactId}-${pom.currentVersion}-src.zip"
             type="source" dir="${maven.dist.dir}"/>
@@ -107,7 +107,7 @@
             type="source" dir="${maven.dist.dir}"/>
         <excalibur:deploy name="${pom.artifactId}-${pom.currentVersion}-src.tar.gz.asc"
             type="source" dir="${maven.dist.dir}"/>
-
+        
         <excalibur:symlink name="${pom.artifactId}-${pom.currentVersion}-src.zip"
             linkname="${pom.artifactId}-current-src.zip" type="source" dir="${maven.dist.dir}"/>
         <excalibur:symlink name="${pom.artifactId}-${pom.currentVersion}-src.zip.asc"
@@ -117,7 +117,7 @@
         <excalibur:symlink name="${pom.artifactId}-${pom.currentVersion}-src.tar.gz.asc"
             linkname="${pom.artifactId}-current-src.tar.gz.asc" type="source" dir="${maven.dist.dir}"/>
     </goal>
-
+    
     <goal name="dist:deploy-bin" prereqs="dist:build-bin">
         <excalibur:deploy name="${pom.artifactId}-${pom.currentVersion}.zip"
             type="binaries" dir="${maven.dist.dir}"/>
@@ -127,12 +127,12 @@
             type="binaries" dir="${maven.dist.dir}"/>
         <excalibur:deploy name="${pom.artifactId}-${pom.currentVersion}.tar.gz.asc"
             type="binaries" dir="${maven.dist.dir}"/>
-
+        
         <excalibur:deploy name="${pom.artifactId}-${pom.currentVersion}.jar"
             type="jars" dir="${maven.build.dir}"/>
         <excalibur:deploy name="${pom.artifactId}-${pom.currentVersion}.jar.asc"
             type="jars" dir="${maven.build.dir}"/>
-
+        
         <excalibur:symlink name="${pom.artifactId}-${pom.currentVersion}.zip"
             linkname="${pom.artifactId}-current.zip" type="binaries" dir="${maven.dist.dir}"/>
         <excalibur:symlink name="${pom.artifactId}-${pom.currentVersion}.zip.asc"
@@ -141,37 +141,37 @@
             linkname="${pom.artifactId}-current.tar.gz" type="binaries" dir="${maven.dist.dir}"/>
         <excalibur:symlink name="${pom.artifactId}-${pom.currentVersion}.tar.gz.asc"
             linkname="${pom.artifactId}-current.tar.gz.asc" type="binaries" dir="${maven.dist.dir}"/>
-
+        
         <excalibur:symlink name="${pom.artifactId}-${pom.currentVersion}.jar"
             linkname="${pom.artifactId}-current.jar" type="jars" dir="${maven.build.dir}"/>
         <excalibur:symlink name="${pom.artifactId}-${pom.currentVersion}.jar.asc"
             linkname="${pom.artifactId}-current.jar.asc" type="jars" dir="${maven.build.dir}"/>
     </goal>
-
+    
     <goal name="excalibur:deploy">
         <maven:user-check user="${maven.username}"/>
-
+        
         <j:if test='${pom.getContext().getVariable("maven.privatekey") == null}'>
             <ant:fail>
                 User must specify -Dmaven.privatekey=X
             </ant:fail>
         </j:if>
-
+        
         <j:set var="user" value="${maven.username}"/>
         <j:set var="key" value="${maven.privatekey}"/>
         <j:set var="host" value="minotaur.apache.org"/>
         <j:set var="url" value="scp://${host}"/>
-
+        
         <j:set var="version" value="${pom.currentVersion}"/>
         <j:set var="isRC" value="${version.indexOf('RC') != '-1'}"/>
-
+        
         <j:if test="${isRC == true}">
             <j:set var="deployBase" value="/home/${user}/public_html/dist"/>
         </j:if>
         <j:if test="${isRC == false}">
             <j:set var="deployBase" value="/www/www.apache.org/dist/excalibur"/>
         </j:if>
-
+        
         ${pom.getContext().setVariable("maven.repo.list", "default")}
         ${pom.getContext().setVariable("maven.repo.default", url )}
         ${pom.getContext().setVariable("maven.repo.default.host", host)}
@@ -179,10 +179,10 @@
         ${pom.getContext().setVariable("maven.repo.default.group", "excalibur")}
         ${pom.getContext().setVariable("maven.repo.default.username", user)}
         ${pom.getContext().setVariable("maven.repo.default.privatekey", key)}
-
+        
         <attainGoal name="dist:deploy"/>
     </goal>
     
     <goal name="excalibur:release" prereqs="excalibur:deploy,excalibur:tagRelease"/>
-
+    
 </project>

---------------------------------------------------------------------
To unsubscribe, e-mail: scm-unsubscribe@excalibur.apache.org
For additional commands, e-mail: scm-help@excalibur.apache.org