 archiva/trunk/
|
modified
, props changed
|
| archiva/trunk/archiva-docs/
|
modified
, props changed
|
 archiva/trunk/archiva-docs/src/site/apt/adminguide/configuration.apt
|
modified
, text changed
|
archiva/trunk/archiva-docs/src/site/apt/adminguide/staging-repositories.apt
(Copied from archiva/branches/archiva-MRM-980/archiva-docs/src/site/apt/adminguide/staging-repositories.apt, r1001988)
|
added
|
archiva/trunk/archiva-docs/src/site/resources/images/conflicting-artifacts.png
(Copied from archiva/branches/archiva-MRM-980/archiva-docs/src/site/resources/images/conflicting-artifacts.png, r1001988)
|
added
|
archiva/trunk/archiva-docs/src/site/resources/images/repository-merge.png
(Copied from archiva/branches/archiva-MRM-980/archiva-docs/src/site/resources/images/repository-merge.png, r1001988)
|
added
|
| archiva/trunk/archiva-docs/src/site/site.xml
|
modified
, text changed
|
| archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
|
modified
, text changed
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ArchivaTaskScheduler.java
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/components.xml
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/components-fragment.xml
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTask.java
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.xml
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/test-repo/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java
|
modified
, text changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
|
modified
, text changed
|
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java
(Copied from archiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java, r1001988)
|
added
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryAction.java
|
modified
, text changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryAction.java
|
modified
, text changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryAction.java
|
modified
, text changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesAction.java
|
modified
, text changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
|
modified
, text changed
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRepository.jsp
|
modified
, text changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp
|
modified
, text changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/repositoryForm.jspf
|
modified
, text changed
|
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/mergeExcludeConflicts.jsp
(Copied from archiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/mergeExcludeConflicts.jsp, r1001988)
|
added
|
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/mergeResults.jsp
(Copied from archiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/mergeResults.jsp, r1001988)
|
added
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
|
modified
, text changed
|
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/mergeActionForm.jspf
(Copied from archiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/mergeActionForm.jspf, r1001988)
|
added
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataRepository.java
|
modified
, text changed
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataResolver.java
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java
|
modified
, text changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java
|
modified
, text changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/artifactId-version.pom
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/child1-1.0.pom
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/child2-1.0.pom
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/child3-1.0.pom
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/grandchild1-2.0.pom
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom
|
modified
, props changed
|
| archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/
|
modified
, props changed
|
| [...] |
archiva/trunk/archiva-docs/src/site/resources/images/conflicting-artifacts.png
archiva/trunk/archiva-docs/src/site/resources/images/repository-merge.png
