Browse Source

set correct line endings


git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@446573 13f79535-47bb-0310-9956-ffa450edef68
tags/archiva-0.9-alpha-1
Brett Porter 17 years ago
parent
commit
d221e70b91
28 changed files with 603 additions and 603 deletions
  1. 26
    26
      archiva-converter/src/test/source-repository/test/poms/relocated-v3artifact-1.0.0.pom
  2. 57
    57
      archiva-core/src/main/java/org/apache/maven/archiva/scheduler/RepositoryTaskJob.java
  3. 27
    27
      archiva-core/src/test/maven-1.x-repository/test/poms/relocated-v3artifact-1.0.0.pom
  4. 9
    9
      archiva-discoverer/src/test/pom-artifacts/org/apache/maven/A/1.0/A-1.0.pom
  5. 9
    9
      archiva-discoverer/src/test/pom-artifacts/org/apache/maven/B/1.0/B-1.0.pom
  6. 9
    9
      archiva-discoverer/src/test/pom-artifacts/org/apache/maven/B/2.0/B-2.0.pom
  7. 9
    9
      archiva-discoverer/src/test/pom-artifacts/org/apache/maven/C/1.0/C-1.0.pom
  8. 9
    9
      archiva-discoverer/src/test/pom-artifacts/org/apache/maven/discovery/1.0/discovery-1.0.pom
  9. 10
    10
      archiva-discoverer/src/test/pom-artifacts/org/apache/maven/samplejar/1.0/samplejar-1.0.pom
  10. 10
    10
      archiva-discoverer/src/test/pom-artifacts/org/apache/maven/samplejar/2.0/samplejar-2.0.pom
  11. 9
    9
      archiva-discoverer/src/test/pom-artifacts/org/apache/testgroup/discovery/1.0/discovery-1.0.pom
  12. 9
    9
      archiva-discoverer/src/test/repository/org/apache/maven/A/1.0/A-1.0.pom
  13. 9
    9
      archiva-discoverer/src/test/repository/org/apache/maven/B/1.0/B-1.0.pom
  14. 9
    9
      archiva-discoverer/src/test/repository/org/apache/maven/B/2.0/B-2.0.pom
  15. 9
    9
      archiva-discoverer/src/test/repository/org/apache/maven/C/1.0/C-1.0.pom
  16. 9
    9
      archiva-discoverer/src/test/repository/org/apache/maven/discovery/1.0/discovery-1.0.pom
  17. 10
    10
      archiva-discoverer/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom
  18. 10
    10
      archiva-discoverer/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom
  19. 9
    9
      archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom
  20. 150
    150
      archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/RangeQuery.java
  21. 5
    5
      archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-metadata.xml
  22. 12
    12
      archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/maven-metadata.xml
  23. 9
    9
      archiva-indexer/src/test/repository/test/maven-metadata.xml
  24. 52
    52
      archiva-proxy/pom.xml
  25. 6
    6
      archiva-reports-standard/src/test/repository/groupId/artifactId/1.0-alpha-1/artifactId-1.0-alpha-1.pom
  26. 6
    6
      archiva-reports-standard/src/test/repository/groupId/artifactId/1.0-alpha-2/artifactId-1.0-alpha-2.pom
  27. 78
    78
      archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp
  28. 27
    27
      maven-meeper/src/bin/repoclean/synchronize.properties

+ 26
- 26
archiva-converter/src/test/source-repository/test/poms/relocated-v3artifact-1.0.0.pom View File

@@ -1,27 +1,27 @@
<project>
<pomVersion>3</pomVersion>
<artifactId>relocated-v3artifact</artifactId>
<groupId>test</groupId>
<currentVersion>1.0.0</currentVersion>
<dependencies>
<dependency>
<groupId>groupId</groupId>
<artifactId>artifactId</artifactId>
<version>version</version>
</dependency>
<dependency>
<groupId>groupId</groupId>
<artifactId>test-artifactId</artifactId>
<version>version</version>
<properties>
<scope>test</scope>
</properties>
</dependency>
</dependencies>
<repository>
<connection>scm:cvs:ext:${maven.username}@localhost:/home/cvs</connection>
</repository>
<properties>
<relocated.groupId>relocated-test</relocated.groupId>
</properties>
<project>
<pomVersion>3</pomVersion>
<artifactId>relocated-v3artifact</artifactId>
<groupId>test</groupId>
<currentVersion>1.0.0</currentVersion>
<dependencies>
<dependency>
<groupId>groupId</groupId>
<artifactId>artifactId</artifactId>
<version>version</version>
</dependency>
<dependency>
<groupId>groupId</groupId>
<artifactId>test-artifactId</artifactId>
<version>version</version>
<properties>
<scope>test</scope>
</properties>
</dependency>
</dependencies>
<repository>
<connection>scm:cvs:ext:${maven.username}@localhost:/home/cvs</connection>
</repository>
<properties>
<relocated.groupId>relocated-test</relocated.groupId>
</properties>
</project>

