Author: jacopoc
Date: Sat Jun 30 06:32:00 2012
New Revision: 1355652
URL: http://svn.apache.org/viewvc?rev=1355652&view=rev
Log:
Added new "name" argument to the "init" method of the Component interface: now
the name of the container (set by the xml attribute container.name) is passed
to the init method and it is used to retrieve the container's configuration;
before of this the container's name was hardcoded preventing the ability to
define (and load) two containers (with different settings) of the same type.
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/framework/testtools/src/org/ofbiz/testtools/TestListContainer.java
ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/guiapp/xui/XuiContainer.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/container/JposDeviceContainer.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/container/PosContainer.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=1355652&r1=1355651&r2=1355652&view=diff
==============================================================================
---
ofbiz/trunk/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java
(original)
+++
ofbiz/trunk/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java
Sat Jun 30 06:32:00 2012
@@ -75,7 +75,7 @@ public class GenerateContainer implement
/**
* @see org.ofbiz.base.container.Container#init(java.lang.String[],
java.lang.String)
*/
- public void init(String[] args, String configFile) {
+ public void init(String[] args, String name, String configFile) {
ofbizHome = System.getProperty("ofbiz.home");
this.configFile = configFile;
this.args = args;
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=1355652&r1=1355651&r2=1355652&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
Sat Jun 30 06:32:00 2012
@@ -34,13 +34,15 @@ public class BeanShellContainer implemen
protected String configFileLocation = null;
protected Interpreter bsh = null;
+ protected String containerName;
protected String name;
protected int port;
/**
* @see org.ofbiz.base.container.Container#init(java.lang.String[],
java.lang.String)
*/
- public void init(String[] args, String configFile) {
+ public void init(String[] args, String name, String configFile) {
+ this.containerName = name;
this.configFileLocation = configFile;
}
@@ -49,7 +51,7 @@ public class BeanShellContainer implemen
*/
public boolean start() throws ContainerException {
// get the container config
- ContainerConfig.Container cfg =
ContainerConfig.getContainer("beanshell-container", configFileLocation);
+ ContainerConfig.Container cfg =
ContainerConfig.getContainer(containerName, configFileLocation);
// get the app-name
ContainerConfig.Container.Property appName =
cfg.getProperty("app-name");
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=1355652&r1=1355651&r2=1355652&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
Sat Jun 30 06:32:00 2012
@@ -36,7 +36,7 @@ public class ClassLoaderContainer implem
/**
* @see org.ofbiz.base.container.Container#init(java.lang.String[],
java.lang.String)
*/
- public void init(String[] args, String configFile) throws
ContainerException {
+ public void init(String[] args, String name, String configFile) throws
ContainerException {
ClassLoader parent = Thread.currentThread().getContextClassLoader();
if (parent == null) {
parent = Classpath.class.getClassLoader();
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=1355652&r1=1355651&r2=1355652&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
Sat Jun 30 06:32:00 2012
@@ -57,11 +57,11 @@ public class ComponentContainer implemen
/**
* @see org.ofbiz.base.container.Container#init(java.lang.String[],
java.lang.String)
*/
- public void init(String[] args, String configFile) throws
ContainerException {
+ public void init(String[] args, String name, String configFile) throws
ContainerException {
this.configFileLocation = configFile;
// get the config for this container
- ContainerConfig.Container cc =
ContainerConfig.getContainer("component-container", configFileLocation);
+ ContainerConfig.Container cc = ContainerConfig.getContainer(name,
configFileLocation);
// check for an override loader config
String loaderConfig = null;
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=1355652&r1=1355651&r2=1355652&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 Sat
Jun 30 06:32:00 2012
@@ -40,12 +40,13 @@ public interface Container {
* should initialize internal structures and then return.
*
* @param args Command-line arguments.
+ * @param name Unique name of the container's instance.
* @param configFile Location of the configuration file used to load this
container.
* @throws ContainerException If an error was encountered. Throwing this
exception
* will halt container loading, so it should be thrown only when other
containers
* might depend on this one.
*/
- public void init(String[] args, String configFile) throws
ContainerException;
+ public void init(String[] args, String name, String configFile) throws
ContainerException;
/**
* Start the container process. This method must not block -
implementations
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=1355652&r1=1355651&r2=1355652&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
Sat Jun 30 06:32:00 2012
@@ -208,7 +208,7 @@ public class ContainerLoader implements
// initialize the container object
try {
- containerObj.init(args, configFile);
+ containerObj.init(args, containerCfg.name, configFile);
} catch (ContainerException e) {
throw new StartupException("Cannot init() " + containerCfg.name,
e);
} catch (java.lang.AbstractMethodError e) {
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=1355652&r1=1355651&r2=1355652&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
Sat Jun 30 06:32:00 2012
@@ -28,6 +28,7 @@ public class GroovyShellContainer implem
private static final Logger log =
Logger.getLogger(GroovyShellContainer.class);
+ private String name;
private String configFileLocation = null;
private GroovyService gsh = null;
@@ -35,7 +36,8 @@ public class GroovyShellContainer implem
* @see org.ofbiz.base.container.Container#init(java.lang.String[],
java.lang.String)
*/
@Override
- public void init(String[] args, String configFile) {
+ public void init(String[] args, String name, String configFile) {
+ this.name = name;
configFileLocation = configFile;
}
@@ -63,7 +65,7 @@ public class GroovyShellContainer implem
}
private int getTelnetPort() throws ContainerException {
- ContainerConfig.Container config =
ContainerConfig.getContainer("groovyshell-container", configFileLocation);
+ ContainerConfig.Container config = ContainerConfig.getContainer(name,
configFileLocation);
Property telnetPort = config.getProperty("telnet-port");
try {
return Integer.parseInt(telnetPort.value);
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=1355652&r1=1355651&r2=1355652&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
Sat Jun 30 06:32:00 2012
@@ -32,7 +32,7 @@ public class JustLoadComponentsContainer
/**
* @see org.ofbiz.base.container.Container#init(java.lang.String[],
java.lang.String)
*/
- public void init(String[] args, String configFile) {
+ public void init(String[] args, String name, String configFile) {
try {
ComponentContainer.loadComponents(true);
} catch (AlreadyLoadedException e) {
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=1355652&r1=1355651&r2=1355652&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
Sat Jun 30 06:32:00 2012
@@ -44,10 +44,10 @@ public class NamingServiceContainer impl
protected RMIExtendedSocketFactory rmiSocketFactory;
- public void init(String[] args, String configFile) throws
ContainerException {
+ public void init(String[] args, String name, String configFile) throws
ContainerException {
this.configFileLocation = configFile;
- ContainerConfig.Container cfg =
ContainerConfig.getContainer("naming-container", configFileLocation);
+ ContainerConfig.Container cfg = ContainerConfig.getContainer(name,
configFileLocation);
// get the telnet-port
ContainerConfig.Container.Property port = cfg.getProperty("port");
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=1355652&r1=1355651&r2=1355652&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
Sat Jun 30 06:32:00 2012
@@ -38,8 +38,10 @@ public class BirtContainer implements Co
protected String configFile;
- public void init(String[] args, String configFile)
- throws ContainerException {
+ private String name;
+
+ public void init(String[] args, String name, String configFile) throws
ContainerException {
+ this.name = name;
this.configFile = configFile;
}
@@ -102,6 +104,6 @@ public class BirtContainer implements Co
}
public String getContainerConfigName() {
- return "birt-container";
+ 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=1355652&r1=1355651&r2=1355652&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
Sat Jun 30 06:32:00 2012
@@ -174,9 +174,9 @@ public class CatalinaContainer implement
/**
* @see org.ofbiz.base.container.Container#init(java.lang.String[],
java.lang.String)
*/
- public void init(String[] args, String configFile) throws
ContainerException {
+ public void init(String[] args, String name, String configFile) throws
ContainerException {
// get the container config
- ContainerConfig.Container cc =
ContainerConfig.getContainer("catalina-container", configFile);
+ ContainerConfig.Container cc = ContainerConfig.getContainer(name,
configFile);
if (cc == null) {
throw new ContainerException("No catalina-container configuration
found in container config!");
}
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=1355652&r1=1355651&r2=1355652&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
Sat Jun 30 06:32:00 2012
@@ -77,6 +77,8 @@ public class EntityDataLoadContainer imp
protected boolean createConstraints = false;
protected int txTimeout = -1;
+ private String name;
+
public EntityDataLoadContainer() {
super();
}
@@ -84,7 +86,8 @@ public class EntityDataLoadContainer imp
/**
* @see org.ofbiz.base.container.Container#init(java.lang.String[],
java.lang.String)
*/
- public void init(String[] args, String configFile) throws
ContainerException {
+ public void init(String[] args, String name, String configFile) throws
ContainerException {
+ this.name = name;
this.configFile = configFile;
// disable job scheduler, JMS listener and startup services
ServiceDispatcher.enableJM(false);
@@ -207,7 +210,7 @@ public class EntityDataLoadContainer imp
Debug.logWarning("Please enable multitenant. (e.g.
general.properties --> multitenant=Y)", module);
return true;
}
- ContainerConfig.Container cfg =
ContainerConfig.getContainer("dataload-container", configFile);
+ ContainerConfig.Container cfg = ContainerConfig.getContainer(name,
configFile);
ContainerConfig.Container.Property delegatorNameProp =
cfg.getProperty("delegator-name");
String delegatorName = null;
if (delegatorNameProp == null ||
UtilValidate.isEmpty(delegatorNameProp.value)) {
@@ -238,7 +241,7 @@ public class EntityDataLoadContainer imp
return true;
}
private void loadContainer() throws ContainerException{
- ContainerConfig.Container cfg =
ContainerConfig.getContainer("dataload-container", configFile);
+ ContainerConfig.Container cfg = ContainerConfig.getContainer(name,
configFile);
ContainerConfig.Container.Property delegatorNameProp =
cfg.getProperty("delegator-name");
ContainerConfig.Container.Property entityGroupNameProp =
cfg.getProperty("entity-group-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=1355652&r1=1355651&r2=1355652&view=diff
==============================================================================
---
ofbiz/trunk/framework/geronimo/src/org/ofbiz/geronimo/GeronimoContainer.java
(original)
+++
ofbiz/trunk/framework/geronimo/src/org/ofbiz/geronimo/GeronimoContainer.java
Sat Jun 30 06:32:00 2012
@@ -35,11 +35,13 @@ public class GeronimoContainer implement
public static final String module = GeronimoContainer.class.getName();
protected String configFile = null;
+ private String name;
/**
* @see org.ofbiz.base.container.Container#init(java.lang.String[],
java.lang.String)
*/
- public void init(String[] args, String configFile) throws
ContainerException {
+ public void init(String[] args, String name, String configFile) throws
ContainerException {
+ this.name = name;
this.configFile = configFile;
this.startGeronimo();
}
@@ -50,7 +52,7 @@ public class GeronimoContainer implement
private void startGeronimo() throws ContainerException {
// get the container config
- ContainerConfig.Container cc =
ContainerConfig.getContainer("geronimo-container", configFile);
+ ContainerConfig.Container cc = ContainerConfig.getContainer(name,
configFile);
if (cc == null) {
throw new ContainerException("No geronimo-container configuration
found in container config!");
}
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=1355652&r1=1355651&r2=1355652&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
Sat Jun 30 06:32:00 2012
@@ -63,7 +63,7 @@ public class JettyContainer implements C
/**
* @see org.ofbiz.base.container.Container#init(java.lang.String[],
java.lang.String)
*/
- public void init(String[] args, String configFile) throws
ContainerException {
+ public void init(String[] args, String name, String configFile) throws
ContainerException {
// configure JSSE properties
SSLUtil.loadJsseProperties();
@@ -77,7 +77,7 @@ public class JettyContainer implements C
}
// get the jetty container config
- ContainerConfig.Container jettyContainerConfig =
ContainerConfig.getContainer("jetty-container", configFile);
+ ContainerConfig.Container jettyContainerConfig =
ContainerConfig.getContainer(name, configFile);
// create the servers
for (ContainerConfig.Container.Property serverConfig :
jettyContainerConfig.getPropertiesWithValue("server")) {
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=1355652&r1=1355651&r2=1355652&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
Sat Jun 30 06:32:00 2012
@@ -67,7 +67,7 @@ public class JavaMailContainer implement
protected String configFile = null;
protected Map<Store, Session> stores = null;
-
+ private String name;
/**
* Initialize the container
*
@@ -76,7 +76,8 @@ public class JavaMailContainer implement
* @throws org.ofbiz.base.container.ContainerException
*
*/
- public void init(String[] args, String configFile) throws
ContainerException {
+ public void init(String[] args, String name, String configFile) throws
ContainerException {
+ this.name = name;
this.configFile = configFile;
this.stores = new LinkedHashMap<Store, Session>();
this.pollTimer = new Timer();
@@ -90,7 +91,7 @@ public class JavaMailContainer implement
*
*/
public boolean start() throws ContainerException {
- ContainerConfig.Container cfg =
ContainerConfig.getContainer("javamail-container", configFile);
+ ContainerConfig.Container cfg = ContainerConfig.getContainer(name,
configFile);
String dispatcherName = ContainerConfig.getPropertyValue(cfg,
"dispatcher-name", "JavaMailDispatcher");
String delegatorName = ContainerConfig.getPropertyValue(cfg,
"delegator-name", "default");
this.deleteMail = "true".equals(ContainerConfig.getPropertyValue(cfg,
"delete-mail", "false"));
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=1355652&r1=1355651&r2=1355652&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
Sat Jun 30 06:32:00 2012
@@ -45,19 +45,20 @@ public class RmiServiceContainer impleme
protected RemoteDispatcherImpl remote = null;
protected String configFile = null;
protected String name = null;
-
+ private String containerName;
// Container methods
/**
* @see org.ofbiz.base.container.Container#init(java.lang.String[],
java.lang.String)
*/
- public void init(String[] args, String configFile) {
+ public void init(String[] args, String name, String configFile) {
+ this.containerName = name;
this.configFile = configFile;
}
public boolean start() throws ContainerException {
// get the container config
- ContainerConfig.Container cfg =
ContainerConfig.getContainer("rmi-dispatcher", configFile);
+ ContainerConfig.Container cfg =
ContainerConfig.getContainer(containerName, configFile);
ContainerConfig.Container.Property initialCtxProp =
cfg.getProperty("use-initial-context");
ContainerConfig.Container.Property lookupHostProp =
cfg.getProperty("bound-host");
ContainerConfig.Container.Property lookupPortProp =
cfg.getProperty("bound-port");
Modified:
ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestListContainer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestListContainer.java?rev=1355652&r1=1355651&r2=1355652&view=diff
==============================================================================
---
ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestListContainer.java
(original)
+++
ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestListContainer.java
Sat Jun 30 06:32:00 2012
@@ -59,7 +59,7 @@ public class TestListContainer implement
/**
* @see org.ofbiz.base.container.Container#init(java.lang.String[],
java.lang.String)
*/
- public void init(String[] args, String configFile) {
+ public void init(String[] args, String name, String configFile) {
this.outputLocation = args[0];
for (int i = 1; i < args.length; i++) {
if ("-ant".equals(args[i])) {
Modified:
ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java?rev=1355652&r1=1355651&r2=1355652&view=diff
==============================================================================
---
ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java
(original)
+++
ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java
Sat Jun 30 06:32:00 2012
@@ -59,7 +59,7 @@ public class TestRunContainer implements
/**
* @see org.ofbiz.base.container.Container#init(java.lang.String[],
java.lang.String)
*/
- public void init(String[] args, String configFile) {
+ public void init(String[] args, String name, String configFile) {
this.configFile = configFile;
if (args != null) {
for (int i = 0; i < args.length; i++) {
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=1355652&r1=1355651&r2=1355652&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
Sat Jun 30 06:32:00 2012
@@ -43,20 +43,22 @@ public abstract class XuiContainer imple
protected String startupDir = null;
protected String startupFile = null;
protected String configFile = null;
+ protected String name;
- public void init(String[] args, String configFile) throws
ContainerException {
+ public void init(String[] args, String name, String configFile) throws
ContainerException {
+ this.name = name;
this.configFile = configFile;
}
public boolean start() throws ContainerException {
// make sure the subclass sets the config name
- if (this.getContainerConfigName() == null) {
+ if (name == 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(name,
configFile);
if (cc == null) {
- throw new ContainerException("No " + this.getContainerConfigName()
+ " configuration found in container config!");
+ throw new ContainerException("No " + name + " configuration found
in container config!");
}
// get the delegator
@@ -71,7 +73,7 @@ public abstract class XuiContainer imple
// get the pre-defined session ID
String xuiSessionId = ContainerConfig.getPropertyValue(cc,
"xui-session-id", null);
if (UtilValidate.isEmpty(xuiSessionId)) {
- throw new ContainerException("No xui-session-id value set in " +
this.getContainerConfigName() + "!");
+ throw new ContainerException("No xui-session-id value set in " +
name + "!");
}
String laf = ContainerConfig.getPropertyValue(cc, "look-and-feel",
null);
@@ -113,11 +115,6 @@ public abstract class XuiContainer imple
}
/**
- * @return String the name of the container name property
- */
- public abstract String getContainerConfigName();
-
- /**
* Implementation specific configuration from the container config
* This method is called after the initial XUI configuration, after
* the session creation; before the initial screen is rendered.
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=1355652&r1=1355651&r2=1355652&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
Sat Jun 30 06:32:00 2012
@@ -31,12 +31,14 @@ public class JposDeviceContainer impleme
protected String configFile = null;
- public void init(String[] args, String configFile) throws
ContainerException {
+ private String name;
+
+ public void init(String[] args, String name, String configFile) throws
ContainerException {
this.configFile = configFile;
}
public boolean start() throws ContainerException {
- ContainerConfig.Container cc =
ContainerConfig.getContainer("jpos.device-container", configFile);
+ ContainerConfig.Container cc = ContainerConfig.getContainer(name,
configFile);
if (cc == null) {
throw new ContainerException("No jpos.device-container
configuration found in container config!");
}
Modified:
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/container/PosContainer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/container/PosContainer.java?rev=1355652&r1=1355651&r2=1355652&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/container/PosContainer.java
(original)
+++
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/container/PosContainer.java
Sat Jun 30 06:32:00 2012
@@ -33,11 +33,6 @@ import org.ofbiz.product.store.ProductSt
public class PosContainer extends XuiContainer {
@Override
- public String getContainerConfigName() {
- return "pos-container";
- }
-
- @Override
public void configure(ContainerConfig.Container cc) throws
ContainerException {
XuiSession session = XuiContainer.getSession();
GenericValue productStore = null;
