incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r766018 - in /incubator/sling/trunk/launchpad/base: pom.xml src/main/java/org/apache/sling/launchpad/base/app/MainDelegate.java src/main/java/org/apache/sling/launchpad/base/shared/Loader.java
Date Fri, 17 Apr 2009 14:06:43 GMT
Author: cziegeler
Date: Fri Apr 17 14:06:35 2009
New Revision: 766018

URL: http://svn.apache.org/viewvc?rev=766018&view=rev
Log:
SLING-925 : Remove dependency to commons log.

Modified:
    incubator/sling/trunk/launchpad/base/pom.xml
    incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/app/MainDelegate.java
    incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/shared/Loader.java

Modified: incubator/sling/trunk/launchpad/base/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/base/pom.xml?rev=766018&r1=766017&r2=766018&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/base/pom.xml (original)
+++ incubator/sling/trunk/launchpad/base/pom.xml Fri Apr 17 14:06:35 2009
@@ -214,14 +214,6 @@
             <version>1.0.0-v20070606</version>
             <scope>provided</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.commons.log</artifactId>
-            <version>2.0.2-incubator</version>
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
     </dependencies>
 
 </project>

Modified: incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/app/MainDelegate.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/app/MainDelegate.java?rev=766018&r1=766017&r2=766018&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/app/MainDelegate.java
(original)
+++ incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/app/MainDelegate.java
Fri Apr 17 14:06:35 2009
@@ -26,7 +26,6 @@
 import java.util.Map;
 
 import org.apache.felix.framework.Logger;
-import org.apache.sling.commons.log.LogManager;
 import org.apache.sling.launchpad.base.impl.ClassLoaderResourceProvider;
 import org.apache.sling.launchpad.base.impl.ResourceProvider;
 import org.apache.sling.launchpad.base.impl.Sling;
@@ -77,10 +76,10 @@
         "INFO", "DEBUG" };
 
     /** The Sling configuration property name setting the initial log level */
-    private static final String PROP_LOG_LEVEL = LogManager.LOG_LEVEL;
+    private static final String PROP_LOG_LEVEL = "org.apache.sling.commons.log.level";
 
     /** The Sling configuration property name setting the initial log file */
-    private static final String PROP_LOG_FILE = LogManager.LOG_FILE;
+    private static final String PROP_LOG_FILE = "org.apache.sling.commons.log.file";
 
     /** Default log level setting if no set on command line (value is "INFO"). */
     private static final int DEFAULT_LOG_LEVEL = Logger.LOG_INFO;
@@ -149,7 +148,7 @@
             commandLine.put(LOG_LEVEL_PROP, String.valueOf(logLevel));
         }
         Logger logger = new Logger();
-        
+
         // Display port number on console, in case HttpService doesn't
         consoleInfo("HTTP server port: " + commandLine.get(PROP_PORT), null);
 
@@ -355,7 +354,7 @@
 
         return defaultLevel;
     }
-    
+
     // ---------- console logging
 
     // emit an informational message to standard out

Modified: incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/shared/Loader.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/shared/Loader.java?rev=766018&r1=766017&r2=766018&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/shared/Loader.java
(original)
+++ incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/shared/Loader.java
Fri Apr 17 14:06:35 2009
@@ -26,7 +26,6 @@
 import java.io.OutputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.net.URLClassLoader;
 import java.net.URLConnection;
 
 /**
@@ -39,7 +38,7 @@
      * Creates an URLClassLoader from a _launcher JAR_ file in the given
      * slingHome directory and loads and returns the launcher class identified
      * by the launcherClassName.
-     * 
+     *
      * @param launcherClassName The fully qualified name of a class implementing
      *            the Launcher interface. This class must have a public
      *            constructor taking no arguments.
@@ -106,7 +105,7 @@
      * sling home directory and sets the last modification time stamp fo the
      * file. If the existing file is not older than the contents of the launcher
      * JAR file, the file is not replaced.
-     * 
+     *
      * @return <code>true</code> if the launcher JAR file has been installed
or
      *         updated. If the launcher JAR is already up to date,
      *         <code>false</code> is returned.
@@ -136,7 +135,7 @@
      * Spools the contents of the input stream to the given file replacing the
      * contents of the file with the contents of the input stream. When this
      * method returns, the input stream is guaranteed to be closed.
-     * 
+     *
      * @throws IOException If an error occurrs reading or writing the input
      *             stream contents.
      */
@@ -168,7 +167,7 @@
     /**
      * Returns a <code>File</code> object representing the Launcher JAR file
      * found in the sling home folder.
-     * 
+     *
      * @throws IllegalArgumentException if the sling home folder cannot be
      *             created or exists as a non-directory filesystem entry.
      */



Mime
View raw message