You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@excalibur.apache.org by fa...@apache.org on 2005/04/06 22:01:47 UTC
svn commit: r160321 - in excalibur/trunk: README.txt buildsystem/maven.xml
Author: farra
Date: Wed Apr 6 13:01:44 2005
New Revision: 160321
URL: http://svn.apache.org/viewcvs?view=rev&rev=160321
Log:
Added proxy support to maven.xml get commands and updated README to list necessary remote maven repositories
Modified:
excalibur/trunk/README.txt
excalibur/trunk/buildsystem/maven.xml
Modified: excalibur/trunk/README.txt
URL: http://svn.apache.org/viewcvs/excalibur/trunk/README.txt?view=diff&r1=160320&r2=160321
==============================================================================
--- excalibur/trunk/README.txt (original)
+++ excalibur/trunk/README.txt Wed Apr 6 13:01:44 2005
@@ -10,10 +10,15 @@
maven multiproject:install
-you might need to download and install a few jars by hand, in particular, the following:
+You will need to add the following to your list of remote repositories in
+your Maven build.properties in your home directory:
+
+ maven.repo.remote=http://ibiblio.org/maven,http://www.apache.org/dist/java-repository,http://svn.apache.org/repos/asf/excalibur/repository
+
+You might need to download and install a few jars by hand, in particular, the following:
jsse-1.0.3_03 (groupid: jsse)
-
+
Logkit and Excalibur-Logger use the geronimo-spec JMS and JavaMail jars for
building and testing. For production use, developers should download the JMS
and JavaMail dependencies from Sun.
Modified: excalibur/trunk/buildsystem/maven.xml
URL: http://svn.apache.org/viewcvs/excalibur/trunk/buildsystem/maven.xml?view=diff&r1=160320&r2=160321
==============================================================================
--- excalibur/trunk/buildsystem/maven.xml (original)
+++ excalibur/trunk/buildsystem/maven.xml Wed Apr 6 13:01:44 2005
@@ -16,12 +16,12 @@
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
+ @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">
@@ -29,7 +29,7 @@
<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>
@@ -40,12 +40,12 @@
<ant:arg line="${pass} ${acct} 'chgrp -R ${grp} ${deployDir};chmod -R a+r ${deployDir}; chmod -R g+w ${deployDir}'"/>
</ant:exec>
</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
+ @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">
@@ -54,12 +54,12 @@
<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>
-
+
<!--
@name the name of file to gpg
@dir the name of the directory the file lives in
@@ -69,27 +69,30 @@
<ant:arg line="--yes -v --output ${name}.asc --detach-sig --armor ${name}"/>
</ant:exec>
</define:tag>
-
+
<define:tag name="get-license-bin">
+ <setproxy proxyhost="${maven.proxy.host}" proxyport="${maven.proxy.port}"/>
<ant:mkdir dir="${maven.dist.bin.assembly.dir}"/>
<ant:get src="http://svn.apache.org/repos/asf/excalibur/trunk/LICENSE.txt" dest="${maven.dist.bin.assembly.dir}/LICENSE.txt"/>
<ant:get src="http://svn.apache.org/repos/asf/excalibur/trunk/NOTICE.txt" dest="${maven.dist.bin.assembly.dir}/NOTICE.txt"/>
</define:tag>
-
+
<define:tag name="get-license-src">
+ <setproxy proxyhost="${maven.proxy.host}" proxyport="${maven.proxy.port}"/>
<ant:mkdir dir="${maven.dist.src.assembly.dir}"/>
<ant:get src="http://svn.apache.org/repos/asf/excalibur/trunk/LICENSE.txt" dest="${maven.dist.src.assembly.dir}/LICENSE.txt"/>
<ant:get src="http://svn.apache.org/repos/asf/excalibur/trunk/NOTICE.txt" dest="${maven.dist.src.assembly.dir}/NOTICE.txt"/>
</define:tag>
-
+
<define:tag name="get-license-jar">
+ <setproxy proxyhost="${maven.proxy.host}" proxyport="${maven.proxy.port}"/>
<ant:mkdir dir="${maven.build.dest}/META-INF"/>
<ant:get src="http://svn.apache.org/repos/asf/excalibur/trunk/LICENSE.txt" dest="${maven.build.dest}/META-INF/LICENSE.txt"/>
<ant:get src="http://svn.apache.org/repos/asf/excalibur/trunk/NOTICE.txt" dest="${maven.build.dest}/META-INF/NOTICE.txt"/>
</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"/>
@@ -102,22 +105,22 @@
<preGoal name="dist:build-src">
<excalibur:get-license-src/>
</preGoal>
-
+
<preGoal name="dist:build-bin">
<excalibur:get-license-bin/>
</preGoal>
-
+
<preGoal name="jar:jar">
<excalibur:get-license-jar/>
</preGoal>
-
+
<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}"/>
</postGoal>
-
+
<postGoal name="dist:build-bin">
<excalibur:gpg name="${pom.artifactId}-${pom.currentVersion}.zip"
dir="${maven.dist.dir}"/>
@@ -126,7 +129,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}"/>
@@ -136,7 +139,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"
@@ -146,7 +149,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}"/>
@@ -156,12 +159,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"
@@ -170,37 +173,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' || version.indexOf('dev') != '-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)}
@@ -208,10 +211,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
whitespace changes in commits
Posted by Leo Simons <ma...@leosimons.com>.
Hi gang,
Time for a subversion tip!
I've been seeing a whole lot of changes like the below. What happens is that
someone's editor strips out trailing whitespace (or adds it or whatever) and
then the diff gets a whole lot bigger than before. This makes diffs harder
to read and more importantly makes it a whole lot harder to do merging of
different source trees at some later point in the feature. Having recently
been through several such ordeals, I tell you, I know :-D
One common strategy here (if you can't configure your editor to stop this
kind of automatic reformatting) is to open up a file, have your editor
reformat, and commit with a message stating "whitespace" or similar. Then,
you make the actual changes and commit once more.
An alternative strategy can be to have a pre-commit tool that normalizes
source code formatting that developers run prior to commits, but since the
bunch of us are using a variety of OSes and environments in addition to a
variety of file formats that's kinda hard to get right :-D
Cheers!
LSD
On 06-04-2005 22:01, "farra@apache.org" <fa...@apache.org> wrote:
<snip/>
> Modified: excalibur/trunk/buildsystem/maven.xml
> URL:
> http://svn.apache.org/viewcvs/excalibur/trunk/buildsystem/maven.xml?view=diff&
> r1=160320&r2=160321
> ==============================================================================
> --- excalibur/trunk/buildsystem/maven.xml (original)
> +++ excalibur/trunk/buildsystem/maven.xml Wed Apr 6 13:01:44 2005
> @@ -16,12 +16,12 @@
> 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
> + @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">
> @@ -29,7 +29,7 @@
> <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}"/>
> -
> +
<snip/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@excalibur.apache.org
For additional commands, e-mail: dev-help@excalibur.apache.org