brett 2004/04/20 18:03:25
Modified: jar plugin.properties
jar/xdocs changes.xml
repository plugin.jelly
repository/xdocs changes.xml
Removed: repository plugin.properties
Log:
PR: MPREPO-5
deprecate maven.repository.group and make maven.remote.group usage consistent.
maven.remote.group has been moved to maven's defaults.properties.
Revision Changes Path
1.10 +0 -1 maven-plugins/jar/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/jar/plugin.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- plugin.properties 10 Apr 2004 02:22:12 -0000 1.9
+++ plugin.properties 21 Apr 2004 01:03:25 -0000 1.10
@@ -24,4 +24,3 @@
maven.jar.excludes = **/package.html
maven.jar.index=false
maven.jar.compress=true
-maven.remote.group=maven
1.14 +1 -0 maven-plugins/jar/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/jar/xdocs/changes.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- changes.xml 15 Apr 2004 06:10:27 -0000 1.13
+++ changes.xml 21 Apr 2004 01:03:25 -0000 1.14
@@ -26,6 +26,7 @@
</properties>
<body>
<release version="1.5-SNAPSHOT" date="in CVS">
+ <action dev="brett" type="fix">move maven.remote.group to
default.properties</action>
<action dev="brett" type="fix" issue="MPJAR-22" due-to="Corey Jewett">improve
manifest generation</action>
<action dev="brett" type="fix" issue="MPJAR-17">revert maven.final.name to
previuous value after executing jar:snapshot related goals.</action>
</release>
1.25 +25 -6 maven-plugins/repository/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/repository/plugin.jelly,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- plugin.jelly 4 Mar 2004 18:38:44 -0000 1.24
+++ plugin.jelly 21 Apr 2004 01:03:25 -0000 1.25
@@ -87,6 +87,8 @@
<!-- copy the license -->
<j:set var="directory"
value="${maven.repo.central.directory}/${groupId}/licenses/" />
<repository:copy from="${localFileName}" toFileOrDir="${directory}" />
+
+ <repository:setGroup var="group" />
<!-- set permissions -->
<echo>Setting permissions and group ownership in ${directory}'</echo>
@@ -95,11 +97,24 @@
rm ${groupId}.license;
ln -s ${fileName} ${groupId}.license;
chmod -R g+w,a+r ${fileName};
- chgrp -R ${maven.repository.group} *;
+ chgrp -R ${group} *;
</repository:exec>
</define:tag>
<!--
+ ! Get the remote group into a variable from a property.
+ ! This can be removed and inlined once maven.repository.group is removed.
+ ! @param var the variable to place the filename into
+ !-->
+ <define:tag name="setGroup">
+ <j:set var="${var}" value="${maven.remote.group}" scope="parent" />
+ <j:if test="${context.getVariable('maven.repository.group') != null}">
+ <ant:echo>DEPRECATED: please use maven.remote.group instead of
maven.repository.group</ant:echo>
+ <j:set var="${var}" value="${maven.repository.group}" scope="parent" />
+ </j:if>
+ </define:tag>
+
+ <!--
! place the file name portion of a url into a variable
! @param url the URL to process
! @param var the variable to place the filename into
@@ -180,8 +195,9 @@
<j:set var="directory"
value="${maven.repo.central.directory}/${group.text}/${directoryName}" />
<echo>Ensuring directory '${directory}' exists</echo>
+ <repository:setGroup var="group" />
<repository:exec
- command="mkdir -p ${directory};chmod g+ws ${directory};chgrp
${maven.repository.group} ${directory};" />
+ command="mkdir -p ${directory};chmod g+ws ${directory};chgrp ${group}
${directory};" />
</j:if>
</x:forEach>
</goal>
@@ -322,10 +338,11 @@
<maven:param-check value="${groupId}" fail="true" message="'groupId' must be
specified"/>
+ <repository:setGroup var="group" />
<repository:exec>
cd ${maven.repo.central.directory};
mkdir ${groupId};
- chgrp ${maven.repository.group} ${groupId};
+ chgrp ${group} ${groupId};
chmod g+s ${groupId};
mkdir ${groupId}/distributions;
mkdir ${groupId}/jars;
@@ -373,12 +390,13 @@
<j:set var="artifactName">${artifactFile.canonicalFile.name}</j:set>
<echo>Setting up SNAPSHOT entries</echo>
+ <repository:setGroup var="group" />
<repository:exec>
cd ${directory};
ln -sf ${artifactName} ${artifactId}-SNAPSHOT.jar;
ln -sf ${artifactName}.md5 ${artifactId}-SNAPSHOT.jar.md5;
echo ${snapshotVersion} | tee ${artifactId}-snapshot-version;
- chgrp ${maven.repository.group} ${artifactId}-SNAPSHOT.jar*;
+ chgrp ${group} ${artifactId}-SNAPSHOT.jar*;
chmod g+w,a+r ${artifactId}-SNAPSHOT.jar*;
</repository:exec>
</goal>
@@ -408,7 +426,8 @@
<maven:param-check value="${type}" fail="true" message="'type' must be
specified" />
<j:set var="directory"
value="${maven.repo.central.directory}/${groupId}/${type}s/" />
- <repository:exec command="mkdir -p ${directory}; chmod g+ws ${directory}; chgrp
${maven.repository.group} ${directory}"/>
+ <repository:setGroup var="group" />
+ <repository:exec command="mkdir -p ${directory}; chmod g+ws ${directory}; chgrp
${group} ${directory}"/>
<repository:copy from="${artifact}" toFileOrDir="${directory}" />
<u:file name="${artifact}" var="artifactFile"/>
@@ -417,7 +436,7 @@
<repository:exec>
cd ${directory};
md5sum ${artifactName} | sed 's/ .*$//' | tee ${artifactName}.md5;
- chgrp ${maven.repository.group} *;
+ chgrp ${group} *;
chmod g+w,a+r *;
</repository:exec>
</goal>
1.7 +3 -0 maven-plugins/repository/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/repository/xdocs/changes.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- changes.xml 10 Mar 2004 14:16:46 -0000 1.6
+++ changes.xml 21 Apr 2004 01:03:25 -0000 1.7
@@ -24,6 +24,9 @@
<author email="[EMAIL PROTECTED]">dIon Gillard</author>
</properties>
<body>
+ <release version="1.2-SNAPSHOT" date="in CVS">
+ <action dev="brett" issue="MPREPO-5" type="update">Deprecate
maven.repository.group, use maven.remote.group instead</action>
+ </release>
<release version="1.1" date="2004-03-11"></release>
<release version="1.0" date="2003-09-29">
<action dev="dion" type="add">Added repository:copy-jar</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
