[Mc4j-cvs] SF.net SVN: mc4j:[602] trunk/mc4j/modules/ems

[<ian...@us...>]

Revision: 602
          http://mc4j.svn.sourceforge.net/mc4j/?rev=602&view=rev
Author:   ianpspringer
Date:     2009-07-14 20:25:40 +0000 (Tue, 14 Jul 2009)

Log Message:
-----------
add new mc4j.ems.UseContextClassLoader connection option and bump version up to 1.2.9

Modified Paths:
--------------
    trunk/mc4j/modules/ems/build.xml
    trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/ConnectionFactory.java
    trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/ClassLoaderFactory.java

Modified: trunk/mc4j/modules/ems/build.xml
===================================================================
--- trunk/mc4j/modules/ems/build.xml	2009-07-10 21:39:37 UTC (rev 601)
+++ trunk/mc4j/modules/ems/build.xml	2009-07-14 20:25:40 UTC (rev 602)
@@ -30,7 +30,7 @@
 
     <property name="module.jar" value="org-mc4j-ems.jar"/>
 
-    <property name="release.version" value="1.2.8"/>
+    <property name="release.version" value="1.2.9"/>
 
 
     <target
@@ -168,8 +168,9 @@
                 <attribute name="Implementation-Version" value="${release.version}"/>
                 <attribute name="Implementation-URL" value="http://mc4j.org/"/>
             </manifest>
-        </jar>
-
+        </jar>        
+        <copy file="classes/main/org-mc4j-ems-impl.jar" todir="dist"/>
+        
         <jar jarfile="dist/org-mc4j-ems.jar" update="true" compress="false">
             <fileset dir="classes/main"/>
             <fileset dir="${basedir}" includes="lib/*.jar"/>

Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/ConnectionFactory.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/ConnectionFactory.java	2009-07-10 21:39:37 UTC (rev 601)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/ConnectionFactory.java	2009-07-14 20:25:40 UTC (rev 602)
@@ -61,6 +61,7 @@
 
     public static final String JAR_TEMP_DIR = "mc4j.ems.JarTempDir";
 
+    public static final String USE_CONTEXT_CLASSLOADER="mc4j.ems.UseContextClassLoader";
 
     private boolean broadSearch = false;
     private int searchDepth = DEFAULT_SEARCH_DEPTH;

Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/ClassLoaderFactory.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/ClassLoaderFactory.java	2009-07-10 21:39:37 UTC (rev 601)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/ClassLoaderFactory.java	2009-07-14 20:25:40 UTC (rev 602)
@@ -175,6 +175,11 @@
 
     public ClassLoader buildClassLoader(ConnectionSettings settings) {
 
+        Boolean useContextClassLoader = Boolean.valueOf(settings.getAdvancedProperties().getProperty(ConnectionFactory.USE_CONTEXT_CLASSLOADER, "false"));
+        if (useContextClassLoader.booleanValue()) {
+            return Thread.currentThread().getContextClassLoader();
+        }
+
         String tempDirString = (String) settings.getControlProperties().get(ConnectionFactory.JAR_TEMP_DIR);
         File tempDir = null;
         if (tempDirString != null) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.