+ 57
- 57
archiva-core/src/main/java/org/apache/maven/archiva/scheduler/RepositoryTaskJob.java View File

@@ -1,57 +1,57 @@
package org.apache.maven.archiva.scheduler;
/*
* Copyright 2005-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import org.apache.maven.archiva.scheduler.task.RepositoryTask;
import org.codehaus.plexus.scheduler.AbstractJob;
import org.quartz.JobDataMap;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
/**
* This class is the discoverer job that is executed by the scheduler.
*/
public class RepositoryTaskJob
extends AbstractJob
{
static final String TASK_KEY = "EXECUTION";
/**
* Execute the discoverer and the indexer.
*
* @param context
* @throws org.quartz.JobExecutionException
*
*/
public void execute( JobExecutionContext context )
throws JobExecutionException
{
JobDataMap dataMap = context.getJobDetail().getJobDataMap();
setJobDataMap( dataMap );
RepositoryTask executor = (RepositoryTask) dataMap.get( TASK_KEY );
try
{
executor.execute();
}
catch ( TaskExecutionException e )
{
throw new JobExecutionException( e );
}
}
}
package org.apache.maven.archiva.scheduler;
/*
* Copyright 2005-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import org.apache.maven.archiva.scheduler.task.RepositoryTask;
import org.codehaus.plexus.scheduler.AbstractJob;
import org.quartz.JobDataMap;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
/**
* This class is the discoverer job that is executed by the scheduler.
*/
public class RepositoryTaskJob
extends AbstractJob
{
static final String TASK_KEY = "EXECUTION";
/**
* Execute the discoverer and the indexer.
*
* @param context
* @throws org.quartz.JobExecutionException
*
*/
public void execute( JobExecutionContext context )
throws JobExecutionException
{
JobDataMap dataMap = context.getJobDetail().getJobDataMap();
setJobDataMap( dataMap );
RepositoryTask executor = (RepositoryTask) dataMap.get( TASK_KEY );
try
{
executor.execute();
}
catch ( TaskExecutionException e )
{
throw new JobExecutionException( e );
}
}
}

+ 27
- 27
archiva-core/src/test/maven-1.x-repository/test/poms/relocated-v3artifact-1.0.0.pom View File

@@ -1,27 +1,27 @@
<project>
<pomVersion>3</pomVersion>
<artifactId>relocated-v3artifact</artifactId>
<groupId>test</groupId>
<currentVersion>1.0.0</currentVersion>
<dependencies>
<dependency>
<groupId>groupId</groupId>
<artifactId>artifactId</artifactId>
<version>version</version>
</dependency>
<dependency>
<groupId>groupId</groupId>
<artifactId>test-artifactId</artifactId>
<version>version</version>
<properties>
<scope>test</scope>
</properties>
</dependency>
</dependencies>
<repository>
<connection>scm:cvs:ext:${maven.username}@localhost:/home/cvs</connection>
</repository>
<properties>
<relocated.groupId>relocated-test</relocated.groupId>
</properties>
</project>
<project>
<pomVersion>3</pomVersion>
<artifactId>relocated-v3artifact</artifactId>
<groupId>test</groupId>
<currentVersion>1.0.0</currentVersion>
<dependencies>
<dependency>
<groupId>groupId</groupId>
<artifactId>artifactId</artifactId>
<version>version</version>
</dependency>
<dependency>
<groupId>groupId</groupId>
<artifactId>test-artifactId</artifactId>
<version>version</version>
<properties>
<scope>test</scope>
</properties>
</dependency>
</dependencies>
<repository>
<connection>scm:cvs:ext:${maven.username}@localhost:/home/cvs</connection>
</repository>
<properties>
<relocated.groupId>relocated-test</relocated.groupId>
</properties>
</project>

+ 9
- 9
archiva-discoverer/src/test/pom-artifacts/org/apache/maven/A/1.0/A-1.0.pom View File

@@ -1,9 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>A</artifactId>
<version>1.0</version>
<name>Maven Test Repository Artifact Discovery</name>
<packaging>war</packaging>
</project>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>A</artifactId>
<version>1.0</version>
<name>Maven Test Repository Artifact Discovery</name>
<packaging>war</packaging>
</project>

+ 9
- 9
archiva-discoverer/src/test/pom-artifacts/org/apache/maven/B/1.0/B-1.0.pom View File

@@ -1,9 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>B</artifactId>
<version>1.0</version>
<name>Maven Test Repository Artifact Discovery</name>
<packaging>pom</packaging>
</project>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>B</artifactId>
<version>1.0</version>
<name>Maven Test Repository Artifact Discovery</name>
<packaging>pom</packaging>
</project>

+ 9
- 9
archiva-discoverer/src/test/pom-artifacts/org/apache/maven/B/2.0/B-2.0.pom View File

@@ -1,9 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>B</artifactId>
<version>2.0</version>
<name>Maven Test Repository Artifact Discovery</name>
<packaging>pom</packaging>
</project>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>B</artifactId>
<version>2.0</version>
<name>Maven Test Repository Artifact Discovery</name>
<packaging>pom</packaging>
</project>

+ 9
- 9
archiva-discoverer/src/test/pom-artifacts/org/apache/maven/C/1.0/C-1.0.pom View File

@@ -1,9 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>C</artifactId>
<version>1.0</version>
<name>Maven Test Repository Artifact Discovery</name>
<packaging>war</packaging>
</project>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>C</artifactId>
<version>1.0</version>
<name>Maven Test Repository Artifact Discovery</name>
<packaging>war</packaging>
</project>

+ 9
- 9
archiva-discoverer/src/test/pom-artifacts/org/apache/maven/discovery/1.0/discovery-1.0.pom View File

@@ -1,9 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>discovery</artifactId>
<version>1.0</version>
<name>Maven Test Repository Artifact Discovery</name>
<packaging>pom</packaging>
</project>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>discovery</artifactId>
<version>1.0</version>
<name>Maven Test Repository Artifact Discovery</name>
<packaging>pom</packaging>
</project>

+ 10
- 10
archiva-discoverer/src/test/pom-artifacts/org/apache/maven/samplejar/1.0/samplejar-1.0.pom View File

@@ -1,10 +1,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>C</artifactId>
<version>1.0</version>
<name>Maven Test Repository Artifact Discovery</name>
<!-- default packaging is jar -->
<!--packaging>jar</packaging-->
</project>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>C</artifactId>
<version>1.0</version>
<name>Maven Test Repository Artifact Discovery</name>
<!-- default packaging is jar -->
<!--packaging>jar</packaging-->
</project>

+ 10
- 10
archiva-discoverer/src/test/pom-artifacts/org/apache/maven/samplejar/2.0/samplejar-2.0.pom View File

@@ -1,10 +1,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>C</artifactId>
<version>1.0</version>
<name>Maven Test Repository Artifact Discovery</name>
<!-- specified packaging -->
<packaging>jar</packaging>
</project>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>C</artifactId>
<version>1.0</version>
<name>Maven Test Repository Artifact Discovery</name>
<!-- specified packaging -->
<packaging>jar</packaging>
</project>

+ 9
- 9
archiva-discoverer/src/test/pom-artifacts/org/apache/testgroup/discovery/1.0/discovery-1.0.pom View File

@@ -1,9 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.testgroup</groupId>
<artifactId>discovery</artifactId>
<version>1.0</version>
<name>Maven Test Repository Artifact Discovery</name>
<packaging>pom</packaging>
</project>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.testgroup</groupId>
<artifactId>discovery</artifactId>
<version>1.0</version>
<name>Maven Test Repository Artifact Discovery</name>
<packaging>pom</packaging>
</project>

+ 9
- 9
archiva-discoverer/src/test/repository/org/apache/maven/A/1.0/A-1.0.pom View File

@@ -1,9 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>A</artifactId>
<version>1.0</version>
<name>Maven Test Repository Artifact Discovery</name>
<packaging>war</packaging>
</project>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>A</artifactId>
<version>1.0</version>
<name>Maven Test Repository Artifact Discovery</name>
<packaging>war</packaging>
</project>

