svn commit: r1363668 - in /openejb/trunk/openejb: container/openejb-core/src/main/java/org/apache/openejb/core/LocalInitialContext.java pom.xml

[andygumbrecht]

Author: andygumbrecht
Date: Fri Jul 20 07:01:21 2012
New Revision: 1363668

URL: http://svn.apache.org/viewvc?rev=1363668&view=rev
Log:
quartz 2.1.5
slf4j 1.6.6
log4j 1.2.17

LocalInitialContext logging.

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/LocalInitialContext.java
    openejb/trunk/openejb/pom.xml

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/LocalInitialContext.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/LocalInitialContext.java?rev=1363668&r1=1363667&r2=1363668&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/LocalInitialContext.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/LocalInitialContext.java
 Fri Jul 20 07:01:21 2012
@@ -51,7 +51,7 @@ public class LocalInitialContext extends
     }
 
     public static final String OPENEJB_EMBEDDED_REMOTABLE = 
"openejb.embedded.remotable";
-    static Logger logger = Logger.getInstance(LogCategory.OPENEJB_STARTUP, 
LocalInitialContext.class);
+    static Logger logger = 
Logger.getInstance(LogCategory.OPENEJB_STARTUP.createChild("local"), 
LocalInitialContext.class);
 
     private final LocalInitialContextFactory factory;
     private Properties properties;
@@ -63,7 +63,7 @@ public class LocalInitialContext extends
     private ServiceManagerProxy serviceManager;
 
     public static enum Close {
-        LOGOUT, DESTROY;
+        LOGOUT, DESTROY
     }
 
     public LocalInitialContext(Hashtable env, LocalInitialContextFactory 
factory) throws NamingException {
@@ -81,6 +81,7 @@ public class LocalInitialContext extends
         startNetworkServices();
     }
 
+    @Override
     public void close() throws NamingException {
         logger.debug("LocalIntialContext.close()");
 
@@ -168,8 +169,7 @@ public class LocalInitialContext extends
 
     private static Context getRoot() {
         ContainerSystem containerSystem = 
SystemInstance.get().getComponent(ContainerSystem.class);
-        Context context = containerSystem.getJNDIContext();
-        return context;
+        return containerSystem.getJNDIContext();
     }
 
     @Override

Modified: openejb/trunk/openejb/pom.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/pom.xml?rev=1363668&r1=1363667&r2=1363668&view=diff
==============================================================================
--- openejb/trunk/openejb/pom.xml (original)
+++ openejb/trunk/openejb/pom.xml Fri Jul 20 07:01:21 2012
@@ -138,7 +138,7 @@
 
     <bval.version>0.4</bval.version>
     <org.apache.activemq.version>5.6.0</org.apache.activemq.version>
-    <quartz.version>2.1.3</quartz.version>
+    <quartz.version>2.1.5</quartz.version>
     <org.springframework.version>3.1.0.RELEASE</org.springframework.version>
     <junit.version>4.9</junit.version>
     <org.apache.axis2.version>1.4.1</org.apache.axis2.version>
@@ -148,8 +148,8 @@
     <geronimo-osgi.version>1.1</geronimo-osgi.version>
     
<geronimo-javamail_1.4_spec.version>1.7.1</geronimo-javamail_1.4_spec.version>
     <myfaces.version>2.1.8</myfaces.version>
-    <slf4j.version>1.6.4</slf4j.version>
-    <log4j.version>1.2.16</log4j.version>
+    <slf4j.version>1.6.6</slf4j.version>
+    <log4j.version>1.2.17</log4j.version>
     <osgi.framework.version>4.2.0</osgi.framework.version>
     <hsqldb.version>2.2.8</hsqldb.version>
     <openjpa.version>2.2.0</openjpa.version>