jdcasey 2005/04/20 14:51:25
Modified: sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean
RepositoryCleaner.java
sandbox/repoclean/src/main/bash repoclean.sh
sandbox/repoclean install.sh
Log:
o Fixed problem causing commons-logging-1.0.4 not to get copied over...
NOTE: There still may be a problem with invalid XML in the pom. There is a
bad <resources/> specification in the build section that I had to remove.
PR: MNG-328
Revision Changes Path
1.14 +7 -2
maven-components/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/RepositoryCleaner.java
Index: RepositoryCleaner.java
===================================================================
RCS file:
/home/cvs/maven-components/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/RepositoryCleaner.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- RepositoryCleaner.java 19 Apr 2005 20:05:15 -0000 1.13
+++ RepositoryCleaner.java 20 Apr 2005 21:51:25 -0000 1.14
@@ -29,6 +29,7 @@
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.context.Context;
+import org.codehaus.plexus.context.ContextException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.mailsender.MailMessage;
@@ -350,6 +351,11 @@
}
}
+ else if( !targetMissingOrOlder )
+ {
+ artifactReporter.warn( "Target file for artifact is
present and not stale. (Artifact: \'" + artifact.getId()
+ + "\' in path: \'" +
artifactSource + "\' with target path: " + artifactTarget + ")." );
+ }
else
{
artifactReporter.error( "Cannot find source file for
artifact: \'" + artifact.getId()
@@ -500,8 +506,7 @@
return reportsBase;
}
- public void contextualize( Context context )
- throws Exception
+ public void contextualize( Context context ) throws ContextException
{
this.container = (PlexusContainer) context.get(
PlexusConstants.PLEXUS_KEY );
}
1.7 +7 -10
maven-components/sandbox/repoclean/src/main/bash/repoclean.sh
Index: repoclean.sh
===================================================================
RCS file:
/home/cvs/maven-components/sandbox/repoclean/src/main/bash/repoclean.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- repoclean.sh 6 Apr 2005 20:15:07 -0000 1.6
+++ repoclean.sh 20 Apr 2005 21:51:25 -0000 1.7
@@ -1,16 +1,13 @@
#!/bin/bash
CP=./lib/repoclean-1.0-SNAPSHOT.jar
-CP=$CP:./lib/plexus-container-default-1.0-alpha-2.jar
-CP=$CP:./lib/plexus-utils-1.0-alpha-2.jar
-CP=$CP:./lib/plexus-mail-sender-api-1.0-alpha-1-SNAPSHOT.jar
-CP=$CP:./lib/plexus-mail-sender-simple-1.0-alpha-1-SNAPSHOT.jar
-CP=$CP:./lib/classworlds-1.1-alpha-1.jar
-CP=$CP:./lib/maven-artifact-2.0-SNAPSHOT.jar
-CP=$CP:./lib/maven-model-2.0-SNAPSHOT.jar
-CP=$CP:./lib/wagon-provider-api-1.0-alpha-2.jar
-CP=$CP:./lib/wagon-file-1.0-alpha-2.jar
-CP=$CP:./lib/wagon-http-lightweight-1.0-alpha-2.jar
+
+for lib in `ls -1 ./lib | grep -v 'repoclean'`
+do
+
+ CP=$CP:./lib/$lib
+
+done
cygwin=false
case "`uname`" in
1.6 +22 -4 maven-components/sandbox/repoclean/install.sh
Index: install.sh
===================================================================
RCS file: /home/cvs/maven-components/sandbox/repoclean/install.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- install.sh 6 Apr 2005 20:15:07 -0000 1.5
+++ install.sh 20 Apr 2005 21:51:25 -0000 1.6
@@ -37,15 +37,33 @@
echo ""
cp -f target/repoclean-1.0-SNAPSHOT.jar $1/lib
+
cp -f
$2/plexus/plexus-container-default/1.0-alpha-2/plexus-container-default-1.0-alpha-2.jar
$1/lib
+
cp -f $2/plexus/plexus-utils/1.0-alpha-2/plexus-utils-1.0-alpha-2.jar
$1/lib
- cp -f
$2/plexus/plexus-mail-sender-api/1.0-alpha-1-SNAPSHOT/plexus-mail-sender-api-1.0-alpha-1-SNAPSHOT.jar
$1/lib
- cp -f
$2/plexus/plexus-mail-sender-simple/1.0-alpha-1-SNAPSHOT/plexus-mail-sender-simple-1.0-alpha-1-SNAPSHOT.jar
$1/lib
+
+ version=`cat
$2/plexus/plexus-mail-sender-api/1.0-alpha-1-SNAPSHOT/plexus-mail-sender-api-1.0-alpha-1-SNAPSHOT.version.txt`
+ cp -f
$2/plexus/plexus-mail-sender-api/1.0-alpha-1-SNAPSHOT/plexus-mail-sender-api-$version.jar
$1/lib
+ version="ERROR-IN-SCRIPT"
+
+ version=`cat
$2/plexus/plexus-mail-sender-simple/1.0-alpha-1-SNAPSHOT/plexus-mail-sender-simple-1.0-alpha-1-SNAPSHOT.version.txt`
+ cp -f
$2/plexus/plexus-mail-sender-simple/1.0-alpha-1-SNAPSHOT/plexus-mail-sender-simple-$version.jar
$1/lib
+ version="ERROR-IN-SCRIPT"
+
cp -f $2/classworlds/classworlds/1.1-alpha-1/classworlds-1.1-alpha-1.jar
$1/lib
- cp -f
$2/org/apache/maven/maven-artifact/2.0-SNAPSHOT/maven-artifact-2.0-SNAPSHOT.jar
$1/lib
- cp -f
$2/org/apache/maven/maven-model/2.0-SNAPSHOT/maven-model-2.0-SNAPSHOT.jar $1/lib
+
+ version=`cat
$2/org/apache/maven/maven-artifact/2.0-SNAPSHOT/maven-artifact-2.0-SNAPSHOT.version.txt`
+ cp -f
$2/org/apache/maven/maven-artifact/2.0-SNAPSHOT/maven-artifact-$version.jar
$1/lib
+ version="ERROR-IN-SCRIPT"
+
+ version=`cat
$2/org/apache/maven/maven-model/2.0-SNAPSHOT/maven-model-2.0-SNAPSHOT.version.txt`
+ cp -f
$2/org/apache/maven/maven-model/2.0-SNAPSHOT/maven-model-$version.jar $1/lib
+ version="ERROR-IN-SCRIPT"
+
cp -f
$2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-2/wagon-provider-api-1.0-alpha-2.jar
$1/lib
+
cp -f
$2/org/apache/maven/wagon/wagon-file/1.0-alpha-2/wagon-file-1.0-alpha-2.jar
$1/lib
+
cp -f
$2/org/apache/maven/wagon/wagon-http-lightweight/1.0-alpha-2/wagon-http-lightweight-1.0-alpha-2.jar
$1/lib
echo "Copying startup script, and changing its permissions to '+x'..."
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