+ 9
- 9
archiva-discoverer/src/test/repository/org/apache/maven/B/1.0/B-1.0.pom View File

@@ -1,9 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>B</artifactId>
<version>1.0</version>
<name>Maven Test Repository Artifact Discovery</name>
<packaging>pom</packaging>
</project>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>B</artifactId>
<version>1.0</version>
<name>Maven Test Repository Artifact Discovery</name>
<packaging>pom</packaging>
</project>

+ 9
- 9
archiva-discoverer/src/test/repository/org/apache/maven/B/2.0/B-2.0.pom View File

@@ -1,9 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>B</artifactId>
<version>2.0</version>
<name>Maven Test Repository Artifact Discovery</name>
<packaging>pom</packaging>
</project>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>B</artifactId>
<version>2.0</version>
<name>Maven Test Repository Artifact Discovery</name>
<packaging>pom</packaging>
</project>

+ 9
- 9
archiva-discoverer/src/test/repository/org/apache/maven/C/1.0/C-1.0.pom View File

@@ -1,9 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>C</artifactId>
<version>1.0</version>
<name>Maven Test Repository Artifact Discovery</name>
<packaging>war</packaging>
</project>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>C</artifactId>
<version>1.0</version>
<name>Maven Test Repository Artifact Discovery</name>
<packaging>war</packaging>
</project>

+ 9
- 9
archiva-discoverer/src/test/repository/org/apache/maven/discovery/1.0/discovery-1.0.pom View File

@@ -1,9 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>discovery</artifactId>
<version>1.0</version>
<name>Maven Test Repository Artifact Discovery</name>
<packaging>pom</packaging>
</project>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>discovery</artifactId>
<version>1.0</version>
<name>Maven Test Repository Artifact Discovery</name>
<packaging>pom</packaging>
</project>

+ 10
- 10
archiva-discoverer/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom View File

@@ -1,10 +1,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>C</artifactId>
<version>1.0</version>
<name>Maven Test Repository Artifact Discovery</name>
<!-- default packaging is jar -->
<!--packaging>jar</packaging-->
</project>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>C</artifactId>
<version>1.0</version>
<name>Maven Test Repository Artifact Discovery</name>
<!-- default packaging is jar -->
<!--packaging>jar</packaging-->
</project>

+ 10
- 10
archiva-discoverer/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom View File

@@ -1,10 +1,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>C</artifactId>
<version>1.0</version>
<name>Maven Test Repository Artifact Discovery</name>
<!-- specified packaging -->
<packaging>jar</packaging>
</project>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>C</artifactId>
<version>1.0</version>
<name>Maven Test Repository Artifact Discovery</name>
<!-- specified packaging -->
<packaging>jar</packaging>
</project>

+ 9
- 9
archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom View File

@@ -1,9 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.testgroup</groupId>
<artifactId>discovery</artifactId>
<version>1.0</version>
<name>Maven Test Repository Artifact Discovery</name>
<packaging>pom</packaging>
</project>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.testgroup</groupId>
<artifactId>discovery</artifactId>
<version>1.0</version>
<name>Maven Test Repository Artifact Discovery</name>
<packaging>pom</packaging>
</project>

+ 150
- 150
archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/RangeQuery.java View File

@@ -1,150 +1,150 @@
package org.apache.maven.archiva.indexer.query;
/*
* Copyright 2005-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/**
* Query object that handles range queries (presently used for dates).
*
* @author Maria Odea Ching
* @author Brett Porter
*/
public class RangeQuery
implements Query
{
/**
* Whether values equal to the boundaries are included in the query results.
*/
private final boolean inclusive;
/**
* The lower bound.
*/
private final QueryTerm begin;
/**
* The upper bound.
*/
private final QueryTerm end;
/**
* Constructor.
*
* @param begin the lower bound
* @param end the upper bound
* @param inclusive whether to include the boundaries in the query
*/
private RangeQuery( QueryTerm begin, QueryTerm end, boolean inclusive )
{
this.begin = begin;
this.end = end;
this.inclusive = inclusive;
}
/**
* Create an open range, including all results.
*
* @return the query object
*/
public static RangeQuery createOpenRange()
{
return new RangeQuery( null, null, false );
}
/**
* Create a bounded range, excluding the endpoints.
*
* @param begin the lower bound value to compare to
* @param end the upper bound value to compare to
* @return the query object
*/
public static RangeQuery createExclusiveRange( QueryTerm begin, QueryTerm end )
{
return new RangeQuery( begin, end, false );
}
/**
* Create a bounded range, including the endpoints.
*
* @param begin the lower bound value to compare to
* @param end the upper bound value to compare to
* @return the query object
*/
public static RangeQuery createInclusiveRange( QueryTerm begin, QueryTerm end )
{
return new RangeQuery( begin, end, true );
}
/**
* Create a range that is greater than or equal to a given term.
*
* @param begin the value to compare to
* @return the query object
*/
public static RangeQuery createGreaterThanOrEqualToRange( QueryTerm begin )
{
return new RangeQuery( begin, null, true );
}
/**
* Create a range that is greater than a given term.
*
* @param begin the value to compare to
* @return the query object
*/
public static RangeQuery createGreaterThanRange( QueryTerm begin )
{
return new RangeQuery( begin, null, false );
}
/**
* Create a range that is less than or equal to a given term.
*
* @param end the value to compare to
* @return the query object
*/
public static RangeQuery createLessThanOrEqualToRange( QueryTerm end )
{
return new RangeQuery( null, end, true );
}
/**
* Create a range that is less than a given term.
*
* @param end the value to compare to
* @return the query object
*/
public static RangeQuery createLessThanRange( QueryTerm end )
{
return new RangeQuery( null, end, false );
}
public QueryTerm getBegin()
{
return begin;
}
public QueryTerm getEnd()
{
return end;
}
public boolean isInclusive()
{
return inclusive;
}
}
package org.apache.maven.archiva.indexer.query;
/*
* Copyright 2005-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/**
* Query object that handles range queries (presently used for dates).
*
* @author Maria Odea Ching
* @author Brett Porter
*/
public class RangeQuery
implements Query
{
/**
* Whether values equal to the boundaries are included in the query results.
*/
private final boolean inclusive;
/**
* The lower bound.
*/
private final QueryTerm begin;
/**
* The upper bound.
*/
private final QueryTerm end;
/**
* Constructor.
*
* @param begin the lower bound
* @param end the upper bound
* @param inclusive whether to include the boundaries in the query
*/
private RangeQuery( QueryTerm begin, QueryTerm end, boolean inclusive )
{
this.begin = begin;
this.end = end;
this.inclusive = inclusive;
}
/**
* Create an open range, including all results.
*
* @return the query object
*/
public static RangeQuery createOpenRange()
{
return new RangeQuery( null, null, false );
}
/**
* Create a bounded range, excluding the endpoints.
*
* @param begin the lower bound value to compare to
* @param end the upper bound value to compare to
* @return the query object
*/
public static RangeQuery createExclusiveRange( QueryTerm begin, QueryTerm end )
{
return new RangeQuery( begin, end, false );
}
/**
* Create a bounded range, including the endpoints.
*
* @param begin the lower bound value to compare to
* @param end the upper bound value to compare to
* @return the query object
*/
public static RangeQuery createInclusiveRange( QueryTerm begin, QueryTerm end )
{
return new RangeQuery( begin, end, true );
}
/**
* Create a range that is greater than or equal to a given term.
*
* @param begin the value to compare to
* @return the query object
*/
public static RangeQuery createGreaterThanOrEqualToRange( QueryTerm begin )
{
return new RangeQuery( begin, null, true );
}
/**
* Create a range that is greater than a given term.
*
* @param begin the value to compare to
* @return the query object
*/
public static RangeQuery createGreaterThanRange( QueryTerm begin )
{
return new RangeQuery( begin, null, false );
}
/**
* Create a range that is less than or equal to a given term.
*
* @param end the value to compare to
* @return the query object
*/
public static RangeQuery createLessThanOrEqualToRange( QueryTerm end )
{
return new RangeQuery( null, end, true );
}
/**
* Create a range that is less than a given term.
*
* @param end the value to compare to
* @return the query object
*/
public static RangeQuery createLessThanRange( QueryTerm end )
{
return new RangeQuery( null, end, false );
}
public QueryTerm getBegin()
{
return begin;
}
public QueryTerm getEnd()
{
return end;
}
public boolean isInclusive()
{
return inclusive;
}
}

