From 9c6aa6afb1a7c989ddc12ae66ae8b8c8df9db1b2 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Jun 2010 20:37:10 +0000 Subject: [PATCH] --- .../java/org/wamblee/general/BeanFactory.java | 38 ------ .../wamblee/general/BeanFactoryException.java | 47 ------- .../java/org/wamblee/general/BeanKernel.java | 127 ------------------ .../org/wamblee/general/ClassLoaderUtils.java | 104 -------------- 4 files changed, 316 deletions(-) delete mode 100644 support/general/src/main/java/org/wamblee/general/BeanFactory.java delete mode 100644 support/general/src/main/java/org/wamblee/general/BeanFactoryException.java delete mode 100644 support/general/src/main/java/org/wamblee/general/BeanKernel.java delete mode 100644 support/general/src/main/java/org/wamblee/general/ClassLoaderUtils.java diff --git a/support/general/src/main/java/org/wamblee/general/BeanFactory.java b/support/general/src/main/java/org/wamblee/general/BeanFactory.java deleted file mode 100644 index bee62b1b..00000000 --- a/support/general/src/main/java/org/wamblee/general/BeanFactory.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2005-2010 the original author or authors. - * - * Licensed 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.wamblee.general; - -/** - * Bean factory used to obtain objects in a transparent way. - * - * @author Erik Brakkee - */ -public interface BeanFactory { - /** - * Finds a bean based on id. - * - * @param aId - * Id of the bean. - * @return Object (always non-null). - * @throws BeanFactoryException - * In case the object could not be found. - */ - Object find(String aId); - - T find(Class aClass); - - T find(String aId, Class aClass); -} diff --git a/support/general/src/main/java/org/wamblee/general/BeanFactoryException.java b/support/general/src/main/java/org/wamblee/general/BeanFactoryException.java deleted file mode 100644 index 125fd8bf..00000000 --- a/support/general/src/main/java/org/wamblee/general/BeanFactoryException.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright 2005-2010 the original author or authors. - * - * Licensed 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.wamblee.general; - -/** - * Exception thrown by the BeanFactory if an object could not be found. - * - * @author Erik Brakkee - */ -public class BeanFactoryException extends RuntimeException { - static final long serialVersionUID = -1215992188624874902L; - - /** - * Constructs the exception. - * - * @param aMsg - * Message. - */ - public BeanFactoryException(String aMsg) { - super(aMsg); - } - - /** - * Constructs the exception. - * - * @param aMsg - * Message. - * @param aThrowable - * Cause of the exception. - */ - public BeanFactoryException(String aMsg, Throwable aThrowable) { - super(aMsg, aThrowable); - } -} diff --git a/support/general/src/main/java/org/wamblee/general/BeanKernel.java b/support/general/src/main/java/org/wamblee/general/BeanKernel.java deleted file mode 100644 index 619c7da3..00000000 --- a/support/general/src/main/java/org/wamblee/general/BeanKernel.java +++ /dev/null @@ -1,127 +0,0 @@ -/* - * Copyright 2005-2010 the original author or authors. - * - * Licensed 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.wamblee.general; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.wamblee.io.ClassPathResource; -import org.wamblee.io.InputResource; - -import java.io.IOException; -import java.io.InputStream; - -import java.util.Properties; - -/** - * The standard means to obtain the bean factory. This works by reading a - * property {@value #BEAN_FACTORY_CLASS} from a property file named - * {@value #BEAN_KERNEL_PROP_FILE} from the class path. This property identifies - * the bean factory implementation to use. The configured bean factory must have - * a no-arg constructor. - */ -public final class BeanKernel { - private static final Log LOG = LogFactory.getLog(BeanKernel.class); - - /** - * Bean factory kernel properties file. - */ - private static final String BEAN_KERNEL_PROP_FILE = "org.wamblee.beanfactory.properties"; - - /** - * Name of the property to define the name of the bean factory class to use. - * THis class must have a public default constructor. - */ - private static final String BEAN_FACTORY_CLASS = "org.wamblee.beanfactory.class"; - - /** - * Cached bean factory. - */ - private static BeanFactory BEAN_FACTORY; - - /** - * Disabled constructor. - * - */ - private BeanKernel() { - // Empty - } - - /** - * Overrides the default mechanism for looking up the bean factory by - * specifying it yourself. - * - * @param aOverride - * Override bean factory. - */ - public static void overrideBeanFactory(BeanFactory aOverride) { - BEAN_FACTORY = aOverride; - } - - /** - * Gets the bean factory. - * - * @return Bean factory. - */ - public static BeanFactory getBeanFactory() { - synchronized (BeanFactory.class) { - if (BEAN_FACTORY == null) { - BEAN_FACTORY = lookupBeanFactory(BEAN_KERNEL_PROP_FILE); - } - } - - return BEAN_FACTORY; - } - - /** - * Lookup the bean factory based on the properties file. - * - * - * @return Bean factory. - * - */ - static BeanFactory lookupBeanFactory(String aPropertyFilename) { - InputResource resource = new ClassPathResource(aPropertyFilename); - InputStream is; - - try { - is = resource.getInputStream(); - } catch (IOException e) { - throw new BeanFactoryException("Cannot open resource " + resource, - e); - } - - try { - Properties props = new Properties(); - props.load(is); - - String className = props.getProperty(BEAN_FACTORY_CLASS); - Class beanFactory = Class.forName(className); - - return (BeanFactory) beanFactory.newInstance(); - } catch (Exception e) { - throw new BeanFactoryException("Cannot read from resource " + - resource, e); - } finally { - try { - is.close(); - } catch (IOException e) { - // last resort cannot do much now. - LOG.error("Error closing resource " + resource); - } - } - } -} diff --git a/support/general/src/main/java/org/wamblee/general/ClassLoaderUtils.java b/support/general/src/main/java/org/wamblee/general/ClassLoaderUtils.java deleted file mode 100644 index 27245ddf..00000000 --- a/support/general/src/main/java/org/wamblee/general/ClassLoaderUtils.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright 2005-2010 the original author or authors. - * - * Licensed 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.wamblee.general; - -import java.io.File; -import java.io.IOException; - -import java.lang.reflect.Method; - -import java.net.URL; -import java.net.URLClassLoader; - -/** - * Utility for working with the class loader. Based on the ClassPathHacker - * example found on the internet. - */ -public class ClassLoaderUtils { - // No logging in this class to keep the required class libraries - // limited to the standard java classes. This allows use of the - // utilities in an environment with a very limited classpath. - private static final String JAR_SUFFIX = ".jar"; - - /** - * Adds all jars in the given directory to the class path. - * - * @param aDirectory - * Directory. - * @throws IOException - */ - public static void addJarsInDirectory(File aDirectory) throws IOException { - System.out.println("directory '" + aDirectory + "'"); - - for (File aFile : aDirectory.listFiles()) { - System.out - .println("Considering '" + aFile.getCanonicalPath() + "'"); - - if (aFile.getName().toLowerCase().endsWith(JAR_SUFFIX)) { - System.out.println("Adding '" + aFile.getCanonicalPath() + - "' to classpath."); - addFile(aFile); - } - } - } - - /** - * Adds a file to the classpath. - * - * @param aFilename - * Filename to add. - * @throws IOException - */ - public static void addFile(String aFilename) throws IOException { - File f = new File(aFilename); - addFile(f); - } - - /** - * Adds a file to the classpath. - * - * @param aFile - * File to add. - * @throws IOException - */ - public static void addFile(File aFile) throws IOException { - addURL(aFile.toURL()); - } - - /** - * Adds a url to the classpath. - * - * @param aUrl - * Url to add. - * @throws IOException - */ - public static void addURL(URL aUrl) throws IOException { - URLClassLoader sysloader = (URLClassLoader) ClassLoader - .getSystemClassLoader(); - Class sysclass = URLClassLoader.class; - - try { - Method method = sysclass.getDeclaredMethod("addURL", - new Class[] { URL.class }); - method.setAccessible(true); - method.invoke(sysloader, new Object[] { aUrl }); - } catch (Throwable t) { - t.printStackTrace(); - throw new IOException( - "Error, could not add URL to system classloader"); - } - } -} -- 2.31.1