svn commit: r583080 - in /myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra: frameworkAdapter/basic/BasicFrameworkAdapter.java lib/_ClassUtils.java

[im...@apache.org]

Author: imario
Date: Tue Oct  9 01:57:13 2007
New Revision: 583080

URL: http://svn.apache.org/viewvc?rev=583080&view=rev
Log:
get rid of MyFaces dependency

Added:
    myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/_ClassUtils.java   (with props)
Modified:
    myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/basic/BasicFrameworkAdapter.java

Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/basic/BasicFrameworkAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/basic/BasicFrameworkAdapter.java?rev=583080&r1=583079&r2=583080&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/basic/BasicFrameworkAdapter.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/basic/BasicFrameworkAdapter.java Tue Oct  9 01:57:13 2007
@@ -23,7 +23,7 @@
 import org.apache.myfaces.orchestra.conversation.ConversationMessager;
 import org.apache.myfaces.orchestra.conversation.basic.LogConversationMessager;
 import org.apache.myfaces.orchestra.frameworkAdapter.FrameworkAdapter;
-import org.apache.myfaces.shared_orchestra.util.ClassUtils;
+import org.apache.myfaces.orchestra.lib._ClassUtils;
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletRequest;
@@ -69,7 +69,7 @@
 			return (ConversationMessager) instance;
 		}
 
-		return (ConversationMessager) ClassUtils.newInstance(conversationMessager);
+		return (ConversationMessager) _ClassUtils.newInstance(conversationMessager);
 	}
 
 	protected ConversationMessager createDefaultConversationMessager()

Added: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/_ClassUtils.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/_ClassUtils.java?rev=583080&view=auto
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/_ClassUtils.java (added)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/_ClassUtils.java Tue Oct  9 01:57:13 2007
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.orchestra.lib;
+
+/**
+ * <p>
+ * Internal helper class for some class management.
+ * </p>
+ * <p>
+ * <b>Not for use outside of Orchestra</b>
+ * </p>
+ */
+public final class _ClassUtils
+{
+	private _ClassUtils()
+	{
+	}
+
+	/**
+	 * create a new instance for a class by its name
+	 */
+	public static Object newInstance(String className)
+	{
+		try
+		{
+			Class clazz = classForName(className);
+			return clazz.newInstance();
+		}
+		catch(NoClassDefFoundError e)
+		{
+			throw new OrchestraException(e);
+		}
+		catch (InstantiationException e)
+		{
+			throw new OrchestraException(e);
+		}
+		catch (IllegalAccessException e)
+		{
+			throw new OrchestraException(e);
+		}
+		catch (ClassNotFoundException e)
+		{
+			throw new OrchestraException(e);
+		}
+	}
+
+	/**
+	 * Lookup class using the webapp classloader first and the the classloader which loaded
+	 * this class.
+	 */
+	public static Class classForName(String className) throws ClassNotFoundException
+	{
+		if (className == null)
+		{
+			throw new NullPointerException("className");
+		}
+
+		try
+		{
+			// Try WebApp ClassLoader first
+			return Class.forName(className,
+				false, // do not initialize for faster startup
+				Thread.currentThread().getContextClassLoader());
+		}
+		catch (ClassNotFoundException ignore)
+		{
+			// fallback: Try ClassLoader for this class (i.e. the myfaces.jar lib)
+			return Class.forName(className,
+				false, // do not initialize for faster startup
+				_ClassUtils.class.getClassLoader());
+		}
+	}
+}

Propchange: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/_ClassUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/_ClassUtils.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/_ClassUtils.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain