You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2009/02/11 22:47:27 UTC

svn commit: r743522 - in /felix/trunk/log: ./ src/main/java/org/apache/felix/log/ src/main/java/org/apache/felix/log/impl/

Author: rickhall
Date: Wed Feb 11 21:47:26 2009
New Revision: 743522

URL: http://svn.apache.org/viewvc?rev=743522&view=rev
Log:
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.

Added:
    felix/trunk/log/src/main/java/org/apache/felix/log/Activator.java
      - copied, changed from r743434, felix/trunk/log/src/main/java/org/apache/felix/log/impl/Activator.java
    felix/trunk/log/src/main/java/org/apache/felix/log/Log.java
      - copied, changed from r743434, felix/trunk/log/src/main/java/org/apache/felix/log/impl/Log.java
    felix/trunk/log/src/main/java/org/apache/felix/log/LogEntryImpl.java
      - copied, changed from r743434, felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogEntryImpl.java
    felix/trunk/log/src/main/java/org/apache/felix/log/LogException.java
      - copied, changed from r743434, felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogException.java
    felix/trunk/log/src/main/java/org/apache/felix/log/LogListenerThread.java
      - copied, changed from r743434, felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogListenerThread.java
    felix/trunk/log/src/main/java/org/apache/felix/log/LogNode.java
      - copied, changed from r743434, felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogNode.java
    felix/trunk/log/src/main/java/org/apache/felix/log/LogNodeEnumeration.java
      - copied, changed from r743434, felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogNodeEnumeration.java
    felix/trunk/log/src/main/java/org/apache/felix/log/LogReaderServiceFactory.java
      - copied, changed from r743434, felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogReaderServiceFactory.java
    felix/trunk/log/src/main/java/org/apache/felix/log/LogReaderServiceImpl.java
      - copied, changed from r743434, felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogReaderServiceImpl.java
    felix/trunk/log/src/main/java/org/apache/felix/log/LogServiceFactory.java
      - copied, changed from r743434, felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogServiceFactory.java
    felix/trunk/log/src/main/java/org/apache/felix/log/LogServiceImpl.java
      - copied, changed from r743434, felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogServiceImpl.java
Removed:
    felix/trunk/log/src/main/java/org/apache/felix/log/impl/Activator.java
    felix/trunk/log/src/main/java/org/apache/felix/log/impl/Log.java
    felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogEntryImpl.java
    felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogException.java
    felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogListenerThread.java
    felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogNode.java
    felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogNodeEnumeration.java
    felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogReaderServiceFactory.java
    felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogReaderServiceImpl.java
    felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogServiceFactory.java
    felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogServiceImpl.java
Modified:
    felix/trunk/log/pom.xml

Modified: felix/trunk/log/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/log/pom.xml?rev=743522&r1=743521&r2=743522&view=diff
==============================================================================
--- felix/trunk/log/pom.xml (original)
+++ felix/trunk/log/pom.xml Wed Feb 11 21:47:26 2009
@@ -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>

Copied: felix/trunk/log/src/main/java/org/apache/felix/log/Activator.java (from r743434, felix/trunk/log/src/main/java/org/apache/felix/log/impl/Activator.java)
URL: http://svn.apache.org/viewvc/felix/trunk/log/src/main/java/org/apache/felix/log/Activator.java?p2=felix/trunk/log/src/main/java/org/apache/felix/log/Activator.java&p1=felix/trunk/log/src/main/java/org/apache/felix/log/impl/Activator.java&r1=743434&r2=743522&rev=743522&view=diff
==============================================================================
--- felix/trunk/log/src/main/java/org/apache/felix/log/impl/Activator.java (original)
+++ felix/trunk/log/src/main/java/org/apache/felix/log/Activator.java Wed Feb 11 21:47:26 2009
@@ -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;

Copied: felix/trunk/log/src/main/java/org/apache/felix/log/Log.java (from r743434, felix/trunk/log/src/main/java/org/apache/felix/log/impl/Log.java)
URL: http://svn.apache.org/viewvc/felix/trunk/log/src/main/java/org/apache/felix/log/Log.java?p2=felix/trunk/log/src/main/java/org/apache/felix/log/Log.java&p1=felix/trunk/log/src/main/java/org/apache/felix/log/impl/Log.java&r1=743434&r2=743522&rev=743522&view=diff
==============================================================================
--- felix/trunk/log/src/main/java/org/apache/felix/log/impl/Log.java (original)
+++ felix/trunk/log/src/main/java/org/apache/felix/log/Log.java Wed Feb 11 21:47:26 2009
@@ -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;
 

Copied: felix/trunk/log/src/main/java/org/apache/felix/log/LogEntryImpl.java (from r743434, felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogEntryImpl.java)
URL: http://svn.apache.org/viewvc/felix/trunk/log/src/main/java/org/apache/felix/log/LogEntryImpl.java?p2=felix/trunk/log/src/main/java/org/apache/felix/log/LogEntryImpl.java&p1=felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogEntryImpl.java&r1=743434&r2=743522&rev=743522&view=diff
==============================================================================
--- felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogEntryImpl.java (original)
+++ felix/trunk/log/src/main/java/org/apache/felix/log/LogEntryImpl.java Wed Feb 11 21:47:26 2009
@@ -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;