+ 5
- 5
archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-metadata.xml View File

@@ -1,5 +1,5 @@
<metadata>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>2.0.1</version>
</metadata>
<metadata>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>2.0.1</version>
</metadata>

+ 12
- 12
archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/maven-metadata.xml View File

@@ -1,12 +1,12 @@
<metadata>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>2.0.1</version>
<versioning>
<release>2.0.1</release>
<versions>
<version>2.0.1</version>
</versions>
<lastUpdated>20051212044643</lastUpdated>
</versioning>
</metadata>
<metadata>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>2.0.1</version>
<versioning>
<release>2.0.1</release>
<versions>
<version>2.0.1</version>
</versions>
<lastUpdated>20051212044643</lastUpdated>
</versioning>
</metadata>

+ 9
- 9
archiva-indexer/src/test/repository/test/maven-metadata.xml View File

@@ -1,9 +1,9 @@
<metadata>
<groupId>test</groupId>
<plugins>
<plugin>
<prefix></prefix>
<artifactId>test-test-plugin</artifactId>
</plugin>
</plugins>
</metadata>
<metadata>
<groupId>test</groupId>
<plugins>
<plugin>
<prefix></prefix>
<artifactId>test-test-plugin</artifactId>
</plugin>
</plugins>
</metadata>

+ 52
- 52
archiva-proxy/pom.xml View File

@@ -1,52 +1,52 @@
<!--
~ Copyright 2005-2006 The Apache Software Foundation.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.archiva</groupId>
<artifactId>archiva</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>archiva-proxy</artifactId>
<name>Archiva Proxy</name>
<dependencies>
<dependency>
<groupId>org.apache.maven.archiva</groupId>
<artifactId>archiva-discoverer</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
</dependency>
<dependency>
<groupId>easymock</groupId>
<artifactId>easymock</artifactId>
<version>1.2_Java1.3</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
<!--
~ Copyright 2005-2006 The Apache Software Foundation.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.archiva</groupId>
<artifactId>archiva</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>archiva-proxy</artifactId>
<name>Archiva Proxy</name>
<dependencies>
<dependency>
<groupId>org.apache.maven.archiva</groupId>
<artifactId>archiva-discoverer</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
</dependency>
<dependency>
<groupId>easymock</groupId>
<artifactId>easymock</artifactId>
<version>1.2_Java1.3</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>

+ 6
- 6
archiva-reports-standard/src/test/repository/groupId/artifactId/1.0-alpha-1/artifactId-1.0-alpha-1.pom View File

@@ -1,6 +1,6 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>groupId</groupId>
<artifactId>artifactId</artifactId>
<version>1.0-alpha-1</version>
</project>
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>groupId</groupId>
<artifactId>artifactId</artifactId>
<version>1.0-alpha-1</version>
</project>

+ 6
- 6
archiva-reports-standard/src/test/repository/groupId/artifactId/1.0-alpha-2/artifactId-1.0-alpha-2.pom View File

@@ -1,6 +1,6 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>groupId</groupId>
<artifactId>artifactId</artifactId>
<version>1.0-alpha-2</version>
</project>
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>groupId</groupId>
<artifactId>artifactId</artifactId>
<version>1.0-alpha-2</version>
</project>

+ 78
- 78
archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp View File

