Author: jacopoc
Date: Sun Jul 1 07:32:07 2012
New Revision: 1355854
URL: http://svn.apache.org/viewvc?rev=1355854&view=rev
Log:
Added new getName method to the Container interface and to all the
implementations; added info messages to inform when containers are
started/stopped.
Modified:
ofbiz/trunk/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/BeanShellContainer.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ClassLoaderContainer.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ComponentContainer.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/Container.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerLoader.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/GroovyShellContainer.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/NamingServiceContainer.java
ofbiz/trunk/framework/birt/src/org/ofbiz/birt/container/BirtContainer.java
ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java
ofbiz/trunk/framework/geronimo/src/org/ofbiz/geronimo/GeronimoContainer.java
ofbiz/trunk/framework/jetty/src/org/ofbiz/jetty/container/JettyContainer.java
ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java
ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/RmiServiceContainer.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/guiapp/xui/XuiContainer.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/container/JposDeviceContainer.java
Modified:
ofbiz/trunk/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java?rev=1355854&r1=1355853&r2=1355854&view=diff
==============================================================================
---
ofbiz/trunk/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java
(original)
+++
ofbiz/trunk/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java
Sun Jul 1 07:32:07 2012
@@ -71,11 +71,13 @@ public class GenerateContainer implement
private boolean isGeronimo = false;
private String geronimoHome = null;
+ private String name;
/**
* @see org.ofbiz.base.container.Container#init(java.lang.String[],
java.lang.String)
*/
public void init(String[] args, String name, String configFile) {
+ this.name = name;
ofbizHome = System.getProperty("ofbiz.home");
this.configFile = configFile;
this.args = args;
@@ -107,6 +109,10 @@ public class GenerateContainer implement
public void stop() throws ContainerException {
}
+ public String getName() {
+ return name;
+ }
+
private void generateFiles() throws ContainerException {
if (isGeronimo) {
if (geronimoHome == null) {
Modified:
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/BeanShellContainer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/container/BeanShellContainer.java?rev=1355854&r1=1355853&r2=1355854&view=diff
==============================================================================
---
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/BeanShellContainer.java
(original)
+++
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/BeanShellContainer.java
Sun Jul 1 07:32:07 2012
@@ -117,4 +117,8 @@ public class BeanShellContainer implemen
public void stop() throws ContainerException {
bsh = null;
}
+
+ public String getName() {
+ return containerName;
+ }
}
Modified:
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ClassLoaderContainer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ClassLoaderContainer.java?rev=1355854&r1=1355853&r2=1355854&view=diff
==============================================================================
---
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ClassLoaderContainer.java
(original)
+++
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ClassLoaderContainer.java
Sun Jul 1 07:32:07 2012
@@ -32,11 +32,13 @@ public class ClassLoaderContainer implem
public static final String module = ClassLoaderContainer.class.getName();
protected static CachedClassLoader cl = null;
+ private String name;
/**
* @see org.ofbiz.base.container.Container#init(java.lang.String[],
java.lang.String)
*/
public void init(String[] args, String name, String configFile) throws
ContainerException {
+ this.name = name;
ClassLoader parent = Thread.currentThread().getContextClassLoader();
if (parent == null) {
parent = Classpath.class.getClassLoader();
@@ -63,6 +65,10 @@ public class ClassLoaderContainer implem
public void stop() throws ContainerException {
}
+ public String getName() {
+ return name;
+ }
+
public static ClassLoader getClassLoader() {
if (cl != null) {
return cl;
Modified:
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ComponentContainer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ComponentContainer.java?rev=1355854&r1=1355853&r2=1355854&view=diff
==============================================================================
---
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ComponentContainer.java
(original)
+++
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ComponentContainer.java
Sun Jul 1 07:32:07 2012
@@ -50,6 +50,7 @@ public class ComponentContainer implemen
protected Classpath classPath = new
Classpath(System.getProperty("java.class.path"));
protected Classpath libraryPath = new
Classpath(System.getProperty("java.library.path"));
protected String configFileLocation = null;
+ private String name;
private boolean loaded = false;
private String instrumenterClassName;
private String instrumenterFile;
@@ -58,6 +59,7 @@ public class ComponentContainer implemen
* @see org.ofbiz.base.container.Container#init(java.lang.String[],
java.lang.String)
*/
public void init(String[] args, String name, String configFile) throws
ContainerException {
+ this.name = name;
this.configFileLocation = configFile;
// get the config for this container
@@ -299,6 +301,10 @@ public class ComponentContainer implemen
public void stop() throws ContainerException {
}
+ public String getName() {
+ return name;
+ }
+
/**
* Static method for easy loading of components for use when the
container system is not.
*
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/container/Container.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/container/Container.java?rev=1355854&r1=1355853&r2=1355854&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/container/Container.java
(original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/container/Container.java Sun
Jul 1 07:32:07 2012
@@ -63,4 +63,11 @@ public interface Container {
* @throws ContainerException If an error was encountered.
*/
public void stop() throws ContainerException;
+
+ /**
+ * Return the container name.
+ *
+ * @return Name of the container's instance.
+ */
+ public String getName();
}
Modified:
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerLoader.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerLoader.java?rev=1355854&r1=1355853&r2=1355854&view=diff
==============================================================================
---
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerLoader.java
(original)
+++
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/ContainerLoader.java
Sun Jul 1 07:32:07 2012
@@ -256,6 +256,7 @@ public class ContainerLoader implements
if (this.unloading) {
return;
}
+ Debug.logInfo("Starting container " + container.getName(), module);
try {
container.start();
} catch (ContainerException e) {
@@ -263,6 +264,7 @@ public class ContainerLoader implements
} catch (java.lang.AbstractMethodError e) {
throw new StartupException("Cannot start() " +
container.getClass().getName(), e);
}
+ Debug.logInfo("Started container " + container.getName(), module);
}
}
@@ -280,11 +282,13 @@ public class ContainerLoader implements
// shutting down in reverse order
for (int i = this.loadedContainers.size(); i > 0; i--) {
Container container = this.loadedContainers.get(i-1);
+ Debug.logInfo("Stopping container " + container.getName(),
module);
try {
container.stop();
} catch (ContainerException e) {
Debug.logError(e, module);
}
+ Debug.logInfo("Stopped container " + container.getName(),
module);
}
}
}
Modified:
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/GroovyShellContainer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/container/GroovyShellContainer.java?rev=1355854&r1=1355853&r2=1355854&view=diff
==============================================================================
---
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/GroovyShellContainer.java
(original)
+++
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/GroovyShellContainer.java
Sun Jul 1 07:32:07 2012
@@ -64,6 +64,10 @@ public class GroovyShellContainer implem
gsh = null;
}
+ public String getName() {
+ return name;
+ }
+
private int getTelnetPort() throws ContainerException {
ContainerConfig.Container config = ContainerConfig.getContainer(name,
configFileLocation);
Property telnetPort = config.getProperty("telnet-port");
Modified:
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java?rev=1355854&r1=1355853&r2=1355854&view=diff
==============================================================================
---
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java
(original)
+++
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java
Sun Jul 1 07:32:07 2012
@@ -29,10 +29,13 @@ public class JustLoadComponentsContainer
public static final String module = JustLoadComponentsContainer.class.getName();
+ private String name;
+
/**
* @see org.ofbiz.base.container.Container#init(java.lang.String[],
java.lang.String)
*/
public void init(String[] args, String name, String configFile) {
+ this.name = name;
try {
ComponentContainer.loadComponents(true);
} catch (AlreadyLoadedException e) {
@@ -49,4 +52,8 @@ public class JustLoadComponentsContainer
public void stop() throws ContainerException {
}
+
+ public String getName() {
+ return name;
+ }
}
Modified:
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/NamingServiceContainer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/container/NamingServiceContainer.java?rev=1355854&r1=1355853&r2=1355854&view=diff
==============================================================================
---
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/NamingServiceContainer.java
(original)
+++
ofbiz/trunk/framework/base/src/org/ofbiz/base/container/NamingServiceContainer.java
Sun Jul 1 07:32:07 2012
@@ -44,7 +44,10 @@ public class NamingServiceContainer impl
protected RMIExtendedSocketFactory rmiSocketFactory;
+ private String name;
+
public void init(String[] args, String name, String configFile) throws
ContainerException {
+ this.name =name;
this.configFileLocation = configFile;
ContainerConfig.Container cfg = ContainerConfig.getContainer(name, configFileLocation);
@@ -93,4 +96,8 @@ public class NamingServiceContainer impl
}
}
}
+
+ public String getName() {
+ return name;
+ }
}
Modified:
ofbiz/trunk/framework/birt/src/org/ofbiz/birt/container/BirtContainer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/birt/src/org/ofbiz/birt/container/BirtContainer.java?rev=1355854&r1=1355853&r2=1355854&view=diff
==============================================================================
--- ofbiz/trunk/framework/birt/src/org/ofbiz/birt/container/BirtContainer.java
(original)
+++ ofbiz/trunk/framework/birt/src/org/ofbiz/birt/container/BirtContainer.java
Sun Jul 1 07:32:07 2012
@@ -52,13 +52,13 @@ public class BirtContainer implements Co
Debug.logInfo("Start BIRT container", module);
// make sure the subclass sets the config name
- if (this.getContainerConfigName() == null) {
+ if (getName() == null) {
throw new ContainerException("Unknown container config name");
}
// get the container config
- ContainerConfig.Container cc =
ContainerConfig.getContainer(this.getContainerConfigName(), configFile);
+ ContainerConfig.Container cc = ContainerConfig.getContainer(getName(),
configFile);
if (cc == null) {
- throw new ContainerException("No " + this.getContainerConfigName() + "
configuration found in container config!");
+ throw new ContainerException("No " + getName() + " configuration found
in container config!");
}
// create engine config
@@ -103,7 +103,7 @@ public class BirtContainer implements Co
public void stop() throws ContainerException {
}
- public String getContainerConfigName() {
+ public String getName() {
return name;
}
}
Modified:
ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java?rev=1355854&r1=1355853&r2=1355854&view=diff
==============================================================================
---
ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java
(original)
+++
ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java
Sun Jul 1 07:32:07 2012
@@ -171,10 +171,13 @@ public class CatalinaContainer implement
protected String catalinaRuntimeHome;
+ private String name;
+
/**
* @see org.ofbiz.base.container.Container#init(java.lang.String[],
java.lang.String)
*/
public void init(String[] args, String name, String configFile) throws
ContainerException {
+ this.name = name;
// get the container config
ContainerConfig.Container cc = ContainerConfig.getContainer(name,
configFile);
if (cc == null) {
@@ -803,6 +806,10 @@ public class CatalinaContainer implement
}
}
+ public String getName() {
+ return name;
+ }
+
protected void configureMimeTypes(Context context) throws
ContainerException {
Map<String, String> mimeTypes = CatalinaContainer.getMimeTypes();
if (UtilValidate.isNotEmpty(mimeTypes)) {
Modified:
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java?rev=1355854&r1=1355853&r2=1355854&view=diff
==============================================================================
---
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java
(original)
+++
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java
Sun Jul 1 07:32:07 2012
@@ -573,4 +573,8 @@ public class EntityDataLoadContainer imp
*/
public void stop() throws ContainerException {
}
+
+ public String getName() {
+ return name;
+ }
}
Modified:
ofbiz/trunk/framework/geronimo/src/org/ofbiz/geronimo/GeronimoContainer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/geronimo/src/org/ofbiz/geronimo/GeronimoContainer.java?rev=1355854&r1=1355853&r2=1355854&view=diff
==============================================================================
---
ofbiz/trunk/framework/geronimo/src/org/ofbiz/geronimo/GeronimoContainer.java
(original)
+++
ofbiz/trunk/framework/geronimo/src/org/ofbiz/geronimo/GeronimoContainer.java
Sun Jul 1 07:32:07 2012
@@ -85,4 +85,8 @@ public class GeronimoContainer implement
// TODO: how to stop the Geronimo transaction manager? is it even
needed?
}
+ public String getName() {
+ return name;
+ }
+
}
Modified:
ofbiz/trunk/framework/jetty/src/org/ofbiz/jetty/container/JettyContainer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/jetty/src/org/ofbiz/jetty/container/JettyContainer.java?rev=1355854&r1=1355853&r2=1355854&view=diff
==============================================================================
---
ofbiz/trunk/framework/jetty/src/org/ofbiz/jetty/container/JettyContainer.java
(original)
+++
ofbiz/trunk/framework/jetty/src/org/ofbiz/jetty/container/JettyContainer.java
Sun Jul 1 07:32:07 2012
@@ -58,13 +58,14 @@ public class JettyContainer implements C
public static final String module = JettyContainer.class.getName();
+ private String name;
private Map<String, Server> servers = new HashMap<String, Server>();
/**
* @see org.ofbiz.base.container.Container#init(java.lang.String[],
java.lang.String)
*/
public void init(String[] args, String name, String configFile) throws
ContainerException {
-
+ this.name = name;
// configure JSSE properties
SSLUtil.loadJsseProperties();
@@ -376,4 +377,8 @@ public class JettyContainer implements C
}
}
+ public String getName() {
+ return name;
+ }
+
}
Modified:
ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java?rev=1355854&r1=1355853&r2=1355854&view=diff
==============================================================================
---
ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java
(original)
+++
ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java
Sun Jul 1 07:32:07 2012
@@ -146,6 +146,10 @@ public class JavaMailContainer implement
Debug.logWarning("stop JavaMail poller", module);
}
+ public String getName() {
+ return name;
+ }
+
// java-mail methods
protected Session makeSession(ContainerConfig.Container.Property client) {
Properties props = new Properties();
Modified:
ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/RmiServiceContainer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/RmiServiceContainer.java?rev=1355854&r1=1355853&r2=1355854&view=diff
==============================================================================
---
ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/RmiServiceContainer.java
(original)
+++
ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/RmiServiceContainer.java
Sun Jul 1 07:32:07 2012
@@ -171,4 +171,8 @@ public class RmiServiceContainer impleme
public void stop() throws ContainerException {
remote.deregister();
}
+
+ public String getName() {
+ return containerName;
+ }
}
Modified:
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/guiapp/xui/XuiContainer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/guiapp/xui/XuiContainer.java?rev=1355854&r1=1355853&r2=1355854&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/guiapp/xui/XuiContainer.java
(original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/guiapp/xui/XuiContainer.java
Sun Jul 1 07:32:07 2012
@@ -110,6 +110,10 @@ public abstract class XuiContainer imple
public void stop() throws ContainerException {
}
+ public String getName() {
+ return name;
+ }
+
public String getXuiPropertiesName() {
return this.startupFile;
}
Modified:
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/container/JposDeviceContainer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/container/JposDeviceContainer.java?rev=1355854&r1=1355853&r2=1355854&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/container/JposDeviceContainer.java
(original)
+++
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/container/JposDeviceContainer.java
Sun Jul 1 07:32:07 2012
@@ -67,4 +67,8 @@ public class JposDeviceContainer impleme
}
Debug.logInfo("JPOS Devices released and closed", module);
}
+
+ public String getName() {
+ return name;
+ }
}
