This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf-cave.git
The following commit(s) were added to refs/heads/master by this push:
new 25ecc14 [KARAF-5662] Fix registration of the CaveMavenServlet
25ecc14 is described below
commit 25ecc1417601437d83dbf4d301c8e34f03de2f1d
Author: Jean-Baptiste Onofré <jbono...@apache.org>
AuthorDate: Thu Mar 8 07:46:12 2018 +0100
[KARAF-5662] Fix registration of the CaveMavenServlet
---
assembly/src/main/resources/features.xml | 6 +++---
.../main/java/org/apache/karaf/cave/server/http/Activator.java | 2 +-
.../main/java/org/apache/karaf/cave/server/maven/Activator.java | 4 ++--
.../org/apache/karaf/cave/server/maven/CaveMavenServlet.java | 9 ---------
4 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/assembly/src/main/resources/features.xml
b/assembly/src/main/resources/features.xml
index a4d2b88..945a94e 100644
--- a/assembly/src/main/resources/features.xml
+++ b/assembly/src/main/resources/features.xml
@@ -44,14 +44,14 @@
</feature>
<feature name="cave-http" version="${project.version}">
- <feature dependency="true">http</feature>
+ <feature prerequisite="true">http</feature>
<requirement>osgi.service;effective:=active;filter:=(objectClass=org.osgi.service.http.HttpService)</requirement>
<feature>cave-storage</feature>
<bundle>mvn:org.apache.karaf.cave.server/org.apache.karaf.cave.server.http/${project.version}</bundle>
</feature>
<feature name="cave-rest" version="${project.version}">
- <feature dependency="true">http</feature>
+ <feature prerequisite="true">http</feature>
<requirement>osgi.service;effective:=active;filter:=(objectClass=org.osgi.service.http.HttpService)</requirement>
<feature version="[3,4)">cxf-jaxrs</feature>
<feature>cave-storage</feature>
@@ -59,7 +59,7 @@
</feature>
<feature name="cave-maven" version="${project.version}">
- <feature dependency="true">http</feature>
+ <feature prerequisite="true">http</feature>
<requirement>osgi.service;effective:=active;filter:=(objectClass=org.osgi.service.http.HttpService)</requirement>
<bundle>mvn:org.apache.karaf.cave.server/org.apache.karaf.cave.server.maven/${project.version}</bundle>
</feature>
diff --git
a/server/http/src/main/java/org/apache/karaf/cave/server/http/Activator.java
b/server/http/src/main/java/org/apache/karaf/cave/server/http/Activator.java
index 6ed5676..dd77c3d 100644
--- a/server/http/src/main/java/org/apache/karaf/cave/server/http/Activator.java
+++ b/server/http/src/main/java/org/apache/karaf/cave/server/http/Activator.java
@@ -59,7 +59,6 @@ public class Activator extends BaseActivator implements
ManagedService {
@Override
protected void doStop() {
- super.doStop();
if (httpService != null) {
try {
httpService.unregister(alias);
@@ -78,5 +77,6 @@ public class Activator extends BaseActivator implements
ManagedService {
servlet = null;
}
}
+ super.doStop();
}
}
diff --git
a/server/maven/src/main/java/org/apache/karaf/cave/server/maven/Activator.java
b/server/maven/src/main/java/org/apache/karaf/cave/server/maven/Activator.java
index ecf1693..2ae3c44 100644
---
a/server/maven/src/main/java/org/apache/karaf/cave/server/maven/Activator.java
+++
b/server/maven/src/main/java/org/apache/karaf/cave/server/maven/Activator.java
@@ -61,7 +61,7 @@ public class Activator extends BaseActivator implements
ManagedService {
config.put(key, val);
}
}
- this.resolver = MavenResolvers.createMavenResolver(null, config, pid);
+ this.resolver = MavenResolvers.createMavenResolver(config, pid);
this.alias = alias;
this.servlet = new CaveMavenServlet(this.resolver, poolSize, realm,
downloadRole, uploadRole);
this.httpService.registerServlet(this.alias, this.servlet, config,
null);
@@ -69,7 +69,6 @@ public class Activator extends BaseActivator implements
ManagedService {
@Override
protected void doStop() {
- super.doStop();
if (httpService != null) {
try {
httpService.unregister(alias);
@@ -97,5 +96,6 @@ public class Activator extends BaseActivator implements
ManagedService {
resolver = null;
}
}
+ super.doStop();
}
}
diff --git
a/server/maven/src/main/java/org/apache/karaf/cave/server/maven/CaveMavenServlet.java
b/server/maven/src/main/java/org/apache/karaf/cave/server/maven/CaveMavenServlet.java
index 5286da4..7e56614 100644
---
a/server/maven/src/main/java/org/apache/karaf/cave/server/maven/CaveMavenServlet.java
+++
b/server/maven/src/main/java/org/apache/karaf/cave/server/maven/CaveMavenServlet.java
@@ -117,7 +117,6 @@ public class CaveMavenServlet extends HttpServlet {
this.uploadRole = uploadRole;
}
-
//
// Lifecycle
//
@@ -146,8 +145,6 @@ public class CaveMavenServlet extends HttpServlet {
}
}
-
-
//
// Security
//
@@ -259,10 +256,6 @@ public class CaveMavenServlet extends HttpServlet {
}
}
-
-
-
-
//
// Download
//
@@ -401,8 +394,6 @@ public class CaveMavenServlet extends HttpServlet {
}
-
-
//
// Upload
//
--
To stop receiving notification emails like this one, please contact
jbono...@apache.org.
