Repository: karaf-cave Updated Branches: refs/heads/master 63785326d -> 281e3fac7
http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/281e3fac/server/maven/src/test/java/org/apache/karaf/cave/server/maven/MavenProxyServletTest.java ---------------------------------------------------------------------- diff --git a/server/maven/src/test/java/org/apache/karaf/cave/server/maven/MavenProxyServletTest.java b/server/maven/src/test/java/org/apache/karaf/cave/server/maven/MavenProxyServletTest.java index cc55a1e..d58a9b2 100644 --- a/server/maven/src/test/java/org/apache/karaf/cave/server/maven/MavenProxyServletTest.java +++ b/server/maven/src/test/java/org/apache/karaf/cave/server/maven/MavenProxyServletTest.java @@ -99,57 +99,57 @@ public class MavenProxyServletTest { @Test public void testMetadataRegex() { - Matcher m = MavenProxyServlet.ARTIFACT_METADATA_URL_REGEX.matcher("groupId/artifactId/version/maven-metadata.xml"); + Matcher m = CaveMavenServlet.ARTIFACT_METADATA_URL_REGEX.matcher("groupId/artifactId/version/maven-metadata.xml"); assertTrue(m.matches()); assertEquals("maven-metadata.xml", m.group(4)); - m = MavenProxyServlet.ARTIFACT_METADATA_URL_REGEX.matcher("groupId/artifactId/version/maven-metadata-local.xml"); + m = CaveMavenServlet.ARTIFACT_METADATA_URL_REGEX.matcher("groupId/artifactId/version/maven-metadata-local.xml"); assertTrue(m.matches()); assertEquals("maven-metadata-local.xml", m.group(4)); assertEquals("local", m.group(6)); - m = MavenProxyServlet.ARTIFACT_METADATA_URL_REGEX.matcher("groupId/artifactId/version/maven-metadata-rep-1234.xml"); + m = CaveMavenServlet.ARTIFACT_METADATA_URL_REGEX.matcher("groupId/artifactId/version/maven-metadata-rep-1234.xml"); assertTrue(m.matches()); assertEquals("maven-metadata-rep-1234.xml", m.group(4)); assertEquals("rep-1234", m.group(6)); - m = MavenProxyServlet.ARTIFACT_METADATA_URL_REGEX.matcher("groupId/artifactId/version/maven-metadata.xml.md5"); + m = CaveMavenServlet.ARTIFACT_METADATA_URL_REGEX.matcher("groupId/artifactId/version/maven-metadata.xml.md5"); assertTrue(m.matches()); assertEquals("maven-metadata.xml", m.group(4)); } @Test public void testRepoRegex() { - Matcher m = MavenProxyServlet.REPOSITORY_ID_REGEX.matcher("repo1.maven.org/maven2@id=central"); + Matcher m = CaveMavenServlet.REPOSITORY_ID_REGEX.matcher("repo1.maven.org/maven2@id=central"); assertTrue(m.matches()); assertEquals("central", m.group(2)); - m = MavenProxyServlet.REPOSITORY_ID_REGEX.matcher("https://repo.fusesource.com/nexus/content/repositories/releases@id=fusereleases";); + m = CaveMavenServlet.REPOSITORY_ID_REGEX.matcher("https://repo.fusesource.com/nexus/content/repositories/releases@id=fusereleases";); assertTrue(m.matches()); assertEquals("fusereleases", m.group(2)); - m = MavenProxyServlet.REPOSITORY_ID_REGEX.matcher("repo1.maven.org/maven2@snapshots@id=central"); + m = CaveMavenServlet.REPOSITORY_ID_REGEX.matcher("repo1.maven.org/maven2@snapshots@id=central"); assertTrue(m.matches()); assertEquals("central", m.group(2)); - m = MavenProxyServlet.REPOSITORY_ID_REGEX.matcher("repo1.maven.org/maven2@id=central@snapshots"); + m = CaveMavenServlet.REPOSITORY_ID_REGEX.matcher("repo1.maven.org/maven2@id=central@snapshots"); assertTrue(m.matches()); assertEquals("central", m.group(2)); - m = MavenProxyServlet.REPOSITORY_ID_REGEX.matcher("repo1.maven.org/maven2@noreleases@id=central@snapshots"); + m = CaveMavenServlet.REPOSITORY_ID_REGEX.matcher("repo1.maven.org/maven2@noreleases@id=central@snapshots"); assertTrue(m.matches()); assertEquals("central", m.group(2)); } @Test(expected = InvalidMavenArtifactRequest.class) public void testConvertNullPath() throws InvalidMavenArtifactRequest { - MavenProxyServlet servlet = new MavenProxyServlet(createResolver(), 5, null, null, null); + CaveMavenServlet servlet = new CaveMavenServlet(createResolver(), 5, null, null, null); servlet.convertArtifactPathToCoord(null); } @Test public void testConvertNormalPath() throws InvalidMavenArtifactRequest { - MavenProxyServlet servlet = new MavenProxyServlet(createResolver(), 5, null, null, null); + CaveMavenServlet servlet = new CaveMavenServlet(createResolver(), 5, null, null, null); assertEquals("groupId:artifactId:extension:version",servlet.convertArtifactPathToCoord("groupId/artifactId/version/artifactId-version.extension").toString()); assertEquals("group.id:artifactId:extension:version",servlet.convertArtifactPathToCoord("group/id/artifactId/version/artifactId-version.extension").toString()); @@ -166,7 +166,7 @@ public class MavenProxyServletTest { @Test public void testConvertNormalPathWithClassifier() throws InvalidMavenArtifactRequest { - MavenProxyServlet servlet = new MavenProxyServlet(createResolver(), 5, null, null, null); + CaveMavenServlet servlet = new CaveMavenServlet(createResolver(), 5, null, null, null); assertEquals("groupId:artifactId:extension:classifier:version",servlet.convertArtifactPathToCoord("groupId/artifactId/version/artifactId-version-classifier.extension").toString()); assertEquals("group.id:artifactId:extension:classifier:version",servlet.convertArtifactPathToCoord("group/id/artifactId/version/artifactId-version-classifier.extension").toString()); @@ -190,7 +190,7 @@ public class MavenProxyServletTest { System.setProperty("karaf.data", new File("target").getCanonicalPath()); try { MavenResolver resolver = createResolver(); - MavenProxyServlet servlet = new MavenProxyServlet(resolver, 5, null, null, null); + CaveMavenServlet servlet = new CaveMavenServlet(resolver, 5, null, null, null); servlet.init(); } finally { if (old != null) { @@ -370,7 +370,7 @@ public class MavenProxyServletTest { int localPort = ((NetworkConnector) server.getConnectors()[0]).getLocalPort(); // TODO: local repo should point to target/tmp MavenResolver resolver = createResolver("target/tmp", "http://relevant.not/repo1@id=repo1,http://relevant.not/repo2@id=repo2";, "http", "localhost", localPort, "fuse", "fuse", null); - MavenProxyServlet servlet = new MavenProxyServlet(resolver, 5, null, null, null); + CaveMavenServlet servlet = new CaveMavenServlet(resolver, 5, null, null, null); AsyncContext context = EasyMock.createMock(AsyncContext.class); @@ -463,7 +463,7 @@ public class MavenProxyServletTest { int localPort = ((NetworkConnector) server.getConnectors()[0]).getLocalPort(); // TODO: local repo should point to target/tmp MavenResolver resolver = createResolver("target/tmp", "http://relevant.not/maven2@id=central";, "http", "localhost", localPort, "fuse", "fuse", null); - MavenProxyServlet servlet = new MavenProxyServlet(resolver, 5, null, null, null); + CaveMavenServlet servlet = new CaveMavenServlet(resolver, 5, null, null, null); AsyncContext context = EasyMock.createMock(AsyncContext.class); @@ -667,7 +667,7 @@ public class MavenProxyServletTest { try { int localPort = ((NetworkConnector) server.getConnectors()[0]).getLocalPort(); MavenResolver resolver = createResolver("target/tmp", "http://relevant.not/maven2@id=central";, "http", "localhost", localPort, "fuse", "fuse", null); - MavenProxyServlet servlet = new MavenProxyServlet(resolver, 5, null, null, null); + CaveMavenServlet servlet = new CaveMavenServlet(resolver, 5, null, null, null); HttpServletRequest request = EasyMock.createMock(HttpServletRequest.class); EasyMock.expect(request.getPathInfo()).andReturn(path); http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/281e3fac/server/rest/src/main/java/org/apache/karaf/cave/server/rest/Activator.java ---------------------------------------------------------------------- diff --git a/server/rest/src/main/java/org/apache/karaf/cave/server/rest/Activator.java b/server/rest/src/main/java/org/apache/karaf/cave/server/rest/Activator.java index 20a967d..d11e46b 100644 --- a/server/rest/src/main/java/org/apache/karaf/cave/server/rest/Activator.java +++ b/server/rest/src/main/java/org/apache/karaf/cave/server/rest/Activator.java @@ -25,6 +25,7 @@ import org.apache.karaf.util.tracker.BaseActivator; import org.apache.karaf.util.tracker.annotation.Managed; import org.apache.karaf.util.tracker.annotation.RequireService; import org.apache.karaf.util.tracker.annotation.Services; +import org.osgi.service.cm.ManagedService; import org.osgi.service.http.HttpService; @@ -32,8 +33,8 @@ import org.osgi.service.http.HttpService; requires = { @RequireService(CaveRepositoryService.class), @RequireService(HttpService.class) } ) -@Managed("org.apache.karaf.cave.rest") -public class Activator extends BaseActivator { +@Managed("org.apache.karaf.cave.server.rest") +public class Activator extends BaseActivator implements ManagedService { private HttpService httpService; private String alias; @@ -58,7 +59,7 @@ public class Activator extends BaseActivator { } } this.alias = alias; - this.servlet = new CXFNonSpringJaxrsServlet(service); + this.servlet = new CaveRestServlet(service); this.httpService.registerServlet(this.alias, this.servlet, config, null); } http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/281e3fac/server/rest/src/main/java/org/apache/karaf/cave/server/rest/CaveRestServlet.java ---------------------------------------------------------------------- diff --git a/server/rest/src/main/java/org/apache/karaf/cave/server/rest/CaveRestServlet.java b/server/rest/src/main/java/org/apache/karaf/cave/server/rest/CaveRestServlet.java new file mode 100644 index 0000000..74e505d --- /dev/null +++ b/server/rest/src/main/java/org/apache/karaf/cave/server/rest/CaveRestServlet.java @@ -0,0 +1,27 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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. + */ +package org.apache.karaf.cave.server.rest; + +import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet; + +public class CaveRestServlet extends CXFNonSpringJaxrsServlet { + + public CaveRestServlet(Object singletonService) { + super(singletonService); + } + +} http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/281e3fac/server/storage/src/main/java/org/apache/karaf/cave/server/storage/Activator.java ---------------------------------------------------------------------- diff --git a/server/storage/src/main/java/org/apache/karaf/cave/server/storage/Activator.java b/server/storage/src/main/java/org/apache/karaf/cave/server/storage/Activator.java index 8b41efd..36ea5ad 100644 --- a/server/storage/src/main/java/org/apache/karaf/cave/server/storage/Activator.java +++ b/server/storage/src/main/java/org/apache/karaf/cave/server/storage/Activator.java @@ -1,3 +1,19 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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. + */ package org.apache.karaf.cave.server.storage; import java.io.File; @@ -37,7 +53,7 @@ public class Activator extends BaseActivator implements ManagedService { protected void doStart() throws Exception { CaveRepositoryServiceImpl service = new CaveRepositoryServiceImpl(); service.setBundleContext(FrameworkUtil.getBundle(Activator.class).getBundleContext()); - service.setStorageLocation(new File(getString("storage.location", "cave"))); + service.setStorageLocation(new File(getString("cave.storage.location", System.getProperty("karaf.data") + "/cave"))); service.init(); register(CaveRepositoryService.class, service); }
