jdcasey 2005/04/03 20:43:11
Modified:
sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/artifact/handler
EarHandler.java RarHandler.java TldHandler.java
SarHandler.java DtdHandler.java
sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/discover
ArtifactDiscoverer.java
LegacyArtifactDiscoverer.java
sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean
RepositoryCleaner.java
Log:
o Refined DirectoryScanner excludes
o Fixed some problems with version parsing from legacy repo searches.
o Added extension() method to artifact handlers used for conversions only
o Changed reports-directory layout to be less flat (faster to load on web
browser, etc.)
Revision Changes Path
1.2 +3 -3
maven-components/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/artifact/handler/EarHandler.java
Index: EarHandler.java
===================================================================
RCS file:
/home/cvs/maven-components/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/artifact/handler/EarHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EarHandler.java 2 Apr 2005 02:17:19 -0000 1.1
+++ EarHandler.java 4 Apr 2005 03:43:11 -0000 1.2
@@ -30,8 +30,8 @@
return "ears";
}
- public String packageGoal()
+ public String extension()
{
- return "ear:ear";
+ return "ear";
}
}
1.2 +3 -3
maven-components/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/artifact/handler/RarHandler.java
Index: RarHandler.java
===================================================================
RCS file:
/home/cvs/maven-components/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/artifact/handler/RarHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RarHandler.java 2 Apr 2005 02:17:19 -0000 1.1
+++ RarHandler.java 4 Apr 2005 03:43:11 -0000 1.2
@@ -30,8 +30,8 @@
return "rars";
}
- public String packageGoal()
+ public String extension()
{
- return "rar:rar";
+ return "rar";
}
}
1.2 +5 -5
maven-components/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/artifact/handler/TldHandler.java
Index: TldHandler.java
===================================================================
RCS file:
/home/cvs/maven-components/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/artifact/handler/TldHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TldHandler.java 2 Apr 2005 02:17:19 -0000 1.1
+++ TldHandler.java 4 Apr 2005 03:43:11 -0000 1.2
@@ -30,8 +30,8 @@
return "tlds";
}
-// public String packageGoal()
-// {
-// return "ejb:ejb";
-// }
+ public String extension()
+ {
+ return "tld";
+ }
}
1.2 +6 -1
maven-components/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/artifact/handler/SarHandler.java
Index: SarHandler.java
===================================================================
RCS file:
/home/cvs/maven-components/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/artifact/handler/SarHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SarHandler.java 2 Apr 2005 02:17:19 -0000 1.1
+++ SarHandler.java 4 Apr 2005 03:43:11 -0000 1.2
@@ -29,5 +29,10 @@
{
return "sars";
}
+
+ public String extension()
+ {
+ return "sar";
+ }
}
1.2 +5 -5
maven-components/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/artifact/handler/DtdHandler.java
Index: DtdHandler.java
===================================================================
RCS file:
/home/cvs/maven-components/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/artifact/handler/DtdHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DtdHandler.java 2 Apr 2005 02:17:19 -0000 1.1
+++ DtdHandler.java 4 Apr 2005 03:43:11 -0000 1.2
@@ -30,8 +30,8 @@
return "dtds";
}
-// public String packageGoal()
-// {
-// return "ejb:ejb";
-// }
+ public String extension()
+ {
+ return "dtd";
+ }
}
1.3 +3 -0
maven-components/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/discover/ArtifactDiscoverer.java
Index: ArtifactDiscoverer.java
===================================================================
RCS file:
/home/cvs/maven-components/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/discover/ArtifactDiscoverer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ArtifactDiscoverer.java 1 Apr 2005 00:24:44 -0000 1.2
+++ ArtifactDiscoverer.java 4 Apr 2005 03:43:11 -0000 1.3
@@ -37,6 +37,9 @@
"*/licenses/**",
"*/licences/**",
"**/.htaccess",
+ "**/*.html",
+ "**/*.asc",
+ "**/*.txt",
"**/REPOSITORY-V*.txt"
};
1.6 +12 -0
maven-components/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/discover/LegacyArtifactDiscoverer.java
Index: LegacyArtifactDiscoverer.java
===================================================================
RCS file:
/home/cvs/maven-components/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/discover/LegacyArtifactDiscoverer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LegacyArtifactDiscoverer.java 2 Apr 2005 02:17:19 -0000 1.5
+++ LegacyArtifactDiscoverer.java 4 Apr 2005 03:43:11 -0000 1.6
@@ -211,7 +211,19 @@
}
String artifactId = artifactIdBuffer.toString();
+
+ int lastVersionCharIdx = versionBuffer.length() -1;
+ if(lastVersionCharIdx > -1 &&
versionBuffer.charAt(lastVersionCharIdx) == '-')
+ {
+ versionBuffer.setLength(lastVersionCharIdx);
+ }
+
String version = versionBuffer.toString();
+
+ if(version.length() < 1)
+ {
+ version = null;
+ }
getLogger().debug(
"Extracted artifact information from path:\n" +
"groupId: \'" + groupId + "\'\n"
1.7 +11 -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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RepositoryCleaner.java 2 Apr 2005 02:17:19 -0000 1.6
+++ RepositoryCleaner.java 4 Apr 2005 03:43:11 -0000 1.7
@@ -189,10 +189,12 @@
{
Artifact artifact = (Artifact) it.next();
+ String artifactReportPath =
buildArtifactReportPath(artifact);
+
Reporter artifactReporter = null;
try
{
- artifactReporter = new Reporter( reportsBase,
artifact.getId().replace(':', '_') + ".report.txt" );
+ artifactReporter = new Reporter( reportsBase,
artifactReportPath );
boolean errorOccurred = false;
@@ -298,7 +300,7 @@
}
catch(Exception e)
{
- artifactReporter.error("Error while rewriting file or
POM for artifact: \'" + artifact.getId() + "\'", e);
+ artifactReporter.error("Error while rewriting file or
POM for artifact: \'" + artifact.getId() + "\'. See report at: \'" +
artifactReportPath + "\'.", e);
}
finally
{
@@ -318,6 +320,13 @@
}
}
+ private String buildArtifactReportPath( Artifact artifact )
+ {
+ String classifier = artifact.getClassifier();
+
+ return artifact.getGroupId().replace('.', '/') + "/" +
artifact.getArtifactId() + "/" + artifact.getType() + "/" + ((classifier !=
null)?(classifier + "-"):("")) + artifact.getVersion() + ".report.txt";
+ }
+
private void copyArtifact( Artifact artifact, File artifactTarget,
Reporter reporter )
throws IOException
{
