You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by no...@apache.org on 2011/03/09 17:52:27 UTC
svn commit: r1079880 - in /aries/trunk/jndi: jndi-core/pom.xml
jndi-core/src/main/java/org/apache/aries/jndi/startup/Activator.java
jndi-rmi/pom.xml
jndi-rmi/src/main/java/org/apache/aries/jndi/rmi/Activator.java
jndi-url/pom.xml
Author: not
Date: Wed Mar 9 16:52:26 2011
New Revision: 1079880
URL: http://svn.apache.org/viewvc?rev=1079880&view=rev
Log:
ARIES-599 Integrate patch for using slf4j and also include a fix not in the patch so the url tests pass.
Modified:
aries/trunk/jndi/jndi-core/pom.xml
aries/trunk/jndi/jndi-core/src/main/java/org/apache/aries/jndi/startup/Activator.java
aries/trunk/jndi/jndi-rmi/pom.xml
aries/trunk/jndi/jndi-rmi/src/main/java/org/apache/aries/jndi/rmi/Activator.java
aries/trunk/jndi/jndi-url/pom.xml
Modified: aries/trunk/jndi/jndi-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-core/pom.xml?rev=1079880&r1=1079879&r2=1079880&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-core/pom.xml (original)
+++ aries/trunk/jndi/jndi-core/pom.xml Wed Mar 9 16:52:26 2011
@@ -59,10 +59,19 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: aries/trunk/jndi/jndi-core/src/main/java/org/apache/aries/jndi/startup/Activator.java
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-core/src/main/java/org/apache/aries/jndi/startup/Activator.java?rev=1079880&r1=1079879&r2=1079880&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-core/src/main/java/org/apache/aries/jndi/startup/Activator.java (original)
+++ aries/trunk/jndi/jndi-core/src/main/java/org/apache/aries/jndi/startup/Activator.java Wed Mar 9 16:52:26 2011
@@ -20,8 +20,6 @@ package org.apache.aries.jndi.startup;
import java.lang.reflect.Field;
import java.util.Arrays;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import javax.naming.NamingException;
import javax.naming.spi.InitialContextFactory;
@@ -46,6 +44,8 @@ import org.osgi.service.jndi.JNDIContext
import org.osgi.service.jndi.JNDIProviderAdmin;
import org.osgi.util.tracker.ServiceTracker;
import org.osgi.util.tracker.ServiceTrackerCustomizer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The activator for this bundle makes sure the static classes in it are
@@ -53,7 +53,7 @@ import org.osgi.util.tracker.ServiceTrac
*/
public class Activator implements BundleActivator {
- private static final Logger LOGGER = Logger.getLogger(Activator.class.getName());
+ private static final Logger LOGGER = LoggerFactory.getLogger(Activator.class.getName());
private OSGiInitialContextFactoryBuilder icfBuilder;
private OSGiObjectFactoryBuilder ofBuilder;
@@ -62,49 +62,49 @@ public class Activator implements Bundle
private static ServiceTracker initialContextFactories;
private static ServiceTracker objectFactories;
private static ServiceTracker environmentAugmentors;
-
+
public void start(BundleContext context) {
-
+
initialContextFactories = initServiceTracker(context, InitialContextFactory.class, ServiceTrackerCustomizers.ICF_CACHE);
objectFactories = initServiceTracker(context, ObjectFactory.class, ServiceTrackerCustomizers.URL_FACTORY_CACHE);
icfBuilders = initServiceTracker(context, InitialContextFactoryBuilder.class, ServiceTrackerCustomizers.LAZY);
urlObjectFactoryFinders = initServiceTracker(context, URLObjectFactoryFinder.class, ServiceTrackerCustomizers.LAZY);
environmentAugmentors = initServiceTracker(context, EnvironmentAugmentation.class, null);
-
+
try {
OSGiInitialContextFactoryBuilder builder = new OSGiInitialContextFactoryBuilder();
NamingManager.setInitialContextFactoryBuilder(builder);
icfBuilder = builder;
} catch (NamingException e) {
- LOGGER.log(Level.INFO, "Cannot set the InitialContextFactoryBuilder.", e);
+ LOGGER.info("Cannot set the InitialContextFactoryBuilder.", e);
} catch (IllegalStateException e) {
- LOGGER.log(Level.INFO, "Cannot set the InitialContextFactoryBuilder. Another builder " + getClassName(InitialContextFactoryBuilder.class) + " is already installed", e);
+ LOGGER.info("Cannot set the InitialContextFactoryBuilder. Another builder " + getClassName(InitialContextFactoryBuilder.class) + " is already installed", e);
}
-
+
try {
OSGiObjectFactoryBuilder builder = new OSGiObjectFactoryBuilder(context);
NamingManager.setObjectFactoryBuilder(builder);
ofBuilder = builder;
} catch (NamingException e) {
- LOGGER.log(Level.INFO, "Cannot set the ObjectFactoryBuilder.", e);
+ LOGGER.info("Cannot set the ObjectFactoryBuilder.", e);
} catch (IllegalStateException e) {
- LOGGER.log(Level.INFO, "Cannot set the ObjectFactoryBuilder. Another builder " + getClassName(InitialContextFactoryBuilder.class) + " is already installed", e);
+ LOGGER.info("Cannot set the ObjectFactoryBuilder. Another builder " + getClassName(InitialContextFactoryBuilder.class) + " is already installed", e);
}
-
- context.registerService(JNDIProviderAdmin.class.getName(),
- new ProviderAdminServiceFactory(context),
+
+ context.registerService(JNDIProviderAdmin.class.getName(),
+ new ProviderAdminServiceFactory(context),
null);
- context.registerService(InitialContextFactoryBuilder.class.getName(),
- new JREInitialContextFactoryBuilder(),
+ context.registerService(InitialContextFactoryBuilder.class.getName(),
+ new JREInitialContextFactoryBuilder(),
null);
- context.registerService(JNDIContextManager.class.getName(),
+ context.registerService(JNDIContextManager.class.getName(),
new ContextManagerServiceFactory(),
null);
}
- private String getClassName(Class<?> expectedType)
+ private String getClassName(Class<?> expectedType)
{
try {
for (Field field : NamingManager.class.getDeclaredFields()) {
@@ -121,7 +121,7 @@ public class Activator implements Bundle
}
private ServiceTracker initServiceTracker(BundleContext context,
- Class<?> type, ServiceTrackerCustomizer custom)
+ Class<?> type, ServiceTrackerCustomizer custom)
{
ServiceTracker t = new ServiceTracker(context, type.getName(), custom);
t.open();
@@ -131,7 +131,7 @@ public class Activator implements Bundle
public void stop(BundleContext context) {
/*
* Try to reset the InitialContextFactoryBuilder and ObjectFactoryBuilder
- * on the NamingManager.
+ * on the NamingManager.
*/
if (icfBuilder != null) {
unsetField(InitialContextFactoryBuilder.class);
@@ -139,17 +139,17 @@ public class Activator implements Bundle
if (ofBuilder != null) {
unsetField(ObjectFactoryBuilder.class);
}
-
+
icfBuilders.close();
urlObjectFactoryFinders.close();
objectFactories.close();
initialContextFactories.close();
environmentAugmentors.close();
}
-
+
/*
* There are no public API to reset the InitialContextFactoryBuilder or
- * ObjectFactoryBuilder on the NamingManager so try to use reflection.
+ * ObjectFactoryBuilder on the NamingManager so try to use reflection.
*/
private static void unsetField(Class<?> expectedType) {
try {
@@ -161,37 +161,37 @@ public class Activator implements Bundle
}
} catch (Throwable t) {
// Ignore
- LOGGER.log(Level.FINE, "Error setting field.", t);
+ LOGGER.debug("Error setting field.", t);
}
}
public static ServiceReference[] getInitialContextFactoryBuilderServices()
{
ServiceReference[] refs = icfBuilders.getServiceReferences();
-
+
if (refs != null) Arrays.sort(refs, Utils.SERVICE_REFERENCE_COMPARATOR);
-
+
return refs;
}
-
- public static ServiceReference[] getInitialContextFactoryServices()
+
+ public static ServiceReference[] getInitialContextFactoryServices()
{
ServiceReference[] refs = initialContextFactories.getServiceReferences();
-
+
if (refs != null) Arrays.sort(refs, Utils.SERVICE_REFERENCE_COMPARATOR);
-
+
return refs;
}
- public static ServiceReference[] getURLObectFactoryFinderServices()
+ public static ServiceReference[] getURLObectFactoryFinderServices()
{
ServiceReference[] refs = urlObjectFactoryFinders.getServiceReferences();
-
+
if (refs != null) Arrays.sort(refs, Utils.SERVICE_REFERENCE_COMPARATOR);
-
+
return refs;
}
-
+
public static Object[] getEnvironmentAugmentors()
{
return environmentAugmentors.getServices();
Modified: aries/trunk/jndi/jndi-rmi/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-rmi/pom.xml?rev=1079880&r1=1079879&r2=1079880&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-rmi/pom.xml (original)
+++ aries/trunk/jndi/jndi-rmi/pom.xml Wed Mar 9 16:52:26 2011
@@ -52,6 +52,10 @@
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: aries/trunk/jndi/jndi-rmi/src/main/java/org/apache/aries/jndi/rmi/Activator.java
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-rmi/src/main/java/org/apache/aries/jndi/rmi/Activator.java?rev=1079880&r1=1079879&r2=1079880&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-rmi/src/main/java/org/apache/aries/jndi/rmi/Activator.java (original)
+++ aries/trunk/jndi/jndi-rmi/src/main/java/org/apache/aries/jndi/rmi/Activator.java Wed Mar 9 16:52:26 2011
@@ -19,8 +19,6 @@
package org.apache.aries.jndi.rmi;
import java.util.Hashtable;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import javax.naming.spi.ObjectFactory;
@@ -29,16 +27,18 @@ import org.osgi.framework.BundleActivato
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.jndi.JNDIConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class Activator implements BundleActivator {
private ServiceRegistration reg;
- private static final Logger LOGGER = Logger.getLogger(Activator.class.getName());
+ private static final Logger LOGGER = LoggerFactory.getLogger(Activator.class.getName());
public void start(BundleContext context) {
- LOGGER.fine("Registering RMI url handler");
+ LOGGER.debug("Registering RMI url handler");
try {
Hashtable<Object, Object> props = new Hashtable<Object, Object>();
@@ -50,7 +50,7 @@ public class Activator implements Bundle
}
catch (Exception e)
{
- LOGGER.log(Level.INFO, "Could not create the jndi rmi url factory.", e);
+ LOGGER.info("Could not create the jndi rmi url factory.", e);
}
}
Modified: aries/trunk/jndi/jndi-url/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url/pom.xml?rev=1079880&r1=1079879&r2=1079880&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-url/pom.xml (original)
+++ aries/trunk/jndi/jndi-url/pom.xml Wed Mar 9 16:52:26 2011
@@ -81,6 +81,11 @@
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>