You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2011/01/31 19:23:43 UTC
svn commit: r1065702 - in /karaf/trunk: ./ deployer/blueprint/
deployer/blueprint/src/main/java/org/apache/karaf/deployer/blueprint/
deployer/features/
deployer/features/src/main/java/org/apache/karaf/deployer/features/
deployer/kar/ deployer/kar/src/m...
Author: jbonofre
Date: Mon Jan 31 18:23:41 2011
New Revision: 1065702
URL: http://svn.apache.org/viewvc?rev=1065702&view=rev
Log:
[KARAF-427] Use SLF4J as default logger.
Modified:
karaf/trunk/deployer/blueprint/pom.xml
karaf/trunk/deployer/blueprint/src/main/java/org/apache/karaf/deployer/blueprint/BlueprintDeploymentListener.java
karaf/trunk/deployer/blueprint/src/main/java/org/apache/karaf/deployer/blueprint/BlueprintURLHandler.java
karaf/trunk/deployer/features/pom.xml
karaf/trunk/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
karaf/trunk/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureURLHandler.java
karaf/trunk/deployer/kar/pom.xml
karaf/trunk/deployer/kar/src/main/java/org/apache/karaf/deployer/kar/KarArtifactInstaller.java
karaf/trunk/deployer/spring/pom.xml
karaf/trunk/deployer/spring/src/main/java/org/apache/karaf/deployer/spring/SpringDeploymentListener.java
karaf/trunk/deployer/spring/src/main/java/org/apache/karaf/deployer/spring/SpringURLHandler.java
karaf/trunk/deployer/wrap/pom.xml
karaf/trunk/jaas/config/pom.xml
karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/ResourceKeystoreInstance.java
karaf/trunk/jaas/modules/pom.xml
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/encryption/EncryptionSupport.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngine.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngineFactory.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngineFactory.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java
karaf/trunk/main/pom.xml
karaf/trunk/management/pom.xml
karaf/trunk/pom.xml
karaf/trunk/shell/dev/pom.xml
karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/DynamicImport.java
karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/watch/BundleWatcher.java
karaf/trunk/shell/obr/pom.xml
karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KarafJaasPasswordAuthenticator.java
karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/BlueprintURLHandler.java
karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/FeatureURLHandler.java
karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/SpringURLHandler.java
karaf/trunk/webconsole/admin/pom.xml
karaf/trunk/webconsole/admin/src/main/java/org/apache/karaf/webconsole/admin/AdminPlugin.java
karaf/trunk/webconsole/features/pom.xml
karaf/trunk/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.java
karaf/trunk/webconsole/gogo/pom.xml
karaf/trunk/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/GogoPlugin.java
Modified: karaf/trunk/deployer/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/blueprint/pom.xml?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/deployer/blueprint/pom.xml (original)
+++ karaf/trunk/deployer/blueprint/pom.xml Mon Jan 31 18:23:41 2011
@@ -43,6 +43,11 @@
<artifactId>org.apache.karaf.util</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
@@ -50,18 +55,17 @@
<dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-core</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.fileinstall</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.junit</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
Modified: karaf/trunk/deployer/blueprint/src/main/java/org/apache/karaf/deployer/blueprint/BlueprintDeploymentListener.java
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/blueprint/src/main/java/org/apache/karaf/deployer/blueprint/BlueprintDeploymentListener.java?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/deployer/blueprint/src/main/java/org/apache/karaf/deployer/blueprint/BlueprintDeploymentListener.java (original)
+++ karaf/trunk/deployer/blueprint/src/main/java/org/apache/karaf/deployer/blueprint/BlueprintDeploymentListener.java Mon Jan 31 18:23:41 2011
@@ -18,17 +18,15 @@
package org.apache.karaf.deployer.blueprint;
import java.io.File;
-import java.io.FileOutputStream;
import java.net.URL;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.felix.fileinstall.ArtifactTransformer;
import org.apache.felix.fileinstall.ArtifactUrlTransformer;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXParseException;
@@ -40,8 +38,7 @@ import org.xml.sax.SAXException;
*/
public class BlueprintDeploymentListener implements ArtifactUrlTransformer {
-
- private static final Log LOGGER = LogFactory.getLog(BlueprintDeploymentListener.class);
+ private final Logger logger = LoggerFactory.getLogger(BlueprintDeploymentListener.class);
private DocumentBuilderFactory dbf;
@@ -56,7 +53,7 @@ public class BlueprintDeploymentListener
}
}
} catch (Exception e) {
- LOGGER.error("Unable to parse deployed file " + artifact.getAbsolutePath(), e);
+ logger.error("Unable to parse deployed file " + artifact.getAbsolutePath(), e);
}
return false;
}
@@ -65,7 +62,7 @@ public class BlueprintDeploymentListener
try {
return new URL("blueprint", null, artifact.toString());
} catch (Exception e) {
- LOGGER.error("Unable to build blueprint application bundle", e);
+ logger.error("Unable to build blueprint application bundle", e);
return null;
}
}
Modified: karaf/trunk/deployer/blueprint/src/main/java/org/apache/karaf/deployer/blueprint/BlueprintURLHandler.java
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/blueprint/src/main/java/org/apache/karaf/deployer/blueprint/BlueprintURLHandler.java?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/deployer/blueprint/src/main/java/org/apache/karaf/deployer/blueprint/BlueprintURLHandler.java (original)
+++ karaf/trunk/deployer/blueprint/src/main/java/org/apache/karaf/deployer/blueprint/BlueprintURLHandler.java Mon Jan 31 18:23:41 2011
@@ -28,9 +28,9 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.osgi.service.url.AbstractURLStreamHandlerService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A URL handler that will transform a JBI artifact to an OSGi bundle
@@ -38,7 +38,7 @@ import org.osgi.service.url.AbstractURLS
*/
public class BlueprintURLHandler extends AbstractURLStreamHandlerService {
- private static Log logger = LogFactory.getLog(BlueprintURLHandler.class);
+ private final Logger logger = LoggerFactory.getLogger(BlueprintURLHandler.class);
private static String SYNTAX = "blueprint: bp-xml-uri";
Modified: karaf/trunk/deployer/features/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/features/pom.xml?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/deployer/features/pom.xml (original)
+++ karaf/trunk/deployer/features/pom.xml Mon Jan 31 18:23:41 2011
@@ -43,6 +43,11 @@
<artifactId>org.apache.karaf.util</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
@@ -50,22 +55,21 @@
<dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>org.apache.karaf.features.core</artifactId>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.fileinstall</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.junit</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
Modified: karaf/trunk/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java (original)
+++ karaf/trunk/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java Mon Jan 31 18:23:41 2011
@@ -28,10 +28,10 @@ import java.util.*;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.felix.fileinstall.ArtifactUrlTransformer;
import org.apache.karaf.features.Feature;
import org.apache.karaf.features.FeaturesService;
@@ -51,7 +51,7 @@ public class FeatureDeploymentListener i
public static final String FEATURE_PATH = "org.apache.karaf.shell.features";
- private static final Log LOGGER = LogFactory.getLog(FeatureDeploymentListener.class);
+ private final Logger logger = LoggerFactory.getLogger(FeatureDeploymentListener.class);
private DocumentBuilderFactory dbf;
private FeaturesService featuresService;
@@ -97,7 +97,7 @@ public class FeatureDeploymentListener i
}
}
} catch (Exception e) {
- LOGGER.error("Unable to parse deployed file " + artifact.getAbsolutePath(), e);
+ logger.error("Unable to parse deployed file " + artifact.getAbsolutePath(), e);
}
return false;
}
@@ -112,7 +112,7 @@ public class FeatureDeploymentListener i
try {
return new URL("feature", null, artifact.toString());
} catch (Exception e) {
- LOGGER.error("Unable to build feature bundle", e);
+ logger.error("Unable to build feature bundle", e);
return null;
}
}
@@ -135,7 +135,7 @@ public class FeatureDeploymentListener i
}
urls.add(url);
} catch (Exception e) {
- LOGGER.error("Unable to install features", e);
+ logger.error("Unable to install features", e);
}
}
synchronized (this) {
@@ -164,7 +164,7 @@ public class FeatureDeploymentListener i
}
}
} catch (Exception e) {
- LOGGER.error("Unable to install deployed features for bundle: " + bundle.getSymbolicName() + " - " + bundle.getVersion(), e);
+ logger.error("Unable to install deployed features for bundle: " + bundle.getSymbolicName() + " - " + bundle.getVersion(), e);
}
} else if (bundleEvent.getType() == BundleEvent.UNINSTALLED) {
try {
@@ -193,18 +193,18 @@ public class FeatureDeploymentListener i
try {
featuresService.uninstallFeature(f.getName(), f.getVersion());
} catch (Exception e) {
- LOGGER.error("Unable to uninstall feature: " + f.getName(), e);
+ logger.error("Unable to uninstall feature: " + f.getName(), e);
}
}
}
} catch (Exception e) {
- LOGGER.error("Unable to uninstall features: " + url, e);
+ logger.error("Unable to uninstall features: " + url, e);
}
}
try {
featuresService.removeRepository(url.toURI());
} catch (URISyntaxException e) {
- LOGGER.error("Unable to remove repository: " + url, e);
+ logger.error("Unable to remove repository: " + url, e);
}
}
}
@@ -222,7 +222,7 @@ public class FeatureDeploymentListener i
}
}
} catch (Exception e) {
- LOGGER.error("Unable to uninstall deployed features for bundle: " + bundle.getSymbolicName() + " - " + bundle.getVersion(), e);
+ logger.error("Unable to uninstall deployed features for bundle: " + bundle.getSymbolicName() + " - " + bundle.getVersion(), e);
}
}
}
Modified: karaf/trunk/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureURLHandler.java
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureURLHandler.java?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureURLHandler.java (original)
+++ karaf/trunk/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureURLHandler.java Mon Jan 31 18:23:41 2011
@@ -24,16 +24,16 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.osgi.service.url.AbstractURLStreamHandlerService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* URL handler for features
*/
public class FeatureURLHandler extends AbstractURLStreamHandlerService {
- private static Log logger = LogFactory.getLog(FeatureURLHandler.class);
+ private final Logger logger = LoggerFactory.getLogger(FeatureURLHandler.class);
private static String SYNTAX = "feature: xml-uri";
Modified: karaf/trunk/deployer/kar/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/kar/pom.xml?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/deployer/kar/pom.xml (original)
+++ karaf/trunk/deployer/kar/pom.xml Mon Jan 31 18:23:41 2011
@@ -46,22 +46,21 @@
<dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>org.apache.karaf.features.core</artifactId>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.fileinstall</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
Modified: karaf/trunk/deployer/kar/src/main/java/org/apache/karaf/deployer/kar/KarArtifactInstaller.java
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/kar/src/main/java/org/apache/karaf/deployer/kar/KarArtifactInstaller.java?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/deployer/kar/src/main/java/org/apache/karaf/deployer/kar/KarArtifactInstaller.java (original)
+++ karaf/trunk/deployer/kar/src/main/java/org/apache/karaf/deployer/kar/KarArtifactInstaller.java Mon Jan 31 18:23:41 2011
@@ -31,10 +31,10 @@ import java.util.zip.ZipFile;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.felix.fileinstall.ArtifactInstaller;
import org.apache.karaf.features.FeaturesService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
@@ -42,7 +42,7 @@ import org.xml.sax.SAXParseException;
public class KarArtifactInstaller implements ArtifactInstaller {
- private static Log logger = LogFactory.getLog(KarArtifactInstaller.class);
+ private final Logger logger = LoggerFactory.getLogger(KarArtifactInstaller.class);
private static final String KAR_SUFFIX = ".kar";
private static final String ZIP_SUFFIX = ".zip";
Modified: karaf/trunk/deployer/spring/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/spring/pom.xml?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/deployer/spring/pom.xml (original)
+++ karaf/trunk/deployer/spring/pom.xml Mon Jan 31 18:23:41 2011
@@ -43,6 +43,11 @@
<artifactId>org.apache.karaf.util</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
@@ -50,18 +55,17 @@
<dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-core</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.fileinstall</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.junit</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
Modified: karaf/trunk/deployer/spring/src/main/java/org/apache/karaf/deployer/spring/SpringDeploymentListener.java
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/spring/src/main/java/org/apache/karaf/deployer/spring/SpringDeploymentListener.java?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/deployer/spring/src/main/java/org/apache/karaf/deployer/spring/SpringDeploymentListener.java (original)
+++ karaf/trunk/deployer/spring/src/main/java/org/apache/karaf/deployer/spring/SpringDeploymentListener.java Mon Jan 31 18:23:41 2011
@@ -18,17 +18,15 @@
package org.apache.karaf.deployer.spring;
import java.io.File;
-import java.io.FileOutputStream;
import java.net.URL;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.felix.fileinstall.ArtifactTransformer;
import org.apache.felix.fileinstall.ArtifactUrlTransformer;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXParseException;
@@ -40,7 +38,7 @@ import org.xml.sax.SAXException;
*/
public class SpringDeploymentListener implements ArtifactUrlTransformer {
- private static final Log LOGGER = LogFactory.getLog(SpringDeploymentListener.class);
+ private final Logger logger = LoggerFactory.getLogger(SpringDeploymentListener.class);
private DocumentBuilderFactory dbf;
@@ -55,7 +53,7 @@ public class SpringDeploymentListener im
}
}
} catch (Exception e) {
- LOGGER.error("Unable to parse deployed file " + artifact.getAbsolutePath(), e);
+ logger.error("Unable to parse deployed file " + artifact.getAbsolutePath(), e);
}
return false;
}
@@ -64,7 +62,7 @@ public class SpringDeploymentListener im
try {
return new URL("spring", null, artifact.toString());
} catch (Exception e) {
- LOGGER.error("Unable to build spring application bundle", e);
+ logger.error("Unable to build spring application bundle", e);
return null;
}
}
Modified: karaf/trunk/deployer/spring/src/main/java/org/apache/karaf/deployer/spring/SpringURLHandler.java
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/spring/src/main/java/org/apache/karaf/deployer/spring/SpringURLHandler.java?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/deployer/spring/src/main/java/org/apache/karaf/deployer/spring/SpringURLHandler.java (original)
+++ karaf/trunk/deployer/spring/src/main/java/org/apache/karaf/deployer/spring/SpringURLHandler.java Mon Jan 31 18:23:41 2011
@@ -28,9 +28,9 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.osgi.service.url.AbstractURLStreamHandlerService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A URL handler that will transform a JBI artifact to an OSGi bundle
@@ -38,7 +38,7 @@ import org.osgi.service.url.AbstractURLS
*/
public class SpringURLHandler extends AbstractURLStreamHandlerService {
- private static Log logger = LogFactory.getLog(SpringURLHandler.class);
+ private final Logger logger = LoggerFactory.getLogger(SpringURLHandler.class);
private static String SYNTAX = "spring: spring-xml-uri";
Modified: karaf/trunk/deployer/wrap/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/wrap/pom.xml?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/deployer/wrap/pom.xml (original)
+++ karaf/trunk/deployer/wrap/pom.xml Mon Jan 31 18:23:41 2011
@@ -48,16 +48,14 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.fileinstall</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.junit</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
Modified: karaf/trunk/jaas/config/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/config/pom.xml?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/jaas/config/pom.xml (original)
+++ karaf/trunk/jaas/config/pom.xml Mon Jan 31 18:23:41 2011
@@ -46,6 +46,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
@@ -53,14 +58,12 @@
<dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-core</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified: karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/ResourceKeystoreInstance.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/ResourceKeystoreInstance.java?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/ResourceKeystoreInstance.java (original)
+++ karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/ResourceKeystoreInstance.java Mon Jan 31 18:23:41 2011
@@ -41,17 +41,18 @@ import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.karaf.jaas.config.KeystoreInstance;
import org.apache.karaf.jaas.config.KeystoreIsLocked;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
*/
public class ResourceKeystoreInstance implements KeystoreInstance {
- private static final Log LOG = LogFactory.getLog(ResourceKeystoreInstance.class);
+ private final Logger logger = LoggerFactory.getLogger(ResourceKeystoreInstance.class);
+
private static final String JKS = "JKS";
private String name;
@@ -141,7 +142,7 @@ public class ResourceKeystoreInstance im
try {
return keystore.getCertificate(alias);
} catch (KeyStoreException e) {
- LOG.error("Unable to read certificate from keystore", e);
+ logger.error("Unable to read certificate from keystore", e);
}
return null;
}
@@ -153,7 +154,7 @@ public class ResourceKeystoreInstance im
try {
return keystore.getCertificateAlias(cert);
} catch (KeyStoreException e) {
- LOG.error("Unable to read retrieve alias for given certificate from keystore", e);
+ logger.error("Unable to read retrieve alias for given certificate from keystore", e);
}
return null;
}
@@ -165,7 +166,7 @@ public class ResourceKeystoreInstance im
try {
return keystore.getCertificateChain(alias);
} catch (KeyStoreException e) {
- LOG.error("Unable to read certificate chain from keystore", e);
+ logger.error("Unable to read certificate chain from keystore", e);
}
return null;
}
@@ -196,11 +197,11 @@ public class ResourceKeystoreInstance im
return (PrivateKey) key;
}
} catch (KeyStoreException e) {
- LOG.error("Unable to read private key from keystore", e);
+ logger.error("Unable to read private key from keystore", e);
} catch (NoSuchAlgorithmException e) {
- LOG.error("Unable to read private key from keystore", e);
+ logger.error("Unable to read private key from keystore", e);
} catch (UnrecoverableKeyException e) {
- LOG.error("Unable to read private key from keystore", e);
+ logger.error("Unable to read private key from keystore", e);
}
return null;
}
@@ -277,13 +278,13 @@ public class ResourceKeystoreInstance im
}
return true;
} catch (KeyStoreException e) {
- LOG.error("Unable to open keystore with provided password", e);
+ logger.error("Unable to open keystore with provided password", e);
} catch (IOException e) {
- LOG.error("Unable to open keystore with provided password", e);
+ logger.error("Unable to open keystore with provided password", e);
} catch (NoSuchAlgorithmException e) {
- LOG.error("Unable to open keystore with provided password", e);
+ logger.error("Unable to open keystore with provided password", e);
} catch (CertificateException e) {
- LOG.error("Unable to open keystore with provided password", e);
+ logger.error("Unable to open keystore with provided password", e);
}
return false;
}
Modified: karaf/trunk/jaas/modules/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/pom.xml?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/pom.xml (original)
+++ karaf/trunk/jaas/modules/pom.xml Mon Jan 31 18:23:41 2011
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
@@ -56,8 +55,9 @@
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -75,11 +75,13 @@
<dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified: karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/encryption/EncryptionSupport.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/encryption/EncryptionSupport.java?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/encryption/EncryptionSupport.java (original)
+++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/encryption/EncryptionSupport.java Mon Jan 31 18:23:41 2011
@@ -14,13 +14,13 @@
*/
package org.apache.karaf.jaas.modules.encryption;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.karaf.jaas.modules.Encryption;
import org.apache.karaf.jaas.modules.EncryptionService;
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.Arrays;
import java.util.HashMap;
@@ -31,7 +31,7 @@ import java.util.Map;
*/
public class EncryptionSupport {
- private static final Log LOG = LogFactory.getLog(EncryptionSupport.class);
+ private final Logger logger = LoggerFactory.getLogger(EncryptionSupport.class);
private BundleContext bundleContext;
@@ -64,15 +64,15 @@ public class EncryptionSupport {
if (!enabled) {
if (debug) {
- LOG.debug("Encryption is disabled.");
+ logger.debug("Encryption is disabled.");
}
} else {
String name = encOpts.remove("name");
if (debug) {
if (name != null && name.length() > 0) {
- LOG.debug("Encryption is enabled. Using service " + name + " with options " + encOpts);
+ logger.debug("Encryption is enabled. Using service " + name + " with options " + encOpts);
} else {
- LOG.debug("Encryption is enabled. Using options " + encOpts);
+ logger.debug("Encryption is enabled. Using options " + encOpts);
}
}
// lookup the encryption service reference
Modified: karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngine.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngine.java?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngine.java (original)
+++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngine.java Mon Jan 31 18:23:41 2011
@@ -16,12 +16,12 @@
package org.apache.karaf.jaas.modules.jdbc;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.karaf.jaas.modules.BackingEngine;
import org.apache.karaf.jaas.modules.RolePrincipal;
import org.apache.karaf.jaas.modules.UserPrincipal;
import org.apache.karaf.jaas.modules.encryption.EncryptionSupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.sql.DataSource;
import java.sql.Connection;
@@ -36,7 +36,7 @@ import java.util.List;
*/
public class JDBCBackingEngine implements BackingEngine {
- private static final Log LOG = LogFactory.getLog(JDBCBackingEngine.class);
+ private final Logger logger = LoggerFactory.getLogger(JDBCBackingEngine.class);
private DataSource dataSource;
private EncryptionSupport encryptionSupport;
@@ -95,11 +95,11 @@ public class JDBCBackingEngine implement
if (!connection.getAutoCommit()) {
connection.commit();
}
- if (LOG.isDebugEnabled()) {
- LOG.debug(String.format("Executiong [%s], USERNAME=%s, PASSWORD=%s. %i rows affected.", addUserStatement, username, newPassword, rows));
+ if (logger.isDebugEnabled()) {
+ logger.debug(String.format("Executiong [%s], USERNAME=%s, PASSWORD=%s. %i rows affected.", addUserStatement, username, newPassword, rows));
}
} catch (SQLException e) {
- LOG.error("Error executiong statement", e);
+ logger.error("Error executiong statement", e);
} finally {
try {
if (statement != null) {
@@ -109,7 +109,7 @@ public class JDBCBackingEngine implement
connection.close();
}
} catch (SQLException e) {
- LOG.warn(MSG_CONNECTION_CLOSE_FAILED, e);
+ logger.warn(MSG_CONNECTION_CLOSE_FAILED, e);
}
}
}
@@ -144,11 +144,11 @@ public class JDBCBackingEngine implement
connection.commit();
}
- if (LOG.isDebugEnabled()) {
- LOG.debug(String.format("Executiong [%s], USERNAME=%s. %i userRows affected.", deleteUserStatement, username, userRows));
+ if (logger.isDebugEnabled()) {
+ logger.debug(String.format("Executiong [%s], USERNAME=%s. %i userRows affected.", deleteUserStatement, username, userRows));
}
} catch (SQLException e) {
- LOG.error("Error executiong statement", e);
+ logger.error("Error executiong statement", e);
} finally {
try {
if (userStatement != null) {
@@ -161,7 +161,7 @@ public class JDBCBackingEngine implement
connection.close();
}
} catch (SQLException e) {
- LOG.warn(MSG_CONNECTION_CLOSE_FAILED, e);
+ logger.warn(MSG_CONNECTION_CLOSE_FAILED, e);
}
}
}
@@ -193,7 +193,7 @@ public class JDBCBackingEngine implement
users.add(new UserPrincipal(username));
}
} catch (SQLException e) {
- LOG.error("Error executiong statement", e);
+ logger.error("Error executiong statement", e);
} finally {
try {
if (usersResultSet != null) {
@@ -206,7 +206,7 @@ public class JDBCBackingEngine implement
connection.close();
}
} catch (SQLException e) {
- LOG.warn(MSG_CONNECTION_CLOSE_FAILED, e);
+ logger.warn(MSG_CONNECTION_CLOSE_FAILED, e);
}
}
}
@@ -244,7 +244,7 @@ public class JDBCBackingEngine implement
}
} catch (SQLException e) {
- LOG.error("Error executiong statement", e);
+ logger.error("Error executiong statement", e);
} finally {
try {
if (rolesResultSet != null) {
@@ -257,7 +257,7 @@ public class JDBCBackingEngine implement
connection.close();
}
} catch (SQLException e) {
- LOG.warn(MSG_CONNECTION_CLOSE_FAILED, e);
+ logger.warn(MSG_CONNECTION_CLOSE_FAILED, e);
}
}
}
@@ -286,11 +286,11 @@ public class JDBCBackingEngine implement
if (!connection.getAutoCommit()) {
connection.commit();
}
- if (LOG.isDebugEnabled()) {
- LOG.debug(String.format("Executiong [%s], USERNAME=%s, ROLE=%s. %i rows affected.", addRoleStatement, username, role, rows));
+ if (logger.isDebugEnabled()) {
+ logger.debug(String.format("Executiong [%s], USERNAME=%s, ROLE=%s. %i rows affected.", addRoleStatement, username, role, rows));
}
} catch (SQLException e) {
- LOG.error("Error executiong statement", e);
+ logger.error("Error executiong statement", e);
} finally {
try {
if (statement != null) {
@@ -300,7 +300,7 @@ public class JDBCBackingEngine implement
connection.close();
}
} catch (SQLException e) {
- LOG.warn(MSG_CONNECTION_CLOSE_FAILED, e);
+ logger.warn(MSG_CONNECTION_CLOSE_FAILED, e);
}
}
}
@@ -328,11 +328,11 @@ public class JDBCBackingEngine implement
if (!connection.getAutoCommit()) {
connection.commit();
}
- if (LOG.isDebugEnabled()) {
- LOG.debug(String.format("Executiong [%s], USERNAME=%s, ROLE=%s. %i rows affected.", deleteRoleStatement, username, role, rows));
+ if (logger.isDebugEnabled()) {
+ logger.debug(String.format("Executiong [%s], USERNAME=%s, ROLE=%s. %i rows affected.", deleteRoleStatement, username, role, rows));
}
} catch (SQLException e) {
- LOG.error("Error executing statement", e);
+ logger.error("Error executing statement", e);
} finally {
try {
if (statement != null) {
@@ -342,7 +342,7 @@ public class JDBCBackingEngine implement
connection.close();
}
} catch (SQLException e) {
- LOG.warn(MSG_CONNECTION_CLOSE_FAILED, e);
+ logger.warn(MSG_CONNECTION_CLOSE_FAILED, e);
}
}
}
Modified: karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngineFactory.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngineFactory.java?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngineFactory.java (original)
+++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngineFactory.java Mon Jan 31 18:23:41 2011
@@ -16,12 +16,12 @@
package org.apache.karaf.jaas.modules.jdbc;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.karaf.jaas.modules.BackingEngine;
import org.apache.karaf.jaas.modules.BackingEngineFactory;
import org.apache.karaf.jaas.modules.encryption.EncryptionSupport;
import org.osgi.framework.BundleContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.sql.DataSource;
import java.util.Map;
@@ -31,7 +31,7 @@ import java.util.Map;
*/
public class JDBCBackingEngineFactory implements BackingEngineFactory {
- private static final Log LOG = LogFactory.getLog(JDBCBackingEngineFactory.class);
+ private final Logger logger = LoggerFactory.getLogger(JDBCBackingEngineFactory.class);
/**
* Build a Backing engine for the JDBCLoginModule.
@@ -78,7 +78,7 @@ public class JDBCBackingEngineFactory im
instance.setSelectRolesQuery(selectRolesQuery);
}
} catch (Exception e) {
- LOG.error("Error creating JDBCBackingEngine.", e);
+ logger.error("Error creating JDBCBackingEngine.", e);
}
return instance;
}
Modified: karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java (original)
+++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java Mon Jan 31 18:23:41 2011
@@ -15,12 +15,12 @@
*/
package org.apache.karaf.jaas.modules.jdbc;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.karaf.jaas.modules.AbstractKarafLoginModule;
import org.apache.karaf.jaas.modules.RolePrincipal;
import org.apache.karaf.jaas.modules.UserPrincipal;
import org.apache.karaf.jaas.modules.properties.PropertiesLoginModule;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.security.auth.Subject;
import javax.security.auth.callback.*;
@@ -41,7 +41,7 @@ import java.util.Map;
*/
public class JDBCLoginModule extends AbstractKarafLoginModule {
- private static final Log LOG = LogFactory.getLog(PropertiesLoginModule.class);
+ private final Logger logger = LoggerFactory.getLogger(PropertiesLoginModule.class);
public static final String PASSWORD_QUERY = "query.password";
public static final String ROLE_QUERY = "query.role";
@@ -61,9 +61,9 @@ public class JDBCLoginModule extends Abs
passwordQuery = (String) options.get(PASSWORD_QUERY);
roleQuery = (String) options.get(ROLE_QUERY);
if (datasourceURL == null || datasourceURL.trim().length() == 0) {
- LOG.error("No datasource was specified ");
+ logger.error("No datasource was specified ");
} else if (!datasourceURL.startsWith(JDBCUtils.JNDI) && !datasourceURL.startsWith(JDBCUtils.OSGI)) {
- LOG.error("Invalid datasource lookup protocol");
+ logger.error("Invalid datasource lookup protocol");
}
}
@@ -156,7 +156,7 @@ public class JDBCLoginModule extends Abs
connection.close();
}
} catch (SQLException ex) {
- LOG.warn("Failed to clearly close connection to the database:", ex);
+ logger.warn("Failed to clearly close connection to the database:", ex);
}
}
return true;
@@ -170,7 +170,7 @@ public class JDBCLoginModule extends Abs
subject.getPrincipals().removeAll(principals);
principals.clear();
if (debug) {
- LOG.debug("logout");
+ logger.debug("logout");
}
return true;
}
Modified: karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java (original)
+++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java Mon Jan 31 18:23:41 2011
@@ -15,13 +15,13 @@
*/
package org.apache.karaf.jaas.modules.ldap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.karaf.jaas.config.KeystoreManager;
import org.apache.karaf.jaas.modules.AbstractKarafLoginModule;
import org.apache.karaf.jaas.modules.RolePrincipal;
import org.apache.karaf.jaas.modules.UserPrincipal;
import org.osgi.framework.ServiceReference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.naming.Context;
import javax.naming.NamingEnumeration;
@@ -31,7 +31,6 @@ import javax.security.auth.Subject;
import javax.security.auth.callback.*;
import javax.security.auth.login.LoginException;
import java.io.IOException;
-import java.security.GeneralSecurityException;
import java.security.Principal;
import java.util.HashSet;
import java.util.Hashtable;
@@ -47,7 +46,7 @@ import java.util.Map;
*/
public class LDAPLoginModule extends AbstractKarafLoginModule {
- private final static transient Log LOG = LogFactory.getLog(LDAPLoginModule.class);
+ private static Logger logger = LoggerFactory.getLogger(LDAPLoginModule.class);
public final static String CONNECTION_URL = "connection.url";
public final static String CONNECTION_USERNAME = "connection.username";
@@ -109,9 +108,9 @@ public class LDAPLoginModule extends Abs
}
authentication = (String) options.get(AUTHENTICATION);
if (connectionURL == null || connectionURL.trim().length() == 0) {
- LOG.error("No LDAP URL specified.");
+ logger.error("No LDAP URL specified.");
} else if (!connectionURL.startsWith("ldap:") && !connectionURL.startsWith("ldaps:")) {
- LOG.error("Invalid LDAP URL: " + connectionURL);
+ logger.error("Invalid LDAP URL: " + connectionURL);
}
if (options.get(SSL) != null) {
ssl = Boolean.parseBoolean((String) options.get(SSL));
@@ -160,11 +159,11 @@ public class LDAPLoginModule extends Abs
// step 1: get the user DN
Hashtable env = new Hashtable();
- LOG.debug("Create the LDAP initial context.");
+ logger.debug("Create the LDAP initial context.");
env.put(Context.INITIAL_CONTEXT_FACTORY, initialContextFactory);
env.put(Context.PROVIDER_URL, connectionURL);
if (connectionUsername != null && connectionUsername.trim().length() > 0) {
- LOG.debug("Bound access requested.");
+ logger.debug("Bound access requested.");
env.put(Context.SECURITY_AUTHENTICATION, authentication);
env.put(Context.SECURITY_PRINCIPAL, connectionUsername);
env.put(Context.SECURITY_CREDENTIALS, connectionPassword);
@@ -172,28 +171,28 @@ public class LDAPLoginModule extends Abs
if (ssl) {
setupSsl(env);
}
- LOG.debug("Get the user DN.");
+ logger.debug("Get the user DN.");
String userDN;
try {
- LOG.debug("Initialize the JNDI LDAP Dir Context.");
+ logger.debug("Initialize the JNDI LDAP Dir Context.");
DirContext context = new InitialDirContext(env);
- LOG.debug("Define the subtree scope search control.");
+ logger.debug("Define the subtree scope search control.");
SearchControls controls = new SearchControls();
if (userSearchSubtree) {
controls.setSearchScope(SearchControls.SUBTREE_SCOPE);
} else {
controls.setSearchScope(SearchControls.ONELEVEL_SCOPE);
}
- LOG.debug("Looking for the user in LDAP with ");
- LOG.debug(" base DN: " + userBaseDN);
+ logger.debug("Looking for the user in LDAP with ");
+ logger.debug(" base DN: " + userBaseDN);
userFilter = userFilter.replaceAll("%u", user);
- LOG.debug(" filter: " + userFilter);
+ logger.debug(" filter: " + userFilter);
NamingEnumeration namingEnumeration = context.search(userBaseDN, userFilter, controls);
if (!namingEnumeration.hasMore()) {
- LOG.warn("User " + user + " not found in LDAP.");
+ logger.warn("User " + user + " not found in LDAP.");
return false;
}
- LOG.debug("Get the user DN.");
+ logger.debug("Get the user DN.");
SearchResult result = (SearchResult) namingEnumeration.next();
userDN = (String) result.getName();
} catch (Exception e) {
@@ -201,23 +200,23 @@ public class LDAPLoginModule extends Abs
}
// step 2: bind the user using the DN
try {
- LOG.debug("Bind user (authentication).");
+ logger.debug("Bind user (authentication).");
env.put(Context.SECURITY_AUTHENTICATION, authentication);
- LOG.debug("Set the security principal for " + userDN + "," + userBaseDN);
+ logger.debug("Set the security principal for " + userDN + "," + userBaseDN);
env.put(Context.SECURITY_PRINCIPAL, userDN + "," + userBaseDN);
env.put(Context.SECURITY_CREDENTIALS, password);
- LOG.debug("Binding the user.");
+ logger.debug("Binding the user.");
DirContext context = new InitialDirContext(env);
- LOG.debug("User " + user + " successfully bound.");
+ logger.debug("User " + user + " successfully bound.");
context.close();
} catch (Exception e) {
- LOG.warn("User " + user + " authentication failed.", e);
+ logger.warn("User " + user + " authentication failed.", e);
return false;
}
principals.add(new UserPrincipal(user));
// step 3: retrieving user roles
try {
- LOG.debug("Get user roles.");
+ logger.debug("Get user roles.");
DirContext context = new InitialDirContext(env);
SearchControls controls = new SearchControls();
if (roleSearchSubtree) {
@@ -225,10 +224,10 @@ public class LDAPLoginModule extends Abs
} else {
controls.setSearchScope(SearchControls.ONELEVEL_SCOPE);
}
- LOG.debug("Looking for the user roles in LDAP with ");
- LOG.debug(" base DN: " + roleBaseDN);
+ logger.debug("Looking for the user roles in LDAP with ");
+ logger.debug(" base DN: " + roleBaseDN);
roleFilter = roleFilter.replaceAll("%u", user);
- LOG.debug(" filter: " + roleFilter);
+ logger.debug(" filter: " + roleFilter);
NamingEnumeration namingEnumeration = context.search(roleBaseDN, roleFilter, controls);
while (namingEnumeration.hasMore()) {
SearchResult result = (SearchResult) namingEnumeration.next();
@@ -247,7 +246,7 @@ public class LDAPLoginModule extends Abs
protected void setupSsl(Hashtable env) throws LoginException {
ServiceReference ref = null;
try {
- LOG.debug("Setting up SSL");
+ logger.debug("Setting up SSL");
env.put(Context.SECURITY_PROTOCOL, "ssl");
env.put("java.naming.ldap.factory.socket", ManagedSSLSocketFactory.class.getName());
ref = bundleContext.getServiceReference(KeystoreManager.class.getName());
Modified: karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java (original)
+++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java Mon Jan 31 18:23:41 2011
@@ -31,8 +31,6 @@ import javax.security.auth.callback.Unsu
import javax.security.auth.login.FailedLoginException;
import javax.security.auth.login.LoginException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.karaf.jaas.modules.AbstractKarafLoginModule;
import org.apache.karaf.jaas.modules.RolePrincipal;
@@ -44,8 +42,6 @@ public class OsgiConfigLoginModule exten
public static final String PID = "pid";
public static final String USER_PREFIX = "user.";
- private static final Log LOG = LogFactory.getLog(OsgiConfigLoginModule.class);
-
public void initialize(Subject subject, CallbackHandler callbackHandler, Map<String, ?> sharedState, Map<String, ?> options) {
super.initialize(subject, callbackHandler, options);
}
Modified: karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java (original)
+++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java Mon Jan 31 18:23:41 2011
@@ -16,13 +16,13 @@
package org.apache.karaf.jaas.modules.properties;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.karaf.jaas.modules.BackingEngine;
import org.apache.karaf.jaas.modules.RolePrincipal;
import org.apache.karaf.jaas.modules.UserPrincipal;
import org.apache.karaf.jaas.modules.encryption.EncryptionSupport;
import org.apache.karaf.util.Properties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.List;
@@ -33,7 +33,7 @@ import java.util.List;
*/
public class PropertiesBackingEngine implements BackingEngine {
- private static final Log LOG = LogFactory.getLog(PropertiesBackingEngine.class);
+ private final Logger logger = LoggerFactory.getLogger(PropertiesBackingEngine.class);
private Properties users;
private EncryptionSupport encryptionSupport;
@@ -89,7 +89,7 @@ public class PropertiesBackingEngine imp
try {
users.save();
} catch (Exception ex) {
- LOG.error("Cannot update users file,", ex);
+ logger.error("Cannot update users file,", ex);
}
}
@@ -149,7 +149,7 @@ public class PropertiesBackingEngine imp
try {
users.save();
} catch (Exception ex) {
- LOG.error("Cannot update users file,", ex);
+ logger.error("Cannot update users file,", ex);
}
}
@@ -184,7 +184,7 @@ public class PropertiesBackingEngine imp
try {
users.save();
} catch (Exception ex) {
- LOG.error("Cannot update users file,", ex);
+ logger.error("Cannot update users file,", ex);
}
}
}
Modified: karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngineFactory.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngineFactory.java?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngineFactory.java (original)
+++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngineFactory.java Mon Jan 31 18:23:41 2011
@@ -16,12 +16,12 @@
package org.apache.karaf.jaas.modules.properties;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.karaf.jaas.modules.BackingEngine;
import org.apache.karaf.jaas.modules.BackingEngineFactory;
import org.apache.karaf.jaas.modules.encryption.EncryptionSupport;
import org.apache.karaf.util.Properties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
@@ -32,8 +32,9 @@ import java.util.Map;
*/
public class PropertiesBackingEngineFactory implements BackingEngineFactory {
+ private final Logger logger = LoggerFactory.getLogger(PropertiesBackingEngineFactory.class);
+
private static final String USER_FILE = "users";
- private static final Log LOG = LogFactory.getLog(PropertiesBackingEngineFactory.class);
/**
* Builds the Backing Engine
@@ -52,7 +53,7 @@ public class PropertiesBackingEngineFact
EncryptionSupport encryptionSupport = new EncryptionSupport(options);
engine = new PropertiesBackingEngine(users, encryptionSupport);
} catch (IOException ioe) {
- LOG.warn("Cannot open users file:" + usersFile);
+ logger.warn("Cannot open users file:" + usersFile);
} finally {
return engine;
}
Modified: karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java (original)
+++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java Mon Jan 31 18:23:41 2011
@@ -30,12 +30,12 @@ import javax.security.auth.callback.Unsu
import javax.security.auth.login.FailedLoginException;
import javax.security.auth.login.LoginException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.karaf.jaas.modules.AbstractKarafLoginModule;
import org.apache.karaf.jaas.modules.RolePrincipal;
import org.apache.karaf.jaas.modules.UserPrincipal;
import org.apache.karaf.util.Properties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <p>
@@ -46,8 +46,9 @@ import org.apache.karaf.util.Properties;
*/
public class PropertiesLoginModule extends AbstractKarafLoginModule {
+ private final Logger LOG = LoggerFactory.getLogger(PropertiesLoginModule.class);
+
private static final String USER_FILE = "users";
- private static final Log LOG = LogFactory.getLog(PropertiesLoginModule.class);
private String usersFile;
Modified: karaf/trunk/main/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/main/pom.xml?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/main/pom.xml (original)
+++ karaf/trunk/main/pom.xml Mon Jan 31 18:23:41 2011
@@ -59,6 +59,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: karaf/trunk/management/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/management/pom.xml?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/management/pom.xml (original)
+++ karaf/trunk/management/pom.xml Mon Jan 31 18:23:41 2011
@@ -52,11 +52,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<scope>test</scope>
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Mon Jan 31 18:23:41 2011
@@ -108,12 +108,13 @@
<asm.bundle.version>3.3_1</asm.bundle.version>
<cglib.bundle.version>2.1_3_6</cglib.bundle.version>
<commons-codec.bundle.version>1.3_3</commons-codec.bundle.version>
+ <commons-collections.bundle.version>3.2.1_1</commons-collections.bundle.version>
+ <commons-fileupload.version>1.1.1</commons-fileupload.version>
<commons-lang.bundle.version>2.4_4</commons-lang.bundle.version>
<jasypt.bundle.version>1.7_1</jasypt.bundle.version>
<jetty.version>7.2.2.v20101205</jetty.version>
<junit.bundle.version>4.7_2</junit.bundle.version>
- <commons-logging.version>1.1.1</commons-logging.version>
<geronimo.servlet.version>1.1.2</geronimo.servlet.version>
<geronimo.jpa-spec.version>1.1</geronimo.jpa-spec.version>
<geronimo.jta-spec.version>1.1.1</geronimo.jta-spec.version>
@@ -765,11 +766,6 @@
<version>${jansi.version}</version>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.maven.artifact</groupId>
<artifactId>maven-artifact</artifactId>
<version>3.0-alpha-1</version>
@@ -1008,6 +1004,11 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-collections</artifactId>
+ <version>${commons-collections.bundle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.commons-lang</artifactId>
<version>${commons-lang.bundle.version}</version>
</dependency>
Modified: karaf/trunk/shell/dev/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/pom.xml?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/shell/dev/pom.xml (original)
+++ karaf/trunk/shell/dev/pom.xml Mon Jan 31 18:23:41 2011
@@ -45,11 +45,13 @@
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-wrap</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-mvn</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/DynamicImport.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/DynamicImport.java?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/DynamicImport.java (original)
+++ karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/DynamicImport.java Mon Jan 31 18:23:41 2011
@@ -23,8 +23,6 @@ import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
import org.apache.karaf.shell.console.OsgiCommandSupport;
@@ -34,16 +32,17 @@ import org.osgi.framework.BundleExceptio
import org.osgi.framework.ServiceReference;
import org.osgi.service.packageadmin.ExportedPackage;
import org.osgi.service.packageadmin.PackageAdmin;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Command for enabling/disabling debug logging on a bundle and calculating the difference in
* wired imports.
*/
-@Command(scope = "dev", name = "dynamic-import",
- description = "Enable/disable dynamic-import for a given bundle")
+@Command(scope = "dev", name = "dynamic-import", description = "Enable/disable dynamic-import for a given bundle")
public class DynamicImport extends AbstractBundleCommand {
- private static final Log LOG = LogFactory.getLog(DynamicImport.class);
+ private final Logger LOG = LoggerFactory.getLogger(DynamicImport.class);
/**
* The header key where we store the active wires when we enable DynamicImport=*
Modified: karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/watch/BundleWatcher.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/watch/BundleWatcher.java?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/watch/BundleWatcher.java (original)
+++ karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/watch/BundleWatcher.java Mon Jan 31 18:23:41 2011
@@ -31,8 +31,6 @@ import java.util.concurrent.CopyOnWriteA
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.ops4j.pax.url.maven.commons.MavenConfiguration;
import org.ops4j.pax.url.maven.commons.MavenConfigurationImpl;
import org.ops4j.pax.url.maven.commons.MavenRepositoryURL;
@@ -46,13 +44,15 @@ import org.osgi.framework.BundleExceptio
import org.osgi.framework.BundleListener;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A Runnable singleton which watches at the defined location for bundle updates.
*/
public class BundleWatcher implements Runnable, BundleListener {
- private static Log logger = LogFactory.getLog(BundleWatcher.class);
+ private final Logger logger = LoggerFactory.getLogger(BundleWatcher.class);
private BundleContext bundleContext;
private ConfigurationAdmin configurationAdmin;
Modified: karaf/trunk/shell/obr/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/pom.xml?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/shell/obr/pom.xml (original)
+++ karaf/trunk/shell/obr/pom.xml Mon Jan 31 18:23:41 2011
@@ -41,19 +41,14 @@
<dependencies>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-collections</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.5</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-lang</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -64,6 +59,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KarafJaasPasswordAuthenticator.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KarafJaasPasswordAuthenticator.java?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KarafJaasPasswordAuthenticator.java (original)
+++ karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KarafJaasPasswordAuthenticator.java Mon Jan 31 18:23:41 2011
@@ -30,11 +30,11 @@ import javax.security.auth.callback.Unsu
import javax.security.auth.login.FailedLoginException;
import javax.security.auth.login.LoginContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.sshd.common.Session;
import org.apache.sshd.server.PasswordAuthenticator;
import org.apache.sshd.server.session.ServerSession;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* TODO Add javadoc
@@ -44,7 +44,7 @@ import org.apache.sshd.server.session.Se
public class KarafJaasPasswordAuthenticator implements PasswordAuthenticator {
public static final Session.AttributeKey<Subject> SUBJECT_ATTRIBUTE_KEY = new Session.AttributeKey<Subject>();
- private static final Log LOGGER = LogFactory.getLog(KarafJaasPasswordAuthenticator.class);
+ private final Logger LOGGER = LoggerFactory.getLogger(KarafJaasPasswordAuthenticator.class);
private String realm;
private String role;
Modified: karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/BlueprintURLHandler.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/BlueprintURLHandler.java?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/BlueprintURLHandler.java (original)
+++ karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/BlueprintURLHandler.java Mon Jan 31 18:23:41 2011
@@ -26,9 +26,9 @@ import java.net.URL;
import java.net.URLConnection;
import java.net.URLStreamHandler;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.karaf.deployer.blueprint.BlueprintTransformer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* As org.apache.karaf.deployer.blueprint.BlueprintURLHandler need run with OSGi container
@@ -36,7 +36,7 @@ import org.apache.karaf.deployer.bluepri
*/
public class BlueprintURLHandler extends URLStreamHandler {
- private static Log logger = LogFactory.getLog(BlueprintURLHandler.class);
+ private final Logger logger = LoggerFactory.getLogger(BlueprintURLHandler.class);
private static String SYNTAX = "blueprint: bp-xml-uri";
Modified: karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/FeatureURLHandler.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/FeatureURLHandler.java?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/FeatureURLHandler.java (original)
+++ karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/FeatureURLHandler.java Mon Jan 31 18:23:41 2011
@@ -25,9 +25,9 @@ import java.net.URL;
import java.net.URLConnection;
import java.net.URLStreamHandler;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.karaf.deployer.features.FeatureTransformer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -36,7 +36,7 @@ import org.apache.karaf.deployer.feature
*/
public class FeatureURLHandler extends URLStreamHandler {
- private static Log logger = LogFactory.getLog(FeatureURLHandler.class);
+ private final Logger logger = LoggerFactory.getLogger(FeatureURLHandler.class);
private static String SYNTAX = "feature: xml-uri";
Modified: karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/SpringURLHandler.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/SpringURLHandler.java?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/SpringURLHandler.java (original)
+++ karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/SpringURLHandler.java Mon Jan 31 18:23:41 2011
@@ -26,9 +26,9 @@ import java.net.URL;
import java.net.URLConnection;
import java.net.URLStreamHandler;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.karaf.deployer.spring.SpringTransformer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* As org.apache.karaf.deployer.spring.SpringURLHandler need run with OSGi container
@@ -36,7 +36,7 @@ import org.apache.karaf.deployer.spring.
*/
public class SpringURLHandler extends URLStreamHandler {
- private static Log logger = LogFactory.getLog(SpringURLHandler.class);
+ private final Logger logger = LoggerFactory.getLogger(SpringURLHandler.class);
private static String SYNTAX = "spring: spring-xml-uri";
Modified: karaf/trunk/webconsole/admin/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/admin/pom.xml?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/webconsole/admin/pom.xml (original)
+++ karaf/trunk/webconsole/admin/pom.xml Mon Jan 31 18:23:41 2011
@@ -63,11 +63,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20070829</version>
@@ -79,7 +74,7 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>${commons-logging.version}</version>
+ <version>${commons-fileupload.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: karaf/trunk/webconsole/admin/src/main/java/org/apache/karaf/webconsole/admin/AdminPlugin.java
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/admin/src/main/java/org/apache/karaf/webconsole/admin/AdminPlugin.java?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/webconsole/admin/src/main/java/org/apache/karaf/webconsole/admin/AdminPlugin.java (original)
+++ karaf/trunk/webconsole/admin/src/main/java/org/apache/karaf/webconsole/admin/AdminPlugin.java Mon Jan 31 18:23:41 2011
@@ -29,8 +29,6 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.karaf.admin.AdminService;
import org.apache.karaf.admin.Instance;
import org.apache.karaf.admin.InstanceSettings;
@@ -38,18 +36,20 @@ import org.apache.felix.webconsole.Abstr
import org.json.JSONException;
import org.json.JSONWriter;
import org.osgi.framework.BundleContext;
+import org.slf4j.LoggerFactory;
/**
* Felix Web Console plugin for interacting with the {@link AdminService}
*/
public class AdminPlugin extends AbstractWebConsolePlugin {
+ private final org.slf4j.Logger logger = LoggerFactory.getLogger(AdminPlugin.class);
+
public static final String NAME = "admin";
public static final String LABEL = "Admin";
private String adminJs = "/admin/res/ui/admin.js";
private BundleContext bundleContext;
private AdminService adminService;
- private Log log = LogFactory.getLog(AdminPlugin.class);
private ClassLoader classLoader;
/**
@@ -58,11 +58,11 @@ public class AdminPlugin extends Abstrac
public void start() {
super.activate(bundleContext);
this.classLoader = this.getClass().getClassLoader();
- this.log.info(LABEL + " plugin activated");
+ this.logger.info(LABEL + " plugin activated");
}
public void stop() {
- this.log.info(LABEL + " plugin deactivated");
+ this.logger.info(LABEL + " plugin deactivated");
super.deactivate();
}
@@ -182,18 +182,18 @@ public class AdminPlugin extends Abstrac
try {
ins = url.openStream();
if (ins == null) {
- this.log.error("failed to open " + url);
+ this.logger.error("failed to open " + url);
url = null;
}
} catch (IOException e) {
- this.log.error(e.getMessage(), e);
+ this.logger.error(e.getMessage(), e);
url = null;
} finally {
if (ins != null) {
try {
ins.close();
} catch (IOException e) {
- this.log.error(e.getMessage(), e);
+ this.logger.error(e.getMessage(), e);
}
}
}
Modified: karaf/trunk/webconsole/features/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/features/pom.xml?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/webconsole/features/pom.xml (original)
+++ karaf/trunk/webconsole/features/pom.xml Mon Jan 31 18:23:41 2011
@@ -57,11 +57,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>org.apache.karaf.features.core</artifactId>
</dependency>
Modified: karaf/trunk/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.java
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.java?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.java (original)
+++ karaf/trunk/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.java Mon Jan 31 18:23:41 2011
@@ -31,8 +31,6 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.karaf.features.Feature;
import org.apache.karaf.features.FeaturesService;
import org.apache.karaf.features.Repository;
@@ -40,6 +38,8 @@ import org.apache.felix.webconsole.Abstr
import org.json.JSONException;
import org.json.JSONWriter;
import org.osgi.framework.BundleContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -51,12 +51,12 @@ public class FeaturesPlugin extends Abst
/** Pseudo class version ID to keep the IDE quite. */
private static final long serialVersionUID = 1L;
+ private final Logger log = LoggerFactory.getLogger(FeaturesPlugin.class);
+
public static final String NAME = "features";
public static final String LABEL = "Features";
- private Log log = LogFactory.getLog(FeaturesPlugin.class);
-
private ClassLoader classLoader;
private String featuresJs = "/features/res/ui/features.js";
Modified: karaf/trunk/webconsole/gogo/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/gogo/pom.xml?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/webconsole/gogo/pom.xml (original)
+++ karaf/trunk/webconsole/gogo/pom.xml Mon Jan 31 18:23:41 2011
@@ -57,11 +57,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
</dependency>
Modified: karaf/trunk/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/GogoPlugin.java
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/GogoPlugin.java?rev=1065702&r1=1065701&r2=1065702&view=diff
==============================================================================
--- karaf/trunk/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/GogoPlugin.java (original)
+++ karaf/trunk/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/GogoPlugin.java Mon Jan 31 18:23:41 2011
@@ -32,21 +32,19 @@ import java.io.PipedOutputStream;
import java.io.PrintStream;
import java.io.PrintWriter;
import java.net.URL;
-import java.util.List;
-import java.util.concurrent.Callable;
import java.util.zip.GZIPOutputStream;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.felix.service.command.CommandProcessor;
import org.apache.felix.service.command.CommandSession;
import org.apache.karaf.shell.console.jline.Console;
import org.apache.felix.webconsole.AbstractWebConsolePlugin;
import org.osgi.framework.BundleContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The <code>GogoPlugin</code>
@@ -56,6 +54,8 @@ public class GogoPlugin extends Abstract
/** Pseudo class version ID to keep the IDE quite. */
private static final long serialVersionUID = 1L;
+ private final Logger logger = LoggerFactory.getLogger(GogoPlugin.class);
+
public static final String NAME = "gogo";
public static final String LABEL = "Gogo";
@@ -63,7 +63,7 @@ public class GogoPlugin extends Abstract
public static final int TERM_WIDTH = 120;
public static final int TERM_HEIGHT = 39;
- private Log log = LogFactory.getLog(GogoPlugin.class);
+
private BundleContext bundleContext;
@@ -86,12 +86,12 @@ public class GogoPlugin extends Abstract
public void start()
{
super.activate( bundleContext );
- this.log.info( LABEL + " plugin activated" );
+ this.logger.info( LABEL + " plugin activated" );
}
public void stop()
{
- this.log.info( LABEL + " plugin deactivated" );
+ this.logger.info( LABEL + " plugin deactivated" );
super.deactivate();
}
@@ -132,18 +132,18 @@ public class GogoPlugin extends Abstract
try {
ins = url.openStream();
if (ins == null) {
- this.log.error("failed to open " + url);
+ this.logger.error("failed to open " + url);
url = null;
}
} catch (IOException e) {
- this.log.error(e.getMessage(), e);
+ this.logger.error(e.getMessage(), e);
url = null;
} finally {
if (ins != null) {
try {
ins.close();
} catch (IOException e) {
- this.log.error(e.getMessage(), e);
+ this.logger.error(e.getMessage(), e);
}
}
}