diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js index 3a039693d..76efced97 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js @@ -186,6 +186,20 @@ $(function() { $(this).parent("li").addClass("active"); }) + $( "#quick-search-autocomplete" ).autocomplete({ + + minLength: 3, + source: function( request, response ) { + $.log("source"); + return ["foo","bar"]; + /*var data = $.getJSON( "restServices/archivaServices/searchService/quickSearch?queryString="+encodeURIComponent(request.term)); + return $.map(data,function(item){ + return item.artifactId; + })*/ + } + }); + + } startArchivaApplication(); }) diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html index ec1c024b9..b2ebff1c3 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html @@ -49,7 +49,7 @@
  • diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java index ed7d93086..4e70d48f5 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java @@ -226,6 +226,12 @@ public class Maven2RepositoryStorage .setTwoPhaseBuilding( false ) .setValidationLevel( ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL ); + + //MRM-1607. olamy this will resolve jdk profiles on the current running archiva jvm + req.setSystemProperties( System.getProperties() ); + + + // MRM-1411 req.setModelResolver( new RepositoryModelResolver( basedir, pathTranslator, wagonFactory, remoteRepositories, networkProxies, diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java index 1f864cd72..20b839d5e 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java @@ -131,6 +131,16 @@ public class Maven2RepositoryMetadataResolverTest when( wagonFactory.getWagon( "wagon#http" ) ).thenReturn( wagon ); } + @Test + public void testModelWithJdkProfileActivation() + throws Exception + { + + ProjectVersionMetadata metadata = + storage.readProjectVersionMetadata( TEST_REPO_ID, "org.apache.maven", "maven-archiver", "2.4.1" ); + MavenProjectFacet facet = (MavenProjectFacet) metadata.getFacet( MavenProjectFacet.FACET_ID ); + } + @Test public void testGetProjectVersionMetadata() throws Exception @@ -633,10 +643,11 @@ public class Maven2RepositoryMetadataResolverTest assertEquals( Arrays.asList( "apache" ), storage.listProjects( TEST_REPO_ID, "org.apache", ALL ) ); assertEquals( Arrays.asList( "archiva", "archiva-base", "archiva-common", "archiva-modules", "archiva-parent" ), storage.listProjects( TEST_REPO_ID, "org.apache.archiva", ALL ) ); - assertEquals( Collections.emptyList(), storage.listProjects( TEST_REPO_ID, "org.apache.maven", ALL ) ); + assertEquals( Arrays.asList( "maven-archiver", "maven-parent" ), + storage.listProjects( TEST_REPO_ID, "org.apache.maven", ALL ) ); assertEquals( Collections.emptyList(), storage.listProjects( TEST_REPO_ID, "org.apache.maven.plugins", ALL ) ); - assertEquals( Arrays.asList( "maven-downloader" ), + assertEquals( Arrays.asList( "maven-downloader", "maven-shared-components" ), storage.listProjects( TEST_REPO_ID, "org.apache.maven.shared", ALL ) ); } @@ -653,7 +664,7 @@ public class Maven2RepositoryMetadataResolverTest assertEquals( Arrays.asList( "1.0" ), storage.listProjectVersions( TEST_REPO_ID, "com.example.test", "invalid-pom", ALL ) ); - assertEquals( Arrays.asList( "4", "5-SNAPSHOT" ), + assertEquals( Arrays.asList( "4", "5-SNAPSHOT", "7" ), storage.listProjectVersions( TEST_REPO_ID, "org.apache", "apache", ALL ) ); assertEquals( Arrays.asList( "1.2.1", "1.2.2" ),