You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gump.apache.org by bo...@apache.org on 2010/06/30 16:50:51 UTC
svn commit: r959336 - in
/gump/mvnrepo/trunk/src/java/org/apache/gump/mvnrepoproxy: Constants.java
Main.java resources/TestsJar.java resources/TestsJarChecksum.java
restlets/ArtifactAdder.java
Author: bodewig
Date: Wed Jun 30 14:50:51 2010
New Revision: 959336
URL: http://svn.apache.org/viewvc?rev=959336&view=rev
Log:
quick hack to add support for -tests.jar artifacts
Added:
gump/mvnrepo/trunk/src/java/org/apache/gump/mvnrepoproxy/resources/TestsJar.java
- copied, changed from r959332, gump/mvnrepo/trunk/src/java/org/apache/gump/mvnrepoproxy/resources/Jar.java
gump/mvnrepo/trunk/src/java/org/apache/gump/mvnrepoproxy/resources/TestsJarChecksum.java
- copied, changed from r959332, gump/mvnrepo/trunk/src/java/org/apache/gump/mvnrepoproxy/resources/JarChecksum.java
Modified:
gump/mvnrepo/trunk/src/java/org/apache/gump/mvnrepoproxy/Constants.java
gump/mvnrepo/trunk/src/java/org/apache/gump/mvnrepoproxy/Main.java
gump/mvnrepo/trunk/src/java/org/apache/gump/mvnrepoproxy/restlets/ArtifactAdder.java
Modified: gump/mvnrepo/trunk/src/java/org/apache/gump/mvnrepoproxy/Constants.java
URL: http://svn.apache.org/viewvc/gump/mvnrepo/trunk/src/java/org/apache/gump/mvnrepoproxy/Constants.java?rev=959336&r1=959335&r2=959336&view=diff
==============================================================================
--- gump/mvnrepo/trunk/src/java/org/apache/gump/mvnrepoproxy/Constants.java (original)
+++ gump/mvnrepo/trunk/src/java/org/apache/gump/mvnrepoproxy/Constants.java Wed Jun 30 14:50:51 2010
@@ -41,6 +41,11 @@ public interface Constants {
String JAR_TYPE = ".jar";
/**
+ * Artifact Type for tests jars.
+ */
+ String TESTS_JAR_TYPE = "-tests.jar";
+
+ /**
* Artifact Type for POMs.
*/
String POM_TYPE = ".pom";
@@ -77,6 +82,19 @@ public interface Constants {
= POM_ARTIFACT_TEMPLATE + ".{" + CS_ALGORITHM + "}";
/**
+ * URL template that matches requests for tests jars by mvn
+ */
+ String TESTS_JAR_ARTIFACT_TEMPLATE
+ = "/{" + GROUP_ID + "}/{" + ARTIFACT_ID + "}/{version}/{jarname}"
+ + TESTS_JAR_TYPE;
+
+ /**
+ * URL template that matches requests for checksums of tests jars by mvn
+ */
+ String TESTS_JAR_CHECKSUM_ARTIFACT_TEMPLATE
+ = TESTS_JAR_ARTIFACT_TEMPLATE + ".{" + CS_ALGORITHM + "}";
+
+ /**
* parameter representing the filename
*/
String FILE_NAME = "file";
Modified: gump/mvnrepo/trunk/src/java/org/apache/gump/mvnrepoproxy/Main.java
URL: http://svn.apache.org/viewvc/gump/mvnrepo/trunk/src/java/org/apache/gump/mvnrepoproxy/Main.java?rev=959336&r1=959335&r2=959336&view=diff
==============================================================================
--- gump/mvnrepo/trunk/src/java/org/apache/gump/mvnrepoproxy/Main.java (original)
+++ gump/mvnrepo/trunk/src/java/org/apache/gump/mvnrepoproxy/Main.java Wed Jun 30 14:50:51 2010
@@ -26,6 +26,8 @@ import org.apache.gump.mvnrepoproxy.reso
import org.apache.gump.mvnrepoproxy.resources.LogFile;
import org.apache.gump.mvnrepoproxy.resources.POM;
import org.apache.gump.mvnrepoproxy.resources.POMChecksum;
+import org.apache.gump.mvnrepoproxy.resources.TestsJar;
+import org.apache.gump.mvnrepoproxy.resources.TestsJarChecksum;
import org.apache.gump.mvnrepoproxy.restlets.ArtifactAdder;
import org.apache.gump.mvnrepoproxy.restlets.Proxy;
import org.apache.gump.mvnrepoproxy.restlets.Stop;
@@ -139,6 +141,11 @@ public class Main {
}
private static void attachResources(Router router, String prefix) {
+ attachResource(router, prefix, Constants.TESTS_JAR_ARTIFACT_TEMPLATE,
+ TestsJar.class);
+ attachResource(router, prefix,
+ Constants.TESTS_JAR_CHECKSUM_ARTIFACT_TEMPLATE,
+ TestsJarChecksum.class);
attachResource(router, prefix, Constants.JAR_ARTIFACT_TEMPLATE,
Jar.class);
attachResource(router, prefix, Constants.JAR_CHECKSUM_ARTIFACT_TEMPLATE,
Copied: gump/mvnrepo/trunk/src/java/org/apache/gump/mvnrepoproxy/resources/TestsJar.java (from r959332, gump/mvnrepo/trunk/src/java/org/apache/gump/mvnrepoproxy/resources/Jar.java)
URL: http://svn.apache.org/viewvc/gump/mvnrepo/trunk/src/java/org/apache/gump/mvnrepoproxy/resources/TestsJar.java?p2=gump/mvnrepo/trunk/src/java/org/apache/gump/mvnrepoproxy/resources/TestsJar.java&p1=gump/mvnrepo/trunk/src/java/org/apache/gump/mvnrepoproxy/resources/Jar.java&r1=959332&r2=959336&rev=959336&view=diff
==============================================================================
--- gump/mvnrepo/trunk/src/java/org/apache/gump/mvnrepoproxy/resources/Jar.java (original)
+++ gump/mvnrepo/trunk/src/java/org/apache/gump/mvnrepoproxy/resources/TestsJar.java Wed Jun 30 14:50:51 2010
@@ -27,13 +27,14 @@ import org.restlet.resource.FileRepresen
import org.restlet.resource.Representation;
/**
- * A jar artifact served from the local file system if registered by
+ * A tests jar artifact served from the local file system if registered by
* Gump or proxied from a real mvn repository.
*/
-public class Jar extends GumpArtifact {
+public class TestsJar extends GumpArtifact {
- public Jar(Context ctx, Request request, Response response) {
- super(ctx, request, response, Constants.JAR_VARIANT, Constants.JAR_TYPE);
+ public TestsJar(Context ctx, Request request, Response response) {
+ super(ctx, request, response, Constants.JAR_VARIANT,
+ Constants.TESTS_JAR_TYPE);
}
@Override
Copied: gump/mvnrepo/trunk/src/java/org/apache/gump/mvnrepoproxy/resources/TestsJarChecksum.java (from r959332, gump/mvnrepo/trunk/src/java/org/apache/gump/mvnrepoproxy/resources/JarChecksum.java)
URL: http://svn.apache.org/viewvc/gump/mvnrepo/trunk/src/java/org/apache/gump/mvnrepoproxy/resources/TestsJarChecksum.java?p2=gump/mvnrepo/trunk/src/java/org/apache/gump/mvnrepoproxy/resources/TestsJarChecksum.java&p1=gump/mvnrepo/trunk/src/java/org/apache/gump/mvnrepoproxy/resources/JarChecksum.java&r1=959332&r2=959336&rev=959336&view=diff
==============================================================================
--- gump/mvnrepo/trunk/src/java/org/apache/gump/mvnrepoproxy/resources/JarChecksum.java (original)
+++ gump/mvnrepo/trunk/src/java/org/apache/gump/mvnrepoproxy/resources/TestsJarChecksum.java Wed Jun 30 14:50:51 2010
@@ -24,9 +24,9 @@ import org.restlet.Context;
import org.restlet.data.Request;
import org.restlet.data.Response;
-public class JarChecksum extends Checksum {
+public class TestsJarChecksum extends Checksum {
- public JarChecksum(Context ctx, Request request, Response response) {
- super(ctx, request, response, Constants.JAR_TYPE);
+ public TestsJarChecksum(Context ctx, Request request, Response response) {
+ super(ctx, request, response, Constants.TESTS_JAR_TYPE);
}
}
Modified: gump/mvnrepo/trunk/src/java/org/apache/gump/mvnrepoproxy/restlets/ArtifactAdder.java
URL: http://svn.apache.org/viewvc/gump/mvnrepo/trunk/src/java/org/apache/gump/mvnrepoproxy/restlets/ArtifactAdder.java?rev=959336&r1=959335&r2=959336&view=diff
==============================================================================
--- gump/mvnrepo/trunk/src/java/org/apache/gump/mvnrepoproxy/restlets/ArtifactAdder.java (original)
+++ gump/mvnrepo/trunk/src/java/org/apache/gump/mvnrepoproxy/restlets/ArtifactAdder.java Wed Jun 30 14:50:51 2010
@@ -41,7 +41,9 @@ public class ArtifactAdder extends Restl
(String) request.getAttributes().get(Constants.FILE_NAME);
String artifactType = fileName.endsWith(Constants.POM_TYPE)
|| fileName.endsWith("pom.xml")
- ? Constants.POM_TYPE : Constants.JAR_TYPE;
+ ? Constants.POM_TYPE
+ : fileName.endsWith(Constants.TESTS_JAR_TYPE)
+ ? Constants.TESTS_JAR_TYPE : Constants.JAR_TYPE;
getLogger().info("adding " + artifactType + " artifact with groupId '"
+ request.getAttributes().get(Constants.GROUP_ID)