incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r653310 - in /incubator/sling/trunk: commons/log/ commons/log/src/main/java/org/apache/sling/commons/ commons/log/src/main/java/org/apache/sling/commons/log/ commons/log/src/main/java/org/apache/sling/commons/log/slf4j/ commons/log/src/main...
Date Mon, 05 May 2008 06:42:27 GMT
Author: cziegeler
Date: Sun May  4 23:42:26 2008
New Revision: 653310

URL: http://svn.apache.org/viewvc?rev=653310&view=rev
Log:
SLING-406: Move log implementation to commons.

Added:
    incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/
    incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/
    incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/Activator.java
      - copied, changed from r653308, incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/osgi/log/Activator.java
    incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/LogEntryImpl.java
      - copied, changed from r653308, incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/osgi/log/LogEntryImpl.java
    incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/LogManager.java
      - copied, changed from r653308, incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/osgi/log/LogManager.java
    incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/LogReaderServiceFactory.java
      - copied, changed from r653308, incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/osgi/log/LogReaderServiceFactory.java
    incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/LogServiceFactory.java
      - copied, changed from r653308, incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/osgi/log/LogServiceFactory.java
    incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/LogSupport.java
      - copied, changed from r653308, incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/osgi/log/LogSupport.java
    incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/
      - copied from r653308, incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/osgi/log/slf4j/
    incubator/sling/trunk/commons/log/src/test/java/org/apache/sling/commons/
    incubator/sling/trunk/commons/log/src/test/java/org/apache/sling/commons/log/
    incubator/sling/trunk/commons/log/src/test/java/org/apache/sling/commons/log/slf4j/
      - copied from r653308, incubator/sling/trunk/commons/log/src/test/java/org/apache/sling/osgi/log/slf4j/
Removed:
    incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/osgi/
    incubator/sling/trunk/commons/log/src/test/java/org/apache/sling/osgi/
Modified:
    incubator/sling/trunk/commons/log/pom.xml
    incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/SlingLogFileWriter.java
    incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/SlingLogWriter.java
    incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/SlingLogger.java
    incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/SlingLoggerFactory.java
    incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/SlingLoggerLevel.java
    incubator/sling/trunk/commons/log/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
    incubator/sling/trunk/commons/log/src/main/resources/OSGI-INF/metatype/metatype.xml
    incubator/sling/trunk/commons/log/src/test/java/org/apache/sling/commons/log/slf4j/SlingLogFileWriterTest.java
    incubator/sling/trunk/commons/log/src/test/java/org/apache/sling/commons/log/slf4j/SlingLoggerTest.java
    incubator/sling/trunk/launchpad/app/pom.xml
    incubator/sling/trunk/launchpad/base/pom.xml
    incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launcher/app/main/Main.java
    incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java
    incubator/sling/trunk/launchpad/base/src/main/resources/sling.properties

Modified: incubator/sling/trunk/commons/log/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/log/pom.xml?rev=653310&r1=653309&r2=653310&view=diff
==============================================================================
--- incubator/sling/trunk/commons/log/pom.xml (original)
+++ incubator/sling/trunk/commons/log/pom.xml Sun May  4 23:42:26 2008
@@ -27,7 +27,7 @@
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
-    <artifactId>org.apache.sling.osgi.log</artifactId>
+    <artifactId>org.apache.sling.commons.log</artifactId>
     <version>2.0.0-incubator-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
@@ -58,7 +58,7 @@
                 <configuration>
                     <instructions>
                         <Bundle-Activator>
-                            org.apache.sling.osgi.log.Activator
+                            org.apache.sling.commons.log.Activator
                         </Bundle-Activator>
                         <Export-Package>
                             org.apache.commons.logging;version=1.0.4,
@@ -68,7 +68,7 @@
                         </Export-Package>
                         <Private-Package>
                             org.apache.commons.logging.impl,
-                            org.apache.sling.osgi.log.*,
+                            org.apache.sling.commons.log.*,
                             org.slf4j.helpers, org.slf4j.impl,
                             org.slf4j.spi
                         </Private-Package>

