FELIX-2642 Adapt Felix implementation package and fix Export-Package
and Private-Package and Bundle-Activator references in the POM
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1067011 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/coordinator/pom.xml b/coordinator/pom.xml
index 5a29cf3..6ee2f58 100644
--- a/coordinator/pom.xml
+++ b/coordinator/pom.xml
@@ -79,16 +79,16 @@
http://felix.apache.org/site/apache-felix-coordination-service.html
</Bundle-DocURL>
<Export-Package>
- org.apache.felix.jmx.service.coordination;
- org.apache.felix.service.coordination;
+ org.apache.felix.jmx.service.coordinator;
+ org.apache.felix.service.coordinator;
version=1.0;
mandatory:="status"; status="provisional"
</Export-Package>
<Private-Package>
- org.apache.felix.coordination.impl.*
+ org.apache.felix.coordinator.impl.*
</Private-Package>
<Bundle-Activator>
- org.apache.felix.coordination.impl.Activator
+ org.apache.felix.coordinator.impl.Activator
</Bundle-Activator>
</instructions>
</configuration>
diff --git a/coordinator/src/main/java/org/apache/felix/coordination/impl/Activator.java b/coordinator/src/main/java/org/apache/felix/coordinator/impl/Activator.java
similarity index 98%
rename from coordinator/src/main/java/org/apache/felix/coordination/impl/Activator.java
rename to coordinator/src/main/java/org/apache/felix/coordinator/impl/Activator.java
index 7196ec4..0efb92d 100644
--- a/coordinator/src/main/java/org/apache/felix/coordination/impl/Activator.java
+++ b/coordinator/src/main/java/org/apache/felix/coordinator/impl/Activator.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.coordination.impl;
+package org.apache.felix.coordinator.impl;
import java.util.Hashtable;
diff --git a/coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinationImpl.java b/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationImpl.java
similarity index 99%
rename from coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinationImpl.java
rename to coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationImpl.java
index 4e2010b..ac222e7 100644
--- a/coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinationImpl.java
+++ b/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.coordination.impl;
+package org.apache.felix.coordinator.impl;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinationMgr.java b/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationMgr.java
similarity index 99%
rename from coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinationMgr.java
rename to coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationMgr.java
index b696205..7faa675 100644
--- a/coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinationMgr.java
+++ b/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationMgr.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.coordination.impl;
+package org.apache.felix.coordinator.impl;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinatorImpl.java b/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinatorImpl.java
similarity index 98%
rename from coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinatorImpl.java
rename to coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinatorImpl.java
index 7ef8c6c..9fd74c3 100644
--- a/coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinatorImpl.java
+++ b/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinatorImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.coordination.impl;
+package org.apache.felix.coordinator.impl;
import java.util.Collection;
import java.util.HashSet;
diff --git a/coordinator/src/main/java/org/apache/felix/coordination/impl/CrdCommand.java b/coordinator/src/main/java/org/apache/felix/coordinator/impl/CrdCommand.java
similarity index 98%
rename from coordinator/src/main/java/org/apache/felix/coordination/impl/CrdCommand.java
rename to coordinator/src/main/java/org/apache/felix/coordinator/impl/CrdCommand.java
index c8fd5fd..d5687a6 100644
--- a/coordinator/src/main/java/org/apache/felix/coordination/impl/CrdCommand.java
+++ b/coordinator/src/main/java/org/apache/felix/coordinator/impl/CrdCommand.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.coordination.impl;
+package org.apache.felix.coordinator.impl;
import java.util.Collection;
import java.util.Hashtable;
diff --git a/coordinator/src/test/java/org/apache/felix/coordination/impl/CoordinatorImplTest.java b/coordinator/src/test/java/org/apache/felix/coordinator/impl/CoordinatorImplTest.java
similarity index 98%
rename from coordinator/src/test/java/org/apache/felix/coordination/impl/CoordinatorImplTest.java
rename to coordinator/src/test/java/org/apache/felix/coordinator/impl/CoordinatorImplTest.java
index f6dfe88..5b0e321 100644
--- a/coordinator/src/test/java/org/apache/felix/coordination/impl/CoordinatorImplTest.java
+++ b/coordinator/src/test/java/org/apache/felix/coordinator/impl/CoordinatorImplTest.java
@@ -16,8 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.coordination.impl;
+package org.apache.felix.coordinator.impl;
+import org.apache.felix.coordinator.impl.CoordinationMgr;
+import org.apache.felix.coordinator.impl.CoordinatorImpl;
import org.apache.felix.service.coordinator.Coordination;
import org.apache.felix.service.coordinator.CoordinationException;
import org.apache.felix.service.coordinator.Participant;