Author: jlaskowski
Date: Sun Jul 15 03:00:10 2007
New Revision: 556384
URL: http://svn.apache.org/viewvc?view=rev&rev=556384
Log:
code cleanup
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cli/Bootstrap.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/client/LocalInitialContextFactory.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java
openejb/trunk/openejb3/container/openejb-loader/src/main/java/org/apache/openejb/loader/OpenEJBInstance.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/DatabaseBean.java
openejb/trunk/openejb3/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlService.java
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Main.java
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Server.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cli/Bootstrap.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cli/Bootstrap.java?view=diff&rev=556384&r1=556383&r2=556384
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cli/Bootstrap.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cli/Bootstrap.java
Sun Jul 15 03:00:10 2007
@@ -22,18 +22,26 @@
import java.net.URI;
import java.net.URL;
+/**
+ * @version $Rev$ $Date$
+ */
public class Bootstrap {
+
+ private final static String OPENEJB_VERSION_PROPERTIES_FILE_NAME =
"openejb-version.properties";
+ private final static String OPENEJB_HOME_PROPERTY_NAME = "openejb.home";
+ private final static String OPENEJB_BASE_PROPERTY_NAME = "openejb.base";
+ private final static String OPENEJB_CLI_MAIN_CLASS_NAME =
"org.apache.openejb.cli.MainImpl";
private static void setupHome(String[] args) {
for (String arg : args) {
- if (arg.startsWith("-Dopenejb.home")){
+ if (arg.startsWith("-D" + OPENEJB_HOME_PROPERTY_NAME)){
addProperty(arg);
- } else if (arg.startsWith("-Dopenejb.base")){
+ } else if (arg.startsWith("-D" + OPENEJB_BASE_PROPERTY_NAME)){
addProperty(arg);
}
}
- String homeProperty = System.getProperty("openejb.home");
+ String homeProperty = System.getProperty(OPENEJB_HOME_PROPERTY_NAME);
if (homeProperty != null){
if (new File(homeProperty).exists()){
return;
@@ -41,7 +49,7 @@
}
try {
- URL classURL =
Thread.currentThread().getContextClassLoader().getResource("openejb-version.properties");
+ URL classURL =
Thread.currentThread().getContextClassLoader().getResource(OPENEJB_VERSION_PROPERTIES_FILE_NAME);
if (classURL != null) {
String propsString = classURL.getFile();
@@ -56,11 +64,11 @@
File lib = jarFile.getParentFile();
File home = lib.getParentFile();
- System.setProperty("openejb.home", home.getAbsolutePath());
+ System.setProperty(OPENEJB_HOME_PROPERTY_NAME,
home.getAbsolutePath());
}
}
} catch (Exception e) {
- System.err.println("Error setting openejb.home :" + e.getClass() +
": " + e.getMessage());
+ System.err.println("Error setting " + OPENEJB_HOME_PROPERTY_NAME +
" property: " + e.getClass() + ": " + e.getMessage());
}
}
@@ -73,7 +81,7 @@
private static void setupClasspath() {
try {
- File lib = new File(System.getProperty("openejb.home") +
File.separator + "lib");
+ File lib = new File(System.getProperty(OPENEJB_HOME_PROPERTY_NAME)
+ File.separator + "lib");
SystemClassPath systemCP = new SystemClassPath();
systemCP.addJarsToPath(lib);
} catch (Exception e) {
@@ -88,7 +96,7 @@
setupHome(args);
setupClasspath();
- Class clazz =
Bootstrap.class.getClassLoader().loadClass("org.apache.openejb.cli.MainImpl");
+ Class<?> clazz =
Bootstrap.class.getClassLoader().loadClass(OPENEJB_CLI_MAIN_CLASS_NAME);
Main main = (Main) clazz.newInstance();
main.main(args);
}
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java?view=diff&rev=556384&r1=556383&r2=556384
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java
Sun Jul 15 03:00:10 2007
@@ -40,11 +40,15 @@
* architecture explained here:
*
* @link http://docs.codehaus.org/display/OPENEJB/Executables
+ *
+ * @version $Rev$ $Date$
*/
public class MainImpl implements Main {
- private static ResourceFinder finder = null;
private static final String BASE_PATH = "META-INF/org.apache.openejb.cli/";
+ private static final String MAIN_CLASS_PROPERTY_NAME = "main.class";
+
+ private static ResourceFinder finder = null;
private static String locale = "";
private static String descriptionBase = "description";
@@ -153,16 +157,16 @@
return;
}
- String mainClass = props.getProperty("main.class");
+ String mainClass = props.getProperty(MAIN_CLASS_PROPERTY_NAME);
if (mainClass == null) {
- throw new NullPointerException("Command " + commandName + " did
not specify a main.class property");
+ throw new NullPointerException("Command " + commandName + " did
not specify a " + MAIN_CLASS_PROPERTY_NAME + " property");
}
- Class clazz = null;
+ Class<?> clazz = null;
try {
clazz =
Thread.currentThread().getContextClassLoader().loadClass(mainClass);
- } catch (ClassNotFoundException e) {
- throw new IllegalStateException("Command " + commandName + "
main.class does not exist: " + mainClass, e);
+ } catch (ClassNotFoundException cnfe) {
+ throw new IllegalStateException("Main class of command " +
commandName + " does not exist: " + mainClass, cnfe);
}
Method mainMethod = null;
@@ -200,7 +204,7 @@
}
//DMB: TODO: Delete me
- public static Enumeration doFindCommands() throws IOException {
+ public static Enumeration<URL> doFindCommands() throws IOException {
return
Thread.currentThread().getContextClassLoader().getResources(BASE_PATH);
}
@@ -208,18 +212,17 @@
System.out.println("COMMANDS:");
try {
- Enumeration commandHomes = doFindCommands();
+ Enumeration<URL> commandHomes = doFindCommands();
if (commandHomes != null) {
for (; commandHomes.hasMoreElements();) {
- URL cHomeURL = (URL) commandHomes.nextElement();
+ URL cHomeURL = commandHomes.nextElement();
JarURLConnection conn = (JarURLConnection)
cHomeURL.openConnection();
JarFile jarfile = conn.getJarFile();
- Enumeration commands = jarfile.entries();
-
+ Enumeration<JarEntry> commands = jarfile.entries();
if (commands != null) {
while (commands.hasMoreElements()) {
- JarEntry je = (JarEntry) commands.nextElement();
+ JarEntry je = commands.nextElement();
if (je.getName().indexOf(BASE_PATH) > -1 &&
!je.getName().equals(BASE_PATH) && !je.getName().endsWith(".help") &&
!je.getName().endsWith(".examples"))
{
@@ -233,7 +236,7 @@
}
}
} else {
- System.out.println("No available commands!");
+ System.out.println("No commands available!");
}
} catch (IOException e) {
e.printStackTrace();
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/client/LocalInitialContextFactory.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/client/LocalInitialContextFactory.java?view=diff&rev=556384&r1=556383&r2=556384
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/client/LocalInitialContextFactory.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/client/LocalInitialContextFactory.java
Sun Jul 15 03:00:10 2007
@@ -28,6 +28,9 @@
import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
+/**
+ * @version $Rev$ $Date$
+ */
public class LocalInitialContextFactory implements
javax.naming.spi.InitialContextFactory {
static Context intraVmContext;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?view=diff&rev=556384&r1=556383&r2=556384
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
Sun Jul 15 03:00:10 2007
@@ -455,7 +455,7 @@
}
- public <T extends ServiceInfo>T configureService(Service service, Class<?
extends T> type) throws OpenEJBException {
+ public <T extends ServiceInfo> T configureService(Service service, Class<?
extends T> type) throws OpenEJBException {
if (service == null) {
return configureService(type);
}
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java?view=diff&rev=556384&r1=556383&r2=556384
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java
Sun Jul 15 03:00:10 2007
@@ -53,20 +53,20 @@
if (compareResult == ParsedName.IS_EQUAL &&
name.getComponent().equals(atomicName)) {// hashcodes and String valuse are
equal
if (name.next()) {
- if (subTree == null) throw new
javax.naming.NameNotFoundException("Can not resolve " + name);
+ if (subTree == null) throw new
javax.naming.NameNotFoundException("Cannot resolve " + name);
return subTree.resolve(name);
} else if (unbound){
- throw new javax.naming.NameNotFoundException("Can not resolve
" + name);
+ throw new javax.naming.NameNotFoundException("Cannot resolve "
+ name);
} else {
return getBinding();
}
} else if (compareResult == ParsedName.IS_LESS) {// parsed hash is
less than
- if (lessTree == null) throw new
javax.naming.NameNotFoundException("Can not resolve " + name);
+ if (lessTree == null) throw new
javax.naming.NameNotFoundException("Cannot resolve " + name);
return lessTree.resolve(name);
} else {//ParsedName.IS_GREATER
- if (grtrTree == null) throw new
javax.naming.NameNotFoundException("Can not resolve " + name);
+ if (grtrTree == null) throw new
javax.naming.NameNotFoundException("Cannot resolve " + name);
return grtrTree.resolve(name);
}
}
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java?view=diff&rev=556384&r1=556383&r2=556384
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java
Sun Jul 15 03:00:10 2007
@@ -187,7 +187,7 @@
}
String t = "The bean instance " + bean + " threw a system
exception:" + e;
logger.error(t, e);
- throw new org.apache.openejb.ApplicationException(new
RemoteException("Can not obtain a free instance.", e));
+ throw new org.apache.openejb.ApplicationException(new
RemoteException("Cannot obtain a free instance.", e));
} finally {
callContext.setCurrentOperation(originalOperation);
callContext.setCurrentAllowedStates(originalAllowedStates);
Modified:
openejb/trunk/openejb3/container/openejb-loader/src/main/java/org/apache/openejb/loader/OpenEJBInstance.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-loader/src/main/java/org/apache/openejb/loader/OpenEJBInstance.java?view=diff&rev=556384&r1=556383&r2=556384
==============================================================================
---
openejb/trunk/openejb3/container/openejb-loader/src/main/java/org/apache/openejb/loader/OpenEJBInstance.java
(original)
+++
openejb/trunk/openejb3/container/openejb-loader/src/main/java/org/apache/openejb/loader/OpenEJBInstance.java
Sun Jul 15 03:00:10 2007
@@ -26,7 +26,7 @@
private final Method isInitialized;
public OpenEJBInstance() throws Exception {
- Class openejb = loadOpenEJBClass();
+ Class<?> openejb = loadOpenEJBClass();
this.init = openejb.getMethod("init", Properties.class);
this.isInitialized = openejb.getMethod("isInitialized");
}
@@ -43,8 +43,7 @@
public boolean isInitialized() {
try {
- Boolean b = (Boolean) isInitialized.invoke(null);
- return b.booleanValue();
+ return (Boolean) isInitialized.invoke(null);
} catch (InvocationTargetException e) {
throw new RuntimeException("OpenEJB.isInitialized: ",
e.getCause());
} catch (Exception e) {
@@ -52,7 +51,7 @@
}
}
- private Class loadOpenEJBClass() throws Exception {
+ private Class<?> loadOpenEJBClass() throws Exception {
ClassPath classPath = SystemInstance.get().getClassPath();
ClassLoader classLoader = classPath.getClassLoader();
try {
Modified:
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/DatabaseBean.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/DatabaseBean.java?view=diff&rev=556384&r1=556383&r2=556384
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/DatabaseBean.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/DatabaseBean.java
Sun Jul 15 03:00:10 2007
@@ -16,17 +16,22 @@
*/
package org.apache.openejb.test.beans;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.Statement;
+
import javax.ejb.EJBException;
import javax.ejb.SessionContext;
import javax.naming.InitialContext;
import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.Statement;
+/**
+ * @version $Rev$ $Date$
+ */
public class DatabaseBean implements javax.ejb.SessionBean {
+ private static final long serialVersionUID = 1L;
+
public SessionContext context;
public InitialContext jndiContext;
Modified:
openejb/trunk/openejb3/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlService.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlService.java?view=diff&rev=556384&r1=556383&r2=556384
==============================================================================
---
openejb/trunk/openejb3/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlService.java
(original)
+++
openejb/trunk/openejb3/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlService.java
Sun Jul 15 03:00:10 2007
@@ -74,7 +74,7 @@
if (property.startsWith(ServerConstants.SC_KEY_DBNAME + ".") ||
property.startsWith(ServerConstants.SC_KEY_DATABASE +
".")) {
- throw new ServiceException("Databases can not be declared in
the hsql.properties. " +
+ throw new ServiceException("Databases cannot be declared in
the hsql.properties. " +
"Instead declare a database connection in the
openejb.conf file");
}
Modified:
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Main.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Main.java?view=diff&rev=556384&r1=556383&r2=556384
==============================================================================
---
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Main.java
(original)
+++
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Main.java
Sun Jul 15 03:00:10 2007
@@ -25,6 +25,8 @@
/**
* Assemble OpenEJB instance and boot it up
+ *
+ * @version $Rev$ $Date$
*/
public class Main {
@@ -39,8 +41,7 @@
File libs = system.getHome().getDirectory("lib");
system.getClassPath().addJarsToPath(libs);
initServer(props);
- } catch (DontStartServerException e) {
-
+ } catch (DontStartServerException ignored) {
} catch (Exception e) {
e.printStackTrace();
}
@@ -181,4 +182,6 @@
}
}
-class DontStartServerException extends Exception {}
+class DontStartServerException extends Exception {
+ private static final long serialVersionUID = 1L;
+}
Modified:
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Server.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Server.java?view=diff&rev=556384&r1=556383&r2=556384
==============================================================================
---
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Server.java
(original)
+++
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Server.java
Sun Jul 15 03:00:10 2007
@@ -16,15 +16,15 @@
*/
package org.apache.openejb.server;
-import java.io.IOException;
import java.io.File;
+import java.io.IOException;
import java.net.URI;
import java.util.Properties;
import org.apache.openejb.OpenEJB;
-import org.apache.openejb.loader.SystemInstance;
-import org.apache.openejb.loader.FileUtils;
import org.apache.openejb.core.ServerFederation;
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.spi.Service;
import org.apache.openejb.util.PropertiesService;
/**
@@ -33,7 +33,7 @@
*
* @version $Rev$ $Date$
*/
-public class Server implements org.apache.openejb.spi.Service {
+public class Server implements Service {
// FIXME: Remove it completely once we ensure PropertiesService (below)
works well
Properties props;
@@ -51,7 +51,7 @@
}
// TODO: Remove it once init() suits our (initialisation) needs
- public void init(java.util.Properties props) throws Exception {
+ public void init(Properties props) throws Exception {
this.props = props;
SystemInstance system = SystemInstance.get();
