Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
  • 4 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
Commits on Aug 10, 2012
Adrien Lecharpentier Cone and Universe doesn't produce anything
The output is done directly in the response body
7b764be
Adrien Lecharpentier Impl must not have java.ws.rs Annotation 1654276
Adrien Lecharpentier Fix scheduler failed if output to completely new path e4fb351
Commits on Aug 13, 2012
Adrien Lecharpentier Fix preamble syntax
The preamble must not be tab spaces on the second
line
4919d4c
View
2  ...uler/archiva-scheduler-cudf/src/main/java/org/apache/archiva/scheduler/cudf/ArchivaCUDFTaskExecutor.java
@@ -63,7 +63,7 @@ public void executeTask( Task task )
{
if ( !cudfTask.getResourceDestination().exists() )
{
- cudfTask.getResourceDestination().mkdir();
+ cudfTask.getResourceDestination().mkdirs();
}
else
{
View
2  ...va-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/CUDFService.java
@@ -57,7 +57,6 @@
*/
@Path( "cone/{groupId}/{artifactId}/{version}" )
@RedbackAuthorization( noPermission = true, noRestriction = true )
- @Produces( MediaType.TEXT_PLAIN )
void getConeCUDF( @PathParam( "groupId" ) String groupId, @PathParam( "artifactId" ) String artifactId,
@PathParam( "version" ) String version, @QueryParam( "type" ) String type,
@QueryParam( "repositoryId" ) String repositoryId, @Context HttpServletResponse servletResponse )
@@ -90,7 +89,6 @@ Response getConeCUDFFile( @PathParam( "groupId" ) String groupId, @PathParam( "a
*/
@Path( "universe" )
@RedbackAuthorization( noPermission = true, noRestriction = true )
- @Produces( MediaType.TEXT_PLAIN )
void getUniverseCUDF( @QueryParam( "repositoryId" ) String repositoryId,
@Context HttpServletResponse servletResponse )
throws ArchivaRestServiceException;
View
10 ...rchiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCUDFService.java
@@ -37,7 +37,6 @@
import javax.inject.Inject;
import javax.inject.Named;
import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.PathParam;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import java.io.File;
@@ -300,7 +299,7 @@ public Response startCudfTaskGeneration( String filePath )
}
}
- public void startCUDFJob( @PathParam( "id" ) String id )
+ public void startCUDFJob( String id )
throws ArchivaRestServiceException
{
CUDFJob cudfJob = cudfJobsAdmin.getCUDFJob( id );
@@ -389,14 +388,12 @@ public void deleteCUDFJob( CUDFJob cudfJob )
}
}
- public void deleteCUDFJob( @PathParam( "id" ) String id )
+ public void deleteCUDFJob( String id )
throws ArchivaRestServiceException
{
- CUDFJob cudfJob = new CUDFJob();
- cudfJob.setId( id );
try
{
- cudfJobsAdmin.deleteCUDFJob( cudfJob );
+ cudfJobsAdmin.deleteCUDFJob( getCUDFJob( id ) );
}
catch ( RepositoryAdminException e )
{
@@ -409,5 +406,4 @@ protected String getSelectedRepoExceptionMessage()
{
return "cudf.root.group.repository.denied";
}
-
}
View
4 archiva-modules/plugins/cudf/src/main/java/org/apache/archiva/cudf/extractor/CUDFExtractor.java
@@ -332,13 +332,13 @@ private String extractName( ProjectVersionMetadata projectVersionMetadata )
private String getCUDFPreambule()
{
return "preamble: \nproperty: number: string, recommends: vpkgformula = [true!], suggests: vpkglist = [], \n"
- + " type: string = [\"\"]\n\n";
+ + " type: string = [\"\"]\n\n";
}
/**
* @param organisation (groupId)
* @param name (artifactId)
- * @return organisation:name => org.apache.archiva:archiva
+ * @return organisation%3aname => org.apache.archiva%3aarchiva with %+hexadecimal code of every forbidden characters
*/
private String outputArtifactInCUDFInline( String organisation, String name )
{

No commit comments for this range

Something went wrong with that request. Please try again.