Renamed a bundle to prevent release horror:
- the latest released version of `org.apache.ace.repository.servlet` exported
its private packages, but without any other project relying on this. Bnd
really does not like this, so renaming the bundle appears to be the only
option.
git-svn-id: https://svn.apache.org/repos/asf/ace/trunk@1727620 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/org.apache.ace.authentication.itest/bnd.bnd b/org.apache.ace.authentication.itest/bnd.bnd
index f887635..32048a4 100644
--- a/org.apache.ace.authentication.itest/bnd.bnd
+++ b/org.apache.ace.authentication.itest/bnd.bnd
@@ -61,7 +61,7 @@
org.apache.ace.range.api;version=latest,\
org.apache.ace.repository.api;version=latest,\
org.apache.ace.repository.impl;version=latest,\
- org.apache.ace.repository.servlet;version=latest,\
+ org.apache.ace.repository.servlets;version=latest,\
org.apache.ace.resourceprocessor.useradmin;version=latest,\
org.apache.ace.scheduler.impl;version=latest,\
org.apache.ace.test;version=latest,\
diff --git a/org.apache.ace.client.repository.itest/bnd.bnd b/org.apache.ace.client.repository.itest/bnd.bnd
index 2affd7b..8abee5c 100644
--- a/org.apache.ace.client.repository.itest/bnd.bnd
+++ b/org.apache.ace.client.repository.itest/bnd.bnd
@@ -59,7 +59,7 @@
org.apache.ace.log.server.store.file;version=latest,\
org.apache.ace.repository.api;version=latest,\
org.apache.ace.repository.impl;version=latest,\
- org.apache.ace.repository.servlet;version=latest,\
+ org.apache.ace.repository.servlets;version=latest,\
org.apache.ace.obr.metadata;version=latest,\
org.apache.ace.obr.servlet;version=latest,\
org.apache.ace.obr.storage;version=latest,\
diff --git a/org.apache.ace.client.rest.itest/bnd.bnd b/org.apache.ace.client.rest.itest/bnd.bnd
index 4aeb8da..a2aa3dc 100644
--- a/org.apache.ace.client.rest.itest/bnd.bnd
+++ b/org.apache.ace.client.rest.itest/bnd.bnd
@@ -60,7 +60,7 @@
org.apache.ace.log.server.store.file;version=latest,\
org.apache.ace.repository.api;version=latest,\
org.apache.ace.repository.impl;version=latest,\
- org.apache.ace.repository.servlet;version=latest,\
+ org.apache.ace.repository.servlets;version=latest,\
org.apache.ace.obr.metadata;version=latest,\
org.apache.ace.obr.servlet;version=latest,\
org.apache.ace.obr.storage;version=latest,\
diff --git a/org.apache.ace.configurator.useradmin.itest/bnd.bnd b/org.apache.ace.configurator.useradmin.itest/bnd.bnd
index 150d15d..b1b1078 100644
--- a/org.apache.ace.configurator.useradmin.itest/bnd.bnd
+++ b/org.apache.ace.configurator.useradmin.itest/bnd.bnd
@@ -37,7 +37,7 @@
org.apache.ace.connectionfactory;version=latest,\
org.apache.ace.scheduler.impl;version=latest,\
org.apache.ace.repository.impl;version=latest,\
- org.apache.ace.repository.servlet;version=latest,\
+ org.apache.ace.repository.servlets;version=latest,\
org.apache.ace.configurator.useradmin.task;version=latest,\
org.apache.ace.feedback.common;version=latest
Private-Package: org.apache.ace.it.useradminconfigurator
diff --git a/org.apache.ace.deployment.itest/bnd.bnd b/org.apache.ace.deployment.itest/bnd.bnd
index 272fcb5..c893765 100644
--- a/org.apache.ace.deployment.itest/bnd.bnd
+++ b/org.apache.ace.deployment.itest/bnd.bnd
@@ -57,7 +57,7 @@
org.apache.ace.repository.api;version=latest,\
org.apache.ace.repository.ext;version=latest,\
org.apache.ace.repository.impl;version=latest,\
- org.apache.ace.repository.servlet;version=latest,\
+ org.apache.ace.repository.servlets;version=latest,\
org.apache.ace.repository.task;version=latest,\
org.apache.ace.scheduler.impl;version=latest,\
org.apache.ace.scheduler.api;version=latest,\
diff --git a/org.apache.ace.repository.itest/bnd.bnd b/org.apache.ace.repository.itest/bnd.bnd
index 94c4cf5..73fbd33 100644
--- a/org.apache.ace.repository.itest/bnd.bnd
+++ b/org.apache.ace.repository.itest/bnd.bnd
@@ -9,7 +9,6 @@
org.apache.ace.test;version=latest,\
org.apache.ace.http.listener;version=latest,\
org.apache.ace.repository.api;version=latest,\
- org.apache.ace.repository.servlet;version=latest,\
org.apache.felix.dependencymanager
-runfw: org.apache.felix.framework;version='[5.2.0,6)'
-runvm: -ea
@@ -27,7 +26,7 @@
org.apache.ace.range.api;version=latest,\
org.apache.ace.repository.api;version=latest,\
org.apache.ace.repository.impl;version=latest,\
- org.apache.ace.repository.servlet;version=latest
+ org.apache.ace.repository.servlets;version=latest
Private-Package: org.apache.ace.it.repository
Bundle-Version: 1.0.0
Bundle-Name: Apache ACE Repository itest
diff --git a/org.apache.ace.repository/servlet.bnd b/org.apache.ace.repository/servlets.bnd
similarity index 100%
rename from org.apache.ace.repository/servlet.bnd
rename to org.apache.ace.repository/servlets.bnd
diff --git a/org.apache.ace.useradmin.ui.itest/bnd.bnd b/org.apache.ace.useradmin.ui.itest/bnd.bnd
index 3683070..05b5427 100644
--- a/org.apache.ace.useradmin.ui.itest/bnd.bnd
+++ b/org.apache.ace.useradmin.ui.itest/bnd.bnd
@@ -29,7 +29,7 @@
org.apache.ace.range.api;version=latest,\
org.apache.ace.repository.api;version=latest,\
org.apache.ace.repository.impl;version=latest,\
- org.apache.ace.repository.servlet;version=latest,\
+ org.apache.ace.repository.servlets;version=latest,\
org.apache.ace.resourceprocessor.useradmin;version=latest,\
org.apache.ace.scheduler.impl;version=latest,\
org.apache.ace.test;version=latest,\
diff --git a/run-relay/relay.bndrun b/run-relay/relay.bndrun
index bdf6c05..0153acd 100644
--- a/run-relay/relay.bndrun
+++ b/run-relay/relay.bndrun
@@ -38,7 +38,7 @@
org.apache.ace.range.api;version=latest,\
org.apache.ace.repository.api;version=latest,\
org.apache.ace.repository.impl;version=latest,\
- org.apache.ace.repository.servlet;version=latest,\
+ org.apache.ace.repository.servlets;version=latest,\
org.apache.ace.repository.task;version=latest,\
org.apache.ace.scheduler.impl;version=latest
-runrepos: Workspace,\
diff --git a/run-server-allinone/server-allinone.bndrun b/run-server-allinone/server-allinone.bndrun
index 8526167..b4042bd 100644
--- a/run-server-allinone/server-allinone.bndrun
+++ b/run-server-allinone/server-allinone.bndrun
@@ -50,7 +50,7 @@
org.apache.ace.range.api;version=latest,\
org.apache.ace.repository.api;version=latest,\
org.apache.ace.repository.impl;version=latest,\
- org.apache.ace.repository.servlet;version=latest,\
+ org.apache.ace.repository.servlets;version=latest,\
org.apache.ace.resourceprocessor.useradmin;version=latest,\
org.apache.ace.scheduler.impl;version=latest,\
org.apache.ace.tageditor;version=latest,\
diff --git a/run-server/server.bndrun b/run-server/server.bndrun
index 2455584..45406c5 100644
--- a/run-server/server.bndrun
+++ b/run-server/server.bndrun
@@ -34,7 +34,7 @@
org.apache.ace.range.api;version=latest,\
org.apache.ace.repository.api;version=latest,\
org.apache.ace.repository.impl;version=latest,\
- org.apache.ace.repository.servlet;version=latest,\
+ org.apache.ace.repository.servlets;version=latest,\
org.apache.ace.resourceprocessor.useradmin;version=latest,\
org.apache.ace.scheduler.impl;version=latest,\
org.apache.ace.log.server.store.api;version=latest,\
