Modified the log bundle package structure, since there didn't appear to be
any need for an impl package when the log package was already private.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@743522 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/log/pom.xml b/log/pom.xml
index c518c80..33b9bb5 100644
--- a/log/pom.xml
+++ b/log/pom.xml
@@ -27,7 +27,7 @@
<packaging>bundle</packaging>
<name>Apache Felix Log Service</name>
<description>
- This bundle provides an implementation of the OSGi R4 Log service.
+ A simple implementation of the OSGi R4 Log service.
</description>
<version>0.9.0-SNAPSHOT</version>
<artifactId>org.apache.felix.log</artifactId>
@@ -35,12 +35,12 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.0.1</version>
+ <version>1.2.0</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>1.0.0</version>
+ <version>1.2.0</version>
</dependency>
</dependencies>
<build>
@@ -53,9 +53,9 @@
<configuration>
<instructions>
<Export-Package>org.osgi.service.log</Export-Package>
- <Private-Package>org.apache.felix.log.impl</Private-Package>
+ <Private-Package>org.apache.felix.log</Private-Package>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Bundle-Activator>${pom.artifactId}.impl.Activator</Bundle-Activator>
+ <Bundle-Activator>${pom.artifactId}.Activator</Bundle-Activator>
<Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
<Export-Service>org.osgi.service.log.LogService,org.osgi.service.log.LogReaderService</Export-Service>
</instructions>
diff --git a/log/src/main/java/org/apache/felix/log/impl/Activator.java b/log/src/main/java/org/apache/felix/log/Activator.java
similarity index 99%
rename from log/src/main/java/org/apache/felix/log/impl/Activator.java
rename to log/src/main/java/org/apache/felix/log/Activator.java
index 040c5da..9746ad9 100644
--- a/log/src/main/java/org/apache/felix/log/impl/Activator.java
+++ b/log/src/main/java/org/apache/felix/log/Activator.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.log.impl;
+package org.apache.felix.log;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
diff --git a/log/src/main/java/org/apache/felix/log/impl/Log.java b/log/src/main/java/org/apache/felix/log/Log.java
similarity index 99%
rename from log/src/main/java/org/apache/felix/log/impl/Log.java
rename to log/src/main/java/org/apache/felix/log/Log.java
index 7015c74..2ced014 100644
--- a/log/src/main/java/org/apache/felix/log/impl/Log.java
+++ b/log/src/main/java/org/apache/felix/log/Log.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.log.impl;
+package org.apache.felix.log;
import java.util.Enumeration;
diff --git a/log/src/main/java/org/apache/felix/log/impl/LogEntryImpl.java b/log/src/main/java/org/apache/felix/log/LogEntryImpl.java
similarity index 99%
rename from log/src/main/java/org/apache/felix/log/impl/LogEntryImpl.java
rename to log/src/main/java/org/apache/felix/log/LogEntryImpl.java
index bdf36c3..9b47ee1 100644
--- a/log/src/main/java/org/apache/felix/log/impl/LogEntryImpl.java
+++ b/log/src/main/java/org/apache/felix/log/LogEntryImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.log.impl;
+package org.apache.felix.log;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
diff --git a/log/src/main/java/org/apache/felix/log/impl/LogException.java b/log/src/main/java/org/apache/felix/log/LogException.java
similarity index 98%
rename from log/src/main/java/org/apache/felix/log/impl/LogException.java
rename to log/src/main/java/org/apache/felix/log/LogException.java
index 29422d2..ec4e707 100644
--- a/log/src/main/java/org/apache/felix/log/impl/LogException.java
+++ b/log/src/main/java/org/apache/felix/log/LogException.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.log.impl;
+package org.apache.felix.log;
/**
* Implementation dependent exception class used to avoid references to any
diff --git a/log/src/main/java/org/apache/felix/log/impl/LogListenerThread.java b/log/src/main/java/org/apache/felix/log/LogListenerThread.java
similarity index 98%
rename from log/src/main/java/org/apache/felix/log/impl/LogListenerThread.java
rename to log/src/main/java/org/apache/felix/log/LogListenerThread.java
index 9b14a07..e3ade7d 100644
--- a/log/src/main/java/org/apache/felix/log/impl/LogListenerThread.java
+++ b/log/src/main/java/org/apache/felix/log/LogListenerThread.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.log.impl;
+package org.apache.felix.log;
import java.util.Iterator;
import java.util.List;
diff --git a/log/src/main/java/org/apache/felix/log/impl/LogNode.java b/log/src/main/java/org/apache/felix/log/LogNode.java
similarity index 98%
rename from log/src/main/java/org/apache/felix/log/impl/LogNode.java
rename to log/src/main/java/org/apache/felix/log/LogNode.java
index 52176ec..63e22e3 100644
--- a/log/src/main/java/org/apache/felix/log/impl/LogNode.java
+++ b/log/src/main/java/org/apache/felix/log/LogNode.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.log.impl;
+package org.apache.felix.log;
import org.osgi.service.log.LogEntry;
diff --git a/log/src/main/java/org/apache/felix/log/impl/LogNodeEnumeration.java b/log/src/main/java/org/apache/felix/log/LogNodeEnumeration.java
similarity index 98%
rename from log/src/main/java/org/apache/felix/log/impl/LogNodeEnumeration.java
rename to log/src/main/java/org/apache/felix/log/LogNodeEnumeration.java
index c8412e8..dc6a484 100644
--- a/log/src/main/java/org/apache/felix/log/impl/LogNodeEnumeration.java
+++ b/log/src/main/java/org/apache/felix/log/LogNodeEnumeration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.log.impl;
+package org.apache.felix.log;
import java.util.Enumeration;
diff --git a/log/src/main/java/org/apache/felix/log/impl/LogReaderServiceFactory.java b/log/src/main/java/org/apache/felix/log/LogReaderServiceFactory.java
similarity index 98%
rename from log/src/main/java/org/apache/felix/log/impl/LogReaderServiceFactory.java
rename to log/src/main/java/org/apache/felix/log/LogReaderServiceFactory.java
index d05ca40..a51933a 100644
--- a/log/src/main/java/org/apache/felix/log/impl/LogReaderServiceFactory.java
+++ b/log/src/main/java/org/apache/felix/log/LogReaderServiceFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.log.impl;
+package org.apache.felix.log;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceFactory;
diff --git a/log/src/main/java/org/apache/felix/log/impl/LogReaderServiceImpl.java b/log/src/main/java/org/apache/felix/log/LogReaderServiceImpl.java
similarity index 98%
rename from log/src/main/java/org/apache/felix/log/impl/LogReaderServiceImpl.java
rename to log/src/main/java/org/apache/felix/log/LogReaderServiceImpl.java
index e94dc9b..2cce444 100644
--- a/log/src/main/java/org/apache/felix/log/impl/LogReaderServiceImpl.java
+++ b/log/src/main/java/org/apache/felix/log/LogReaderServiceImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.log.impl;
+package org.apache.felix.log;
import java.util.Enumeration;
import java.util.Iterator;
diff --git a/log/src/main/java/org/apache/felix/log/impl/LogServiceFactory.java b/log/src/main/java/org/apache/felix/log/LogServiceFactory.java
similarity index 98%
rename from log/src/main/java/org/apache/felix/log/impl/LogServiceFactory.java
rename to log/src/main/java/org/apache/felix/log/LogServiceFactory.java
index 9e3a783..9dfd9be 100644
--- a/log/src/main/java/org/apache/felix/log/impl/LogServiceFactory.java
+++ b/log/src/main/java/org/apache/felix/log/LogServiceFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.log.impl;
+package org.apache.felix.log;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceFactory;
diff --git a/log/src/main/java/org/apache/felix/log/impl/LogServiceImpl.java b/log/src/main/java/org/apache/felix/log/LogServiceImpl.java
similarity index 98%
rename from log/src/main/java/org/apache/felix/log/impl/LogServiceImpl.java
rename to log/src/main/java/org/apache/felix/log/LogServiceImpl.java
index d6e3f6b..f6bb51b 100644
--- a/log/src/main/java/org/apache/felix/log/impl/LogServiceImpl.java
+++ b/log/src/main/java/org/apache/felix/log/LogServiceImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.log.impl;
+package org.apache.felix.log;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;