jlaskowski 2005/06/16 18:29:52
Modified: modules/core/src/java/org/openejb/loader EmbeddedLoader.java
EmbeddingLoader.java Loader.java LoaderServlet.java
SystemLoader.java TomcatWebappLoader.java
Log:
Fix for #OPENEJB-26: Remove references to sf.net in text and help files
Revision Changes Path
1.3 +77 -77
openejb1/modules/core/src/java/org/openejb/loader/EmbeddedLoader.java
Index: EmbeddedLoader.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/loader/EmbeddedLoader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EmbeddedLoader.java 24 Feb 2005 13:43:35 -0000 1.2
+++ EmbeddedLoader.java 16 Jun 2005 22:29:51 -0000 1.3
@@ -1,77 +1,77 @@
-/**
- * Redistribution and use of this software and associated documentation
- * ("Software"), with or without modification, are permitted provided
- * that the following conditions are met:
- *
- * 1. Redistributions of source code must retain copyright
- * statements and notices. Redistributions must also contain a
- * copy of this document.
- *
- * 2. Redistributions in binary form must reproduce the
- * above copyright notice, this list of conditions and the
- * following disclaimer in the documentation and/or other
- * materials provided with the distribution.
- *
- * 3. The name "OpenEJB" must not be used to endorse or promote
- * products derived from this Software without prior written
- * permission of The OpenEJB Group. For written permission,
- * please contact [EMAIL PROTECTED]
- *
- * 4. Products derived from this Software may not be called "OpenEJB"
- * nor may "OpenEJB" appear in their names without prior written
- * permission of The OpenEJB Group. OpenEJB is a registered
- * trademark of The OpenEJB Group.
- *
- * 5. Due credit should be given to the OpenEJB Project
- * (http://openejb.sf.net/).
- *
- * THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
- * NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- * THE OPENEJB GROUP OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Copyright 2002 (C) The OpenEJB Group. All Rights Reserved.
- *
- * $Id$
- */
-package org.openejb.loader;
-
-import java.util.Hashtable;
import java.util.Properties;
import org.openejb.EnvProps;
-
-/**
- *
- * @author <a href="mailto:[EMAIL PROTECTED]">David Blevins</a>
- */
-public class EmbeddedLoader implements Loader {
-
- public void load( Hashtable env ) throws Exception{
- if (org.openejb.OpenEJB.isInitialized()) return;
- try{
- Properties props = new Properties();
-
- props.put(EnvProps.ASSEMBLER,
"org.openejb.alt.assembler.classic.Assembler");
- props.put(EnvProps.CONFIGURATION_FACTORY,
"org.openejb.alt.config.ConfigurationFactory");
-
- // Override defaults with System properties
- props.putAll(System.getProperties());
-
- // Override defauls again with Env properties
- props.putAll( env );
-
- org.openejb.OpenEJB.init( props );
-
- } catch( Exception e){
- throw new Exception("Cannot initialize OpenEJB. " +
e.getMessage());
- }
- }
-}
-
-
+/**
+ * Redistribution and use of this software and associated documentation
+ * ("Software"), with or without modification, are permitted provided
+ * that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain copyright
+ * statements and notices. Redistributions must also contain a
+ * copy of this document.
+ *
+ * 2. Redistributions in binary form must reproduce the
+ * above copyright notice, this list of conditions and the
+ * following disclaimer in the documentation and/or other
+ * materials provided with the distribution.
+ *
+ * 3. The name "OpenEJB" must not be used to endorse or promote
+ * products derived from this Software without prior written
+ * permission of The OpenEJB Group. For written permission,
+ * please contact [EMAIL PROTECTED]
+ *
+ * 4. Products derived from this Software may not be called "OpenEJB"
+ * nor may "OpenEJB" appear in their names without prior written
+ * permission of The OpenEJB Group. OpenEJB is a registered
+ * trademark of The OpenEJB Group.
+ *
+ * 5. Due credit should be given to the OpenEJB Project
+ * (http://www.openejb.org/).
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+ * NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE OPENEJB GROUP OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Copyright 2002 (C) The OpenEJB Group. All Rights Reserved.
+ *
+ * $Id$
+ */
+package org.openejb.loader;
+
+import java.util.Hashtable;
import java.util.Properties;
import org.openejb.EnvProps;
+
+/**
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]">David Blevins</a>
+ */
+public class EmbeddedLoader implements Loader {
+
+ public void load( Hashtable env ) throws Exception{
+ if (org.openejb.OpenEJB.isInitialized()) return;
+ try{
+ Properties props = new Properties();
+
+ props.put(EnvProps.ASSEMBLER,
"org.openejb.alt.assembler.classic.Assembler");
+ props.put(EnvProps.CONFIGURATION_FACTORY,
"org.openejb.alt.config.ConfigurationFactory");
+
+ // Override defaults with System properties
+ props.putAll(System.getProperties());
+
+ // Override defauls again with Env properties
+ props.putAll( env );
+
+ org.openejb.OpenEJB.init( props );
+
+ } catch( Exception e){
+ throw new Exception("Cannot initialize OpenEJB. " +
e.getMessage());
+ }
+ }
+}
+
+
1.4 +3 -3
openejb1/modules/core/src/java/org/openejb/loader/EmbeddingLoader.java
Index: EmbeddingLoader.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/loader/EmbeddingLoader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EmbeddingLoader.java 25 Aug 2004 22:57:56 -0000 1.3
+++ EmbeddingLoader.java 16 Jun 2005 22:29:51 -0000 1.4
@@ -15,7 +15,7 @@
* 3. The name "OpenEJB" must not be used to endorse or promote
* products derived from this Software without prior written
* permission of The OpenEJB Group. For written permission,
- * please contact [EMAIL PROTECTED]
+ * please contact [EMAIL PROTECTED]
*
* 4. Products derived from this Software may not be called "OpenEJB"
* nor may "OpenEJB" appear in their names without prior written
@@ -23,7 +23,7 @@
* trademark of The OpenEJB Group.
*
* 5. Due credit should be given to the OpenEJB Project
- * (http://openejb.sf.net/).
+ * (http://www.openejb.org/).
*
* THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
1.2 +59 -59
openejb1/modules/core/src/java/org/openejb/loader/Loader.java
Index: Loader.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/loader/Loader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Loader.java 26 Mar 2004 21:42:42 -0000 1.1
+++ Loader.java 16 Jun 2005 22:29:51 -0000 1.2
@@ -1,59 +1,59 @@
-/**
- * Redistribution and use of this software and associated documentation
- * ("Software"), with or without modification, are permitted provided
- * that the following conditions are met:
- *
- * 1. Redistributions of source code must retain copyright
- * statements and notices. Redistributions must also contain a
- * copy of this document.
- *
- * 2. Redistributions in binary form must reproduce the
- * above copyright notice, this list of conditions and the
- * following disclaimer in the documentation and/or other
- * materials provided with the distribution.
- *
- * 3. The name "OpenEJB" must not be used to endorse or promote
- * products derived from this Software without prior written
- * permission of The OpenEJB Group. For written permission,
- * please contact [EMAIL PROTECTED]
- *
- * 4. Products derived from this Software may not be called "OpenEJB"
- * nor may "OpenEJB" appear in their names without prior written
- * permission of The OpenEJB Group. OpenEJB is a registered
- * trademark of The OpenEJB Group.
- *
- * 5. Due credit should be given to the OpenEJB Project
- * (http://openejb.sf.net/).
- *
- * THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
- * NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- * THE OPENEJB GROUP OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Copyright 2002 (C) The OpenEJB Group. All Rights Reserved.
- *
- * $Id$
- */
-package org.openejb.loader;
-
-import java.util.Hashtable;
-
-/**
- *
- * @author <a href="mailto:[EMAIL PROTECTED]">David Blevins</a>
- */
-public interface Loader {
-
- public void load( Hashtable env ) throws Exception;
-
-}
-
-
+/**
+ * Redistribution and use of this software and associated documentation
+ * ("Software"), with or without modification, are permitted provided
+ * that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain copyright
+ * statements and notices. Redistributions must also contain a
+ * copy of this document.
+ *
+ * 2. Redistributions in binary form must reproduce the
+ * above copyright notice, this list of conditions and the
+ * following disclaimer in the documentation and/or other
+ * materials provided with the distribution.
+ *
+ * 3. The name "OpenEJB" must not be used to endorse or promote
+ * products derived from this Software without prior written
+ * permission of The OpenEJB Group. For written permission,
+ * please contact [EMAIL PROTECTED]
+ *
+ * 4. Products derived from this Software may not be called "OpenEJB"
+ * nor may "OpenEJB" appear in their names without prior written
+ * permission of The OpenEJB Group. OpenEJB is a registered
+ * trademark of The OpenEJB Group.
+ *
+ * 5. Due credit should be given to the OpenEJB Project
+ * (http://www.openejb.org/).
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+ * NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE OPENEJB GROUP OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Copyright 2002 (C) The OpenEJB Group. All Rights Reserved.
+ *
+ * $Id$
+ */
+package org.openejb.loader;
+
+import java.util.Hashtable;
+
+/**
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]">David Blevins</a>
+ */
+public interface Loader {
+
+ public void load( Hashtable env ) throws Exception;
+
+}
+
+
1.4 +3 -3
openejb1/modules/core/src/java/org/openejb/loader/LoaderServlet.java
Index: LoaderServlet.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/loader/LoaderServlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LoaderServlet.java 5 Jul 2004 15:47:46 -0000 1.3
+++ LoaderServlet.java 16 Jun 2005 22:29:51 -0000 1.4
@@ -15,7 +15,7 @@
* 3. The name "OpenEJB" must not be used to endorse or promote
* products derived from this Software without prior written
* permission of The OpenEJB Group. For written permission,
- * please contact [EMAIL PROTECTED]
+ * please contact [EMAIL PROTECTED]
*
* 4. Products derived from this Software may not be called "OpenEJB"
* nor may "OpenEJB" appear in their names without prior written
@@ -23,7 +23,7 @@
* trademark of The OpenEJB Group.
*
* 5. Due credit should be given to the OpenEJB Project
- * (http://openejb.sf.net/).
+ * (http://www.openejb.org/).
*
* THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
1.2 +114 -114
openejb1/modules/core/src/java/org/openejb/loader/SystemLoader.java
Index: SystemLoader.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/loader/SystemLoader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SystemLoader.java 26 Mar 2004 21:42:43 -0000 1.1
+++ SystemLoader.java 16 Jun 2005 22:29:51 -0000 1.2
@@ -1,114 +1,114 @@
-/**
- * Redistribution and use of this software and associated documentation
- * ("Software"), with or without modification, are permitted provided
- * that the following conditions are met:
- *
- * 1. Redistributions of source code must retain copyright
- * statements and notices. Redistributions must also contain a
- * copy of this document.
- *
- * 2. Redistributions in binary form must reproduce the
- * above copyright notice, this list of conditions and the
- * following disclaimer in the documentation and/or other
- * materials provided with the distribution.
- *
- * 3. The name "OpenEJB" must not be used to endorse or promote
- * products derived from this Software without prior written
- * permission of The OpenEJB Group. For written permission,
- * please contact [EMAIL PROTECTED]
- *
- * 4. Products derived from this Software may not be called "OpenEJB"
- * nor may "OpenEJB" appear in their names without prior written
- * permission of The OpenEJB Group. OpenEJB is a registered
- * trademark of The OpenEJB Group.
- *
- * 5. Due credit should be given to the OpenEJB Project
- * (http://openejb.sf.net/).
- *
- * THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
- * NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- * THE OPENEJB GROUP OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Copyright 2002 (C) The OpenEJB Group. All Rights Reserved.
- *
- * $Id$
- */
-package org.openejb.loader;
-
-import java.util.Hashtable;
-
-
-/**
- * Checks to see if OpenEJB is available through the system
- * classpath. If it isn't, then the required libraries are
- * added to the system classpath. A call is then made
- * to the EmbeddedLoader to load OpenEJB fully.
- *
- * @author <a href="mailto:[EMAIL PROTECTED]">David Blevins</a>
- */
-public class SystemLoader implements Loader {
-
- static boolean loaded = false;
- /**
- * Checks to see if OpenEJB is available through the system
- * classpath. If it isn't, then the required libraries are
- * added and OpenEJB is pulled in and instantiated.
- *
- * @param env
- * @exception Exception
- */
- public void load( Hashtable env ) throws Exception{
- if (loaded) return;
-
- try{
- Class.forName("org.openejb.OpenEJB");
- } catch (Exception e){
- importOpenEJBLibraries( env );
- }
- try{
- Loader embedded = null;
-
- Class loaderClass = Class.forName(
"org.openejb.loader.EmbeddedLoader" );
-
- embedded = (Loader)loaderClass.newInstance();
- embedded.load( env );
-
- org.openejb.util.ClasspathUtils.rebuildJavaClassPathVariable();
- } catch (Exception e){
- throw new Exception( "Cannot embed OpenEJB. Exception: "+
- e.getClass().getName()+" "+ e.getMessage());
- }
- loaded = true;
- }
-
- private void importOpenEJBLibraries( Hashtable env ) throws Exception{
- // Sets the openejb.home system variable
- try{
- if ( env.get("openejb.home") != null ) {
- System.setProperty("openejb.home",
(String)env.get("openejb.home"));
- }
- } catch (Exception e){}
-
- try{
- // Loads all the libraries in the openejb.home/lib directory
- org.openejb.util.ClasspathUtils.addJarsToPath("lib", "system");
-
- // Loads all the libraries in the openejb.home/dist directory
- org.openejb.util.ClasspathUtils.addJarsToPath("dist", "system");
- } catch (Exception e){
- throw new Exception( "Could not load OpenEJB libraries.
Exception: "+
- e.getClass().getName()+" "+ e.getMessage());
- }
- }
-}
-
-
+/**
+ * Redistribution and use of this software and associated documentation
+ * ("Software"), with or without modification, are permitted provided
+ * that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain copyright
+ * statements and notices. Redistributions must also contain a
+ * copy of this document.
+ *
+ * 2. Redistributions in binary form must reproduce the
+ * above copyright notice, this list of conditions and the
+ * following disclaimer in the documentation and/or other
+ * materials provided with the distribution.
+ *
+ * 3. The name "OpenEJB" must not be used to endorse or promote
+ * products derived from this Software without prior written
+ * permission of The OpenEJB Group. For written permission,
+ * please contact [EMAIL PROTECTED]
+ *
+ * 4. Products derived from this Software may not be called "OpenEJB"
+ * nor may "OpenEJB" appear in their names without prior written
+ * permission of The OpenEJB Group. OpenEJB is a registered
+ * trademark of The OpenEJB Group.
+ *
+ * 5. Due credit should be given to the OpenEJB Project
+ * (http://www.openejb.org/).
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+ * NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE OPENEJB GROUP OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Copyright 2002 (C) The OpenEJB Group. All Rights Reserved.
+ *
+ * $Id$
+ */
+package org.openejb.loader;
+
+import java.util.Hashtable;
+
+
+/**
+ * Checks to see if OpenEJB is available through the system
+ * classpath. If it isn't, then the required libraries are
+ * added to the system classpath. A call is then made
+ * to the EmbeddedLoader to load OpenEJB fully.
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]">David Blevins</a>
+ */
+public class SystemLoader implements Loader {
+
+ static boolean loaded = false;
+ /**
+ * Checks to see if OpenEJB is available through the system
+ * classpath. If it isn't, then the required libraries are
+ * added and OpenEJB is pulled in and instantiated.
+ *
+ * @param env
+ * @exception Exception
+ */
+ public void load( Hashtable env ) throws Exception{
+ if (loaded) return;
+
+ try{
+ Class.forName("org.openejb.OpenEJB");
+ } catch (Exception e){
+ importOpenEJBLibraries( env );
+ }
+ try{
+ Loader embedded = null;
+
+ Class loaderClass = Class.forName(
"org.openejb.loader.EmbeddedLoader" );
+
+ embedded = (Loader)loaderClass.newInstance();
+ embedded.load( env );
+
+ org.openejb.util.ClasspathUtils.rebuildJavaClassPathVariable();
+ } catch (Exception e){
+ throw new Exception( "Cannot embed OpenEJB. Exception: "+
+ e.getClass().getName()+" "+ e.getMessage());
+ }
+ loaded = true;
+ }
+
+ private void importOpenEJBLibraries( Hashtable env ) throws Exception{
+ // Sets the openejb.home system variable
+ try{
+ if ( env.get("openejb.home") != null ) {
+ System.setProperty("openejb.home",
(String)env.get("openejb.home"));
+ }
+ } catch (Exception e){}
+
+ try{
+ // Loads all the libraries in the openejb.home/lib directory
+ org.openejb.util.ClasspathUtils.addJarsToPath("lib", "system");
+
+ // Loads all the libraries in the openejb.home/dist directory
+ org.openejb.util.ClasspathUtils.addJarsToPath("dist", "system");
+ } catch (Exception e){
+ throw new Exception( "Could not load OpenEJB libraries.
Exception: "+
+ e.getClass().getName()+" "+ e.getMessage());
+ }
+ }
+}
+
+
1.2 +3 -3
openejb1/modules/core/src/java/org/openejb/loader/TomcatWebappLoader.java
Index: TomcatWebappLoader.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/loader/TomcatWebappLoader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TomcatWebappLoader.java 25 May 2004 21:28:02 -0000 1.1
+++ TomcatWebappLoader.java 16 Jun 2005 22:29:51 -0000 1.2
@@ -15,7 +15,7 @@
* 3. The name "OpenEJB" must not be used to endorse or promote
* products derived from this Software without prior written
* permission of The OpenEJB Group. For written permission,
- * please contact [EMAIL PROTECTED]
+ * please contact [EMAIL PROTECTED]
*
* 4. Products derived from this Software may not be called "OpenEJB"
* nor may "OpenEJB" appear in their names without prior written
@@ -23,7 +23,7 @@
* trademark of The OpenEJB Group.
*
* 5. Due credit should be given to the OpenEJB Project
- * (http://openejb.sf.net/).
+ * (http://www.openejb.org/).
*
* THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