@@ -1,78 +1,78 @@
<%--
~ Copyright 2005-2006 The Apache Software Foundation.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
--%>
<%@ taglib prefix="ww" uri="/webwork" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="pss" uri="plexusSecuritySystem" %>
<html>
<head>
<title>Browse Repository</title>
<ww:head/>
</head>
<body>
<h1>Browse Repository</h1>
<div id="contentArea">
<div id="nameColumn">
<h2>Groups</h2>
<ul>
<ww:set name="groups" value="groups"/>
<c:forEach items="${groups}" var="groupId">
<c:set var="url">
<ww:url action="browseGroup" namespace="/">
<ww:param name="groupId" value="%{'${groupId}'}"/>
</ww:url>
</c:set>
<li><a href="${url}">${groupId}/</a></li>
</c:forEach>
</ul>
</div>
<%-- TODO: later, when supported in metadata
<div id="categoryColumn">
<h2>Category</h2>
<table>
<tr>
<td>
<a href="#">Java</a>
</td>
</tr>
<tr>
<td>
<a href="#">Ruby</a>
</td>
</tr>
</table>
</div>
<h2>Labels</h2>
<div id="labels">
<p>
<a href="#">jdo</a>
<a href="#">j2ee</a>
<a href="#">maven</a>
</p>
</div>
--%>
</div>
</body>
</html>
<%--
~ Copyright 2005-2006 The Apache Software Foundation.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
--%>
<%@ taglib prefix="ww" uri="/webwork" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="pss" uri="plexusSecuritySystem" %>
<html>
<head>
<title>Browse Repository</title>
<ww:head/>
</head>
<body>
<h1>Browse Repository</h1>
<div id="contentArea">
<div id="nameColumn">
<h2>Groups</h2>
<ul>
<ww:set name="groups" value="groups"/>
<c:forEach items="${groups}" var="groupId">
<c:set var="url">
<ww:url action="browseGroup" namespace="/">
<ww:param name="groupId" value="%{'${groupId}'}"/>
</ww:url>
</c:set>
<li><a href="${url}">${groupId}/</a></li>
</c:forEach>
</ul>
</div>
<%-- TODO: later, when supported in metadata
<div id="categoryColumn">
<h2>Category</h2>
<table>
<tr>
<td>
<a href="#">Java</a>
</td>
</tr>
<tr>
<td>
<a href="#">Ruby</a>
</td>
</tr>
</table>
</div>
<h2>Labels</h2>
<div id="labels">
<p>
<a href="#">jdo</a>
<a href="#">j2ee</a>
<a href="#">maven</a>
</p>
</div>
--%>
</div>
</body>
</html>

+ 27
- 27
maven-meeper/src/bin/repoclean/synchronize.properties View File

@@ -1,27 +1,27 @@
# [REQUIRED OPTIONS]
sourceRepositoryPath=/home/maven/repository-staging/to-ibiblio/maven
targetRepositoryPath=/home/maven/repository-staging/to-ibiblio/maven2-repoclean
reportsPath=/home/maven/repository-staging/to-ibiblio/reports/repoclean
blacklistedPatterns=**/*.pom,**/activation/**,**/javamail/**,**/jaxm/**,**/jaxp/**,**/jaxrpc/**,**/jca/**,**/jce/**,**/jdbc/**,**/jdo/**,**/jms/**,**/jndi/**,**/saaj/**
reportOnly=false
reportWarnings=false
errorReport.mailOnError=true
errorReport.fromName=REPOCLEAN
errorReport.fromAddress=maven@codehaus.org
errorReport.toName=Maven Developer List
errorReport.toAddress=notifications@maven.apache.org
errorReport.subject=[REPOCLEAN] Error(s) occurred while converting repository
errorReport.link=http://www.maven.org/reports/repoclean/#date/repository.report.txt
# [DEFAULT VALUE: legacy]
#sourceRepositoryLayout=[legacy|default]
# [DEFAULT VALUE: v3]
#sourcePomType=[v3|v4]
# [DEFAULT VALUE: default]
#targetRepositoryLayout=[legacy|default]
# [REQUIRED OPTIONS]
sourceRepositoryPath=/home/maven/repository-staging/to-ibiblio/maven
targetRepositoryPath=/home/maven/repository-staging/to-ibiblio/maven2-repoclean
reportsPath=/home/maven/repository-staging/to-ibiblio/reports/repoclean
blacklistedPatterns=**/*.pom,**/activation/**,**/javamail/**,**/jaxm/**,**/jaxp/**,**/jaxrpc/**,**/jca/**,**/jce/**,**/jdbc/**,**/jdo/**,**/jms/**,**/jndi/**,**/saaj/**
reportOnly=false
reportWarnings=false
errorReport.mailOnError=true
errorReport.fromName=REPOCLEAN
errorReport.fromAddress=maven@codehaus.org
errorReport.toName=Maven Developer List
errorReport.toAddress=notifications@maven.apache.org
errorReport.subject=[REPOCLEAN] Error(s) occurred while converting repository
errorReport.link=http://www.maven.org/reports/repoclean/#date/repository.report.txt
# [DEFAULT VALUE: legacy]
#sourceRepositoryLayout=[legacy|default]
# [DEFAULT VALUE: v3]
#sourcePomType=[v3|v4]
# [DEFAULT VALUE: default]
#targetRepositoryLayout=[legacy|default]

Loading…
Cancel
Save