Copied: felix/trunk/log/src/main/java/org/apache/felix/log/LogException.java (from r743434, felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogException.java)
URL: http://svn.apache.org/viewvc/felix/trunk/log/src/main/java/org/apache/felix/log/LogException.java?p2=felix/trunk/log/src/main/java/org/apache/felix/log/LogException.java&p1=felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogException.java&r1=743434&r2=743522&rev=743522&view=diff
==============================================================================
--- felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogException.java (original)
+++ felix/trunk/log/src/main/java/org/apache/felix/log/LogException.java Wed Feb 11 21:47:26 2009
@@ -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

Copied: felix/trunk/log/src/main/java/org/apache/felix/log/LogListenerThread.java (from r743434, felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogListenerThread.java)
URL: http://svn.apache.org/viewvc/felix/trunk/log/src/main/java/org/apache/felix/log/LogListenerThread.java?p2=felix/trunk/log/src/main/java/org/apache/felix/log/LogListenerThread.java&p1=felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogListenerThread.java&r1=743434&r2=743522&rev=743522&view=diff
==============================================================================
--- felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogListenerThread.java (original)
+++ felix/trunk/log/src/main/java/org/apache/felix/log/LogListenerThread.java Wed Feb 11 21:47:26 2009
@@ -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;

Copied: felix/trunk/log/src/main/java/org/apache/felix/log/LogNode.java (from r743434, felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogNode.java)
URL: http://svn.apache.org/viewvc/felix/trunk/log/src/main/java/org/apache/felix/log/LogNode.java?p2=felix/trunk/log/src/main/java/org/apache/felix/log/LogNode.java&p1=felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogNode.java&r1=743434&r2=743522&rev=743522&view=diff
==============================================================================
--- felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogNode.java (original)
+++ felix/trunk/log/src/main/java/org/apache/felix/log/LogNode.java Wed Feb 11 21:47:26 2009
@@ -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;
 

Copied: felix/trunk/log/src/main/java/org/apache/felix/log/LogNodeEnumeration.java (from r743434, felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogNodeEnumeration.java)
URL: http://svn.apache.org/viewvc/felix/trunk/log/src/main/java/org/apache/felix/log/LogNodeEnumeration.java?p2=felix/trunk/log/src/main/java/org/apache/felix/log/LogNodeEnumeration.java&p1=felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogNodeEnumeration.java&r1=743434&r2=743522&rev=743522&view=diff
==============================================================================
--- felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogNodeEnumeration.java (original)
+++ felix/trunk/log/src/main/java/org/apache/felix/log/LogNodeEnumeration.java Wed Feb 11 21:47:26 2009
@@ -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;
 

Copied: felix/trunk/log/src/main/java/org/apache/felix/log/LogReaderServiceFactory.java (from r743434, felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogReaderServiceFactory.java)
URL: http://svn.apache.org/viewvc/felix/trunk/log/src/main/java/org/apache/felix/log/LogReaderServiceFactory.java?p2=felix/trunk/log/src/main/java/org/apache/felix/log/LogReaderServiceFactory.java&p1=felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogReaderServiceFactory.java&r1=743434&r2=743522&rev=743522&view=diff
==============================================================================
--- felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogReaderServiceFactory.java (original)
+++ felix/trunk/log/src/main/java/org/apache/felix/log/LogReaderServiceFactory.java Wed Feb 11 21:47:26 2009
@@ -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;

Copied: felix/trunk/log/src/main/java/org/apache/felix/log/LogReaderServiceImpl.java (from r743434, felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogReaderServiceImpl.java)
URL: http://svn.apache.org/viewvc/felix/trunk/log/src/main/java/org/apache/felix/log/LogReaderServiceImpl.java?p2=felix/trunk/log/src/main/java/org/apache/felix/log/LogReaderServiceImpl.java&p1=felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogReaderServiceImpl.java&r1=743434&r2=743522&rev=743522&view=diff
==============================================================================
--- felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogReaderServiceImpl.java (original)
+++ felix/trunk/log/src/main/java/org/apache/felix/log/LogReaderServiceImpl.java Wed Feb 11 21:47:26 2009
@@ -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;

Copied: felix/trunk/log/src/main/java/org/apache/felix/log/LogServiceFactory.java (from r743434, felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogServiceFactory.java)
URL: http://svn.apache.org/viewvc/felix/trunk/log/src/main/java/org/apache/felix/log/LogServiceFactory.java?p2=felix/trunk/log/src/main/java/org/apache/felix/log/LogServiceFactory.java&p1=felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogServiceFactory.java&r1=743434&r2=743522&rev=743522&view=diff
==============================================================================
--- felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogServiceFactory.java (original)
+++ felix/trunk/log/src/main/java/org/apache/felix/log/LogServiceFactory.java Wed Feb 11 21:47:26 2009
@@ -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;

Copied: felix/trunk/log/src/main/java/org/apache/felix/log/LogServiceImpl.java (from r743434, felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogServiceImpl.java)
URL: http://svn.apache.org/viewvc/felix/trunk/log/src/main/java/org/apache/felix/log/LogServiceImpl.java?p2=felix/trunk/log/src/main/java/org/apache/felix/log/LogServiceImpl.java&p1=felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogServiceImpl.java&r1=743434&r2=743522&rev=743522&view=diff
==============================================================================
--- felix/trunk/log/src/main/java/org/apache/felix/log/impl/LogServiceImpl.java (original)
+++ felix/trunk/log/src/main/java/org/apache/felix/log/LogServiceImpl.java Wed Feb 11 21:47:26 2009
@@ -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;