Propchange: archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 25 06:55:27 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java:721945-723577 +/archiva/branches/MRM-541/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java:699795-705848 +/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java:825850-883981
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 25 06:55:27 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata:825850-882383,882384-883981* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 25 06:55:27 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository:825850-882383,882384-883981* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 25 06:55:27 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage:825850-882383,882384-883981* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 25 06:55:27 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2:825850-882383,882384-883981* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 25 06:55:27 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java:825850-883981 Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolver.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 25 06:55:27 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolver.java:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolver.java:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolver.java:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolver.java:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolver.java:825850-883981 Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 25 06:55:27 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java:825850-883981 Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 25 06:55:27 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java:825850-883981 Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectParent.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 25 06:55:27 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectParent.java:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectParent.java:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectParent.java:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectParent.java:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectParent.java:825850-883981 Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadata.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 25 06:55:27 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadata.java:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadata.java:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadata.java:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadata.java:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadata.java:825850-883981 Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReader.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 25 06:55:27 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReader.java:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReader.java:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReader.java:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReader.java:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReader.java:825850-883981 Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 25 06:55:27 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java:825850-883981 Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 25 06:55:27 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration:825850-882383,882384-883981* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 25 06:55:27 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:825850-883981 Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 25 06:55:27 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata:825850-882383,882384-883981* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 25 06:55:27 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository:825850-882383,882384-883981* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 25 06:55:27 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage:825850-882383,882384-883981* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 25 06:55:27 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2:825850-882383,882384-883981* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 25 06:55:27 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java:825850-883981 Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 25 06:55:27 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java:825850-883981 Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 25 06:55:27 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven:825850-882383,882384-883981* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 25 06:55:27 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared:825850-882383,882384-883981* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 25 06:55:27 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader:825850-882383,882384-883981* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/maven-metadata.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 25 06:55:27 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/maven-metadata.xml:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/maven-metadata.xml:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/maven-metadata.xml:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/maven-metadata.xml:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/maven-metadata.xml:825850-883981 Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 25 06:55:27 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources:825850-882383,882384-883981* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 25 06:55:27 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org:825850-882383,882384-883981* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 25 06:55:27 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache:825850-882383,882384-883981* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 25 06:55:27 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva:825850-882383,882384-883981* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 25 06:55:27 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata:825850-882383,882384-883981* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 25 06:55:27 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository:825850-882383,882384-883981* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 25 06:55:27 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage:825850-882383,882384-883981* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 25 06:55:27 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2:825850-882383,882384-883981* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 25 06:55:27 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml:699795-705848 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml:825850-883981