Copied: incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/Activator.java
(from r653308, incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/osgi/log/Activator.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/Activator.java?p2=incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/Activator.java&p1=incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/osgi/log/Activator.java&r1=653308&r2=653310&rev=653310&view=diff
==============================================================================
--- incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/osgi/log/Activator.java
(original)
+++ incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/Activator.java
Sun May  4 23:42:26 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.osgi.log;
+package org.apache.sling.commons.log;
 
 import java.util.Dictionary;
 import java.util.Hashtable;

Copied: incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/LogEntryImpl.java
(from r653308, incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/osgi/log/LogEntryImpl.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/LogEntryImpl.java?p2=incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/LogEntryImpl.java&p1=incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/osgi/log/LogEntryImpl.java&r1=653308&r2=653310&rev=653310&view=diff
==============================================================================
--- incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/osgi/log/LogEntryImpl.java
(original)
+++ incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/LogEntryImpl.java
Sun May  4 23:42:26 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.osgi.log;
+package org.apache.sling.commons.log;
 
 import org.osgi.framework.Bundle;
 import org.osgi.framework.ServiceReference;

Copied: incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/LogManager.java
(from r653308, incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/osgi/log/LogManager.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/LogManager.java?p2=incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/LogManager.java&p1=incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/osgi/log/LogManager.java&r1=653308&r2=653310&rev=653310&view=diff
==============================================================================
--- incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/osgi/log/LogManager.java
(original)
+++ incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/LogManager.java
Sun May  4 23:42:26 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.osgi.log;
+package org.apache.sling.commons.log;
 
 import java.io.File;
 import java.io.IOException;
@@ -25,11 +25,11 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.apache.sling.osgi.log.slf4j.SlingLogFileWriter;
-import org.apache.sling.osgi.log.slf4j.SlingLogWriter;
-import org.apache.sling.osgi.log.slf4j.SlingLogger;
-import org.apache.sling.osgi.log.slf4j.SlingLoggerFactory;
-import org.apache.sling.osgi.log.slf4j.SlingLoggerLevel;
+import org.apache.sling.commons.log.slf4j.SlingLogFileWriter;
+import org.apache.sling.commons.log.slf4j.SlingLogWriter;
+import org.apache.sling.commons.log.slf4j.SlingLogger;
+import org.apache.sling.commons.log.slf4j.SlingLoggerFactory;
+import org.apache.sling.commons.log.slf4j.SlingLoggerLevel;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceRegistration;
@@ -44,24 +44,24 @@
 
     /**
      * Initial configuration property specifying whether logging should be
-     * initialized here or not (value is "org.apache.sling.osgi.log.intialize").
+     * initialized here or not (value is "org.apache.sling.commons.log.intialize").
      * If this property is missing or set to <code>true</code>, this class
      * will reset and configure logging. Otherwise, logging is neither reset nor
      * configured by this class.
      */
-    public static final String LOG_INITIALIZE = "org.apache.sling.osgi.log.intialize";
+    public static final String LOG_INITIALIZE = "org.apache.sling.commons.log.intialize";
 
-    public static final String LOG_LEVEL = "org.apache.sling.osgi.log.level";
+    public static final String LOG_LEVEL = "org.apache.sling.commons.log.level";
 
-    public static final String LOG_FILE = "org.apache.sling.osgi.log.file";
+    public static final String LOG_FILE = "org.apache.sling.commons.log.file";
 
-    public static final String LOG_FILE_NUMBER = "org.apache.sling.osgi.log.file.number";
+    public static final String LOG_FILE_NUMBER = "org.apache.sling.commons.log.file.number";
 
-    public static final String LOG_FILE_SIZE = "org.apache.sling.osgi.log.file.size";
+    public static final String LOG_FILE_SIZE = "org.apache.sling.commons.log.file.size";
 
-    public static final String LOG_PATTERN = "org.apache.sling.osgi.log.pattern";
+    public static final String LOG_PATTERN = "org.apache.sling.commons.log.pattern";
 
-    public static final String LOG_CONFIG_URL = "org.apache.sling.osgi.log.url";
+    public static final String LOG_CONFIG_URL = "org.apache.sling.commons.log.url";
 
     public static final String LOG_PATTERN_DEFAULT = "{0,date,dd.MM.yyyy HH:mm:ss.SSS} *{4}*
[{2}] {3} {5}";
 
@@ -121,7 +121,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see org.osgi.service.cm.ManagedService#updated(java.util.Dictionary)
      */
     @SuppressWarnings("unchecked")
@@ -210,7 +210,7 @@
      * initial configuration. <p/> Sets up the initial logging properties for
      * the logging support until the real logging configuration file can be read
      * from the ContentBus.
-     * 
+     *
      * @param properties The <code>Properties</code> containing the initial
      *            configuration.
      * @throws NullPointerException if <code>properties</code> is

Copied: incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/LogReaderServiceFactory.java
(from r653308, incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/osgi/log/LogReaderServiceFactory.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/LogReaderServiceFactory.java?p2=incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/LogReaderServiceFactory.java&p1=incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/osgi/log/LogReaderServiceFactory.java&r1=653308&r2=653310&rev=653310&view=diff
==============================================================================
--- incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/osgi/log/LogReaderServiceFactory.java
(original)
+++ incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/LogReaderServiceFactory.java
Sun May  4 23:42:26 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.osgi.log;
+package org.apache.sling.commons.log;
 
 import java.util.Enumeration;
 

Copied: incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/LogServiceFactory.java
(from r653308, incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/osgi/log/LogServiceFactory.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/LogServiceFactory.java?p2=incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/LogServiceFactory.java&p1=incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/osgi/log/LogServiceFactory.java&r1=653308&r2=653310&rev=653310&view=diff
==============================================================================
--- incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/osgi/log/LogServiceFactory.java
(original)
+++ incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/LogServiceFactory.java
Sun May  4 23:42:26 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.osgi.log;
+package org.apache.sling.commons.log;
 
 import org.osgi.framework.Bundle;
 import org.osgi.framework.ServiceFactory;

Copied: incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/LogSupport.java
(from r653308, incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/osgi/log/LogSupport.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/LogSupport.java?p2=incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/LogSupport.java&p1=incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/osgi/log/LogSupport.java&r1=653308&r2=653310&rev=653310&view=diff
==============================================================================
--- incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/osgi/log/LogSupport.java
(original)
+++ incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/LogSupport.java
Sun May  4 23:42:26 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.osgi.log;
+package org.apache.sling.commons.log;
 
 import java.util.Enumeration;
 import java.util.HashMap;

Modified: incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/SlingLogFileWriter.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/SlingLogFileWriter.java?rev=653310&r1=653308&r2=653310&view=diff
==============================================================================
--- incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/SlingLogFileWriter.java
(original)
+++ incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/SlingLogFileWriter.java
Sun May  4 23:42:26 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.osgi.log.slf4j;
+package org.apache.sling.commons.log.slf4j;
 
 import java.io.File;
 import java.io.FileOutputStream;

Modified: incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/SlingLogWriter.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/SlingLogWriter.java?rev=653310&r1=653308&r2=653310&view=diff
==============================================================================
--- incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/SlingLogWriter.java
(original)
+++ incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/SlingLogWriter.java
Sun May  4 23:42:26 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.osgi.log.slf4j;
+package org.apache.sling.commons.log.slf4j;
 
 import java.io.IOException;
 import java.io.OutputStreamWriter;

Modified: incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/SlingLogger.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/SlingLogger.java?rev=653310&r1=653308&r2=653310&view=diff
==============================================================================
--- incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/SlingLogger.java
(original)
+++ incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/SlingLogger.java
Sun May  4 23:42:26 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.osgi.log.slf4j;
+package org.apache.sling.commons.log.slf4j;
 
 import java.io.IOException;
 import java.io.PrintWriter;

Modified: incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/SlingLoggerFactory.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/SlingLoggerFactory.java?rev=653310&r1=653308&r2=653310&view=diff
==============================================================================
--- incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/SlingLoggerFactory.java
(original)
+++ incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/SlingLoggerFactory.java
Sun May  4 23:42:26 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.osgi.log.slf4j;
+package org.apache.sling.commons.log.slf4j;
 
 import java.io.IOException;
 import java.text.MessageFormat;
@@ -25,7 +25,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.sling.osgi.log.LogManager;
+import org.apache.sling.commons.log.LogManager;
 import org.slf4j.ILoggerFactory;
 import org.slf4j.Logger;
 

Modified: incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/SlingLoggerLevel.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/SlingLoggerLevel.java?rev=653310&r1=653308&r2=653310&view=diff
==============================================================================
--- incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/SlingLoggerLevel.java
(original)
+++ incubator/sling/trunk/commons/log/src/main/java/org/apache/sling/commons/log/slf4j/SlingLoggerLevel.java
Sun May  4 23:42:26 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.osgi.log.slf4j;
+package org.apache.sling.commons.log.slf4j;
 
 public enum SlingLoggerLevel {
 

Modified: incubator/sling/trunk/commons/log/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/log/src/main/java/org/slf4j/impl/StaticLoggerBinder.java?rev=653310&r1=653309&r2=653310&view=diff
==============================================================================
--- incubator/sling/trunk/commons/log/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
(original)
+++ incubator/sling/trunk/commons/log/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
Sun May  4 23:42:26 2008
@@ -18,7 +18,7 @@
  */
 package org.slf4j.impl;
 
-import org.apache.sling.osgi.log.slf4j.SlingLoggerFactory;
+import org.apache.sling.commons.log.slf4j.SlingLoggerFactory;
 import org.slf4j.ILoggerFactory;
 import org.slf4j.spi.LoggerFactoryBinder;
 

Modified: incubator/sling/trunk/commons/log/src/main/resources/OSGI-INF/metatype/metatype.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/log/src/main/resources/OSGI-INF/metatype/metatype.xml?rev=653310&r1=653309&r2=653310&view=diff
==============================================================================
--- incubator/sling/trunk/commons/log/src/main/resources/OSGI-INF/metatype/metatype.xml (original)
+++ incubator/sling/trunk/commons/log/src/main/resources/OSGI-INF/metatype/metatype.xml Sun
May  4 23:42:26 2008
@@ -20,9 +20,9 @@
 <metatype:MetaData
     xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0"
     localization="metatype">
-    <metatype:OCD id="org.apache.sling.osgi.log.LogManager"
+    <metatype:OCD id="org.apache.sling.commons.log.LogManager"
         name="%log.name" description="%log.description">
-        <metatype:AD id="org.apache.sling.osgi.log.level" type="String"
+        <metatype:AD id="org.apache.sling.commons.log.level" type="String"
             default="info" name="%log.level.name"
             description="%log.level.description">
             <metatype:Option value="debug" label="Debug" />
@@ -30,29 +30,29 @@
             <metatype:Option value="warn" label="Warnings" />
             <metatype:Option value="error" label="Error" />
         </metatype:AD>
-        <metatype:AD id="org.apache.sling.osgi.log.file" type="String"
+        <metatype:AD id="org.apache.sling.commons.log.file" type="String"
             default="logs/error.log" name="%log.file.name"
             description="%log.file.description" />
-        <metatype:AD id="org.apache.sling.osgi.log.file.number" type="Integer"
+        <metatype:AD id="org.apache.sling.commons.log.file.number" type="Integer"
             default="5" name="%log.file.number.name"
             description="%log.file.number.description" />
-        <metatype:AD id="org.apache.sling.osgi.log.file.size" type="String"
+        <metatype:AD id="org.apache.sling.commons.log.file.size" type="String"
             default="10mb" name="%log.file.size.name"
             description="%log.file.size.description" />
-        <metatype:AD id="org.apache.sling.osgi.log.pattern" type="String"
+        <metatype:AD id="org.apache.sling.commons.log.pattern" type="String"
             default="{0\,date\,dd.MM.yyyy HH:mm:ss.SSS} *{4}* [{2}] {3} {5}"
             name="%log.pattern.name"
             description="%log.pattern.description" />
             
 <!-- 
         Log File configuration is not supported at the moment
-        <metatype:AD id="org.apache.sling.osgi.log.url" type="String"
+        <metatype:AD id="org.apache.sling.commons.log.url" type="String"
             default="" name="%log.url.name"
             description="%log.url.description" />
 -->
 
     </metatype:OCD>
-    <metatype:Designate pid="org.apache.sling.osgi.log.LogManager">
-        <metatype:Object ocdref="org.apache.sling.osgi.log.LogManager" />
+    <metatype:Designate pid="org.apache.sling.commons.log.LogManager">
+        <metatype:Object ocdref="org.apache.sling.commons.log.LogManager" />
     </metatype:Designate>
 </metatype:MetaData>

Modified: incubator/sling/trunk/commons/log/src/test/java/org/apache/sling/commons/log/slf4j/SlingLogFileWriterTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/log/src/test/java/org/apache/sling/commons/log/slf4j/SlingLogFileWriterTest.java?rev=653310&r1=653308&r2=653310&view=diff
==============================================================================
--- incubator/sling/trunk/commons/log/src/test/java/org/apache/sling/commons/log/slf4j/SlingLogFileWriterTest.java
(original)
+++ incubator/sling/trunk/commons/log/src/test/java/org/apache/sling/commons/log/slf4j/SlingLogFileWriterTest.java
Sun May  4 23:42:26 2008
@@ -16,11 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.osgi.log.slf4j;
+package org.apache.sling.commons.log.slf4j;
 
 import java.io.File;
 import java.io.IOException;
 
+import org.apache.sling.commons.log.slf4j.SlingLogFileWriter;
+
 import junit.framework.TestCase;
 
 public class SlingLogFileWriterTest extends TestCase {

Modified: incubator/sling/trunk/commons/log/src/test/java/org/apache/sling/commons/log/slf4j/SlingLoggerTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/log/src/test/java/org/apache/sling/commons/log/slf4j/SlingLoggerTest.java?rev=653310&r1=653308&r2=653310&view=diff
==============================================================================
--- incubator/sling/trunk/commons/log/src/test/java/org/apache/sling/commons/log/slf4j/SlingLoggerTest.java
(original)
+++ incubator/sling/trunk/commons/log/src/test/java/org/apache/sling/commons/log/slf4j/SlingLoggerTest.java
Sun May  4 23:42:26 2008
@@ -16,12 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.osgi.log.slf4j;
+package org.apache.sling.commons.log.slf4j;
 
 import java.io.IOException;
 import java.io.StringWriter;
 import java.text.MessageFormat;
 
+import org.apache.sling.commons.log.slf4j.SlingLogWriter;
+import org.apache.sling.commons.log.slf4j.SlingLogger;
+import org.apache.sling.commons.log.slf4j.SlingLoggerLevel;
+
 import junit.framework.TestCase;
 
 public class SlingLoggerTest extends TestCase {

Modified: incubator/sling/trunk/launchpad/app/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/app/pom.xml?rev=653310&r1=653309&r2=653310&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/app/pom.xml (original)
+++ incubator/sling/trunk/launchpad/app/pom.xml Sun May  4 23:42:26 2008
@@ -64,7 +64,7 @@
                         </goals>
                         <configuration>
                             <includeArtifactIds>
-                                org.apache.sling.osgi.log
+                                org.apache.sling.commons.log
                             </includeArtifactIds>
                             <excludeTransitive>true</excludeTransitive>
                             <outputDirectory>
@@ -79,7 +79,7 @@
                         </goals>
                         <configuration>
                             <excludeArtifactIds>
-                                org.apache.felix.framework,org.osgi.core,org.osgi.compendium,org.apache.sling.osgi.log,org.apache.sling.launchpad.base
+                                org.apache.felix.framework,org.osgi.core,org.osgi.compendium,org.apache.sling.commons.log,org.apache.sling.launchpad.base
                             </excludeArtifactIds>
                             <excludeTransitive>true</excludeTransitive>
                             <outputDirectory>
@@ -185,7 +185,7 @@
         <!-- the most important bundle after the framework: logging -->
         <dependency>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.osgi.log</artifactId>
+            <artifactId>org.apache.sling.commons.log</artifactId>
             <version>2.0.0-incubator-SNAPSHOT</version>
             <optional>true</optional>
         </dependency>

Modified: incubator/sling/trunk/launchpad/base/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/base/pom.xml?rev=653310&r1=653309&r2=653310&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/base/pom.xml (original)
+++ incubator/sling/trunk/launchpad/base/pom.xml Sun May  4 23:42:26 2008
@@ -72,7 +72,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.osgi.log</artifactId>
+            <artifactId>org.apache.sling.commons.log</artifactId>
             <version>2.0.0-incubator-SNAPSHOT</version>
             <scope>provided</scope>
             <optional>true</optional>

Modified: incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launcher/app/main/Main.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launcher/app/main/Main.java?rev=653310&r1=653309&r2=653310&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launcher/app/main/Main.java
(original)
+++ incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launcher/app/main/Main.java
Sun May  4 23:42:26 2008
@@ -22,11 +22,11 @@
 import java.util.Map;
 
 import org.apache.felix.framework.Logger;
+import org.apache.sling.commons.log.LogManager;
 import org.apache.sling.launcher.app.ResourceProvider;
 import org.apache.sling.launcher.app.Sling;
 import org.osgi.framework.BundleException;
 
-import org.apache.sling.osgi.log.LogManager;
 
 /**
  * The <code>Main</code> class is a simple Java Application which interprests

Modified: incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java?rev=653310&r1=653309&r2=653310&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java
(original)
+++ incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java
Sun May  4 23:42:26 2008
@@ -42,6 +42,7 @@
 import org.apache.sling.launcher.app.Sling;
 import org.eclipse.equinox.http.servlet.HttpServiceServlet;
 import org.osgi.framework.BundleException;
+import org.osgi.framework.ServiceEvent;
 import org.osgi.framework.ServiceReference;
 
 /**
@@ -114,7 +115,7 @@
      * The Sling configuration property name setting the initial log level
      * (corresponds to LogbackManager.LOG_LEVEL constant)
      */
-    private static final String PROP_LOG_LEVEL = "org.apache.sling.osgi.log.level";
+    private static final String PROP_LOG_LEVEL = "org.apache.sling.commons.log.level";
 
     /**
      * The name of the configuration property defining the obr repository.

Modified: incubator/sling/trunk/launchpad/base/src/main/resources/sling.properties
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/base/src/main/resources/sling.properties?rev=653310&r1=653309&r2=653310&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/base/src/main/resources/sling.properties (original)
+++ incubator/sling/trunk/launchpad/base/src/main/resources/sling.properties Sun May  4 23:42:26
2008
@@ -77,16 +77,16 @@
 
 
 #
-# Default Logging Configuration (see org.apache.sling.osgi.log Bundle documentation)
-# org.apache.sling.osgi.log.intialize = true
-org.apache.sling.osgi.log.level = INFO
-org.apache.sling.osgi.log.file = ${sling.home}/logs/error.log
-org.apache.sling.osgi.log.file.number = 5
-org.apache.sling.osgi.log.file.size = 10mb
-# org.apache.sling.osgi.log.url = URL to logger configuration file
+# Default Logging Configuration (see org.apache.sling.commons.log Bundle documentation)
+# org.apache.sling.commons.log.intialize = true
+org.apache.sling.commons.log.level = INFO
+org.apache.sling.commons.log.file = ${sling.home}/logs/error.log
+org.apache.sling.commons.log.file.number = 5
+org.apache.sling.commons.log.file.size = 10mb
+# org.apache.sling.commons.log.url = URL to logger configuration file
 
 # Logging configuration for the SCR (if installed)
-ds.loglevel = ${org.apache.sling.osgi.log.level}
+ds.loglevel = ${org.apache.sling.commons.log.level}
 
 #
 # Space separated list of URLs to the OSGi Bundle Repository files. If this



Mime
View raw message