You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by er...@apache.org on 2012/07/02 13:03:02 UTC
svn commit: r1356181 [4/8] - in /ofbiz/branches/20120329_portletWidget: ./
applications/accounting/ applications/accounting/data/
applications/accounting/script/org/ofbiz/accounting/payment/
applications/accounting/src/org/ofbiz/accounting/payment/ app...
Modified: ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/GroovyShellContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/GroovyShellContainer.java?rev=1356181&r1=1356180&r2=1356181&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/GroovyShellContainer.java (original)
+++ ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/GroovyShellContainer.java Mon Jul 2 11:02:34 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;
}
@@ -62,8 +64,12 @@ public class GroovyShellContainer implem
gsh = null;
}
+ public String getName() {
+ return name;
+ }
+
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/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java?rev=1356181&r1=1356180&r2=1356181&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java (original)
+++ ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java Mon Jul 2 11:02:34 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 configFile) {
+ 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/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/NamingServiceContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/NamingServiceContainer.java?rev=1356181&r1=1356180&r2=1356181&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/NamingServiceContainer.java (original)
+++ ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/NamingServiceContainer.java Mon Jul 2 11:02:34 2012
@@ -44,10 +44,13 @@ public class NamingServiceContainer impl
protected RMIExtendedSocketFactory rmiSocketFactory;
- 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.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");
@@ -93,4 +96,8 @@ public class NamingServiceContainer impl
}
}
}
+
+ public String getName() {
+ return name;
+ }
}
Modified: ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/util/ScriptUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/util/ScriptUtil.java?rev=1356181&r1=1356180&r2=1356181&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/util/ScriptUtil.java (original)
+++ ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/util/ScriptUtil.java Mon Jul 2 11:02:34 2012
@@ -184,7 +184,7 @@ public final class ScriptUtil {
Debug.logVerbose("Script engine " + engine.getClass().getName() + " does not implement Compilable", module);
}
}
- if (script != null) {
+ if (compiledScript != null) {
parsedScripts.putIfAbsent(cacheKey, compiledScript);
}
}
Modified: ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/util/UtilHttp.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/util/UtilHttp.java?rev=1356181&r1=1356180&r2=1356181&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/util/UtilHttp.java (original)
+++ ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/util/UtilHttp.java Mon Jul 2 11:02:34 2012
@@ -113,7 +113,7 @@ public class UtilHttp {
*/
public static Map<String, Object> getParameterMap(HttpServletRequest request, Set<? extends String> nameSet, Boolean onlyIncludeOrSkip) {
boolean onlyIncludeOrSkipPrim = onlyIncludeOrSkip == null ? true : onlyIncludeOrSkip.booleanValue();
- Map<String, Object> paramMap = FastMap.newInstance();
+ Map<String, Object> paramMap = new HashMap<String, Object>();
// add all the actual HTTP request parameters
Enumeration<String> e = UtilGenerics.cast(request.getParameterNames());
Modified: ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java?rev=1356181&r1=1356180&r2=1356181&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java (original)
+++ ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java Mon Jul 2 11:02:34 2012
@@ -497,9 +497,18 @@ public class UtilCache<K, V> implements
private long findSizeInBytes(Object o) {
try {
- return UtilObject.getByteCount(o);
+ if (o == null) {
+ if (Debug.infoOn()) Debug.logInfo("Found null object in cache: " + getName(), module);
+ return 0;
+ }
+ if (o instanceof Serializable) {
+ return UtilObject.getByteCount(o);
+ } else {
+ if (Debug.infoOn()) Debug.logInfo("Unable to compute memory size for non serializable object; returning 0 byte size for object of " + o.getClass(), module);
+ return 0;
+ }
} catch (Exception e) {
- e.printStackTrace();
+ Debug.logWarning(e, "Unable to compute memory size for object of " + o.getClass(), module);
return 0;
}
}
Modified: ofbiz/branches/20120329_portletWidget/framework/bi/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/bi/ofbiz-component.xml?rev=1356181&r1=1356180&r2=1356181&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/bi/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/bi/ofbiz-component.xml Mon Jul 2 11:02:34 2012
@@ -25,7 +25,8 @@ under the License.
<classpath type="dir" location="config"/>
<classpath type="jar" location="build/lib/*"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/BiTypeData.xml"/>
- <entity-resource type="data" reader-name="security" loader="main" location="data/BiSecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/BiSecurityPermissionSeedData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/BiSecurityGroupDemoData.xml"/>
<service-resource type="model" loader="main" location="servicedef/services.xml"/>
Modified: ofbiz/branches/20120329_portletWidget/framework/bi/webapp/bi/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/bi/webapp/bi/WEB-INF/controller.xml?rev=1356181&r1=1356180&r2=1356181&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/bi/webapp/bi/WEB-INF/controller.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/bi/webapp/bi/WEB-INF/controller.xml Mon Jul 2 11:02:34 2012
@@ -30,12 +30,6 @@
<response name="success" type="view" value="main"/>
</request-map>
- <request-map uri="changeDelegator">
- <event type="java" path="org.ofbiz.webapp.event.CoreEvents" invoke="changeDelegator"/>
- <response name="success" type="view" value="main"/>
- <response name="error" type="view" value="error"/>
- </request-map>
-
<request-map uri="main">
<security https="true" auth="true"/>
<response name="success" type="view" value="main"/>
Modified: ofbiz/branches/20120329_portletWidget/framework/birt/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/birt/ofbiz-component.xml?rev=1356181&r1=1356180&r2=1356181&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/birt/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/birt/ofbiz-component.xml Mon Jul 2 11:02:34 2012
@@ -26,4 +26,6 @@ under the License.
<classpath type="jar" location="build/lib/*"/>
<classpath type="dir" location="config"/>
<service-resource type="model" loader="main" location="servicedef/services.xml"/>
+
+ <container name="birt-container" loaders="main" class="org.ofbiz.birt.container.BirtContainer"/>
</ofbiz-component>
Modified: ofbiz/branches/20120329_portletWidget/framework/birt/src/org/ofbiz/birt/container/BirtContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/birt/src/org/ofbiz/birt/container/BirtContainer.java?rev=1356181&r1=1356180&r2=1356181&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/birt/src/org/ofbiz/birt/container/BirtContainer.java (original)
+++ ofbiz/branches/20120329_portletWidget/framework/birt/src/org/ofbiz/birt/container/BirtContainer.java Mon Jul 2 11:02:34 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;
}
@@ -50,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
@@ -101,7 +103,7 @@ public class BirtContainer implements Co
public void stop() throws ContainerException {
}
- public String getContainerConfigName() {
- return "birt-container";
+ public String getName() {
+ return name;
}
}
Modified: ofbiz/branches/20120329_portletWidget/framework/catalina/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/catalina/ofbiz-component.xml?rev=1356181&r1=1356180&r2=1356181&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/catalina/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/catalina/ofbiz-component.xml Mon Jul 2 11:02:34 2012
@@ -27,6 +27,320 @@ under the License.
<classpath type="dir" location="config"/>
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
+ <container name="catalina-container" loaders="main" class="org.ofbiz.catalina.container.CatalinaContainer">
+ <!-- static configuration for tomcat -->
+ <property name="delegator-name" value="default"/>
+ <property name="use-naming" value="false"/>
+ <property name="debug" value="0"/>
+ <property name="catalina-runtime-home" value="runtime/catalina"/>
+ <property name="apps-context-reloadable" value="false"/>
+ <property name="apps-cross-context" value="false"/>
+ <property name="apps-distributable" value="false"/><!-- you must also set all the webapps you want distributable, by adding <distributable/> in their web.xml file -->
+ <!-- one or more tomcat engines (servers); map to this + host -->
+ <property name="default-server" value="engine">
+ <property name="default-host" value="0.0.0.0"/>
+ <property name="jvm-route" value="jvm1"/>
+ <property name="access-log-pattern">
+ <property-value>%h %l %u %t "%r" %s %b "%{Referer}i" "%{User-Agent}i"</property-value>
+ </property>
+ <property name="access-log-resolve" value="true"/>
+ <property name="access-log-rotate" value="true"/>
+ <property name="access-log-prefix" value="access_log."/>
+ <property name="access-log-dir" value="runtime/logs"/>
+ <!-- uncomment for cluster support
+ <property name="default-server-cluster" value="cluster">
+ <property name="rep-valve-filter">
+ <property-value>.*\.gif;.*\.js;.*\.jpg;.*\.htm;.*\.html;.*\.txt;.*\.png;.*\.css;.*\.ico;.*\.htc;</property-value>
+ </property>
+ <property name="manager-class" value="org.apache.catalina.ha.session.DeltaManager"/>
+ <property name="debug" value="5"/>
+ <property name="replication-mode" value="org.apache.catalina.tribes.transport.bio.PooledMultiSender"/>
+ <property name="tcp-listen-host" value="auto"/>
+ <property name="tcp-listen-port" value="4001"/>
+ <property name="tcp-sector-timeout" value="100"/>
+ <property name="tcp-thread-count" value="6"/>
+ <property name="mcast-bind-addr" value="192.168.2.1"/>
+ <property name="mcast-addr" value="228.0.0.4"/>
+ <property name="mcast-port" value="45564"/>
+ <property name="mcast-freq" value="500"/>
+ <property name="mcast-drop-time" value="3000"/>
+ </property>
+ -->
+ <!-- <property name="ssl-accelerator-port" value="8443"/> -->
+ <property name="enable-cross-subdomain-sessions" value="false"/>
+ </property>
+ <!-- all connectors support type, host, port, enable-lookups -->
+ <property name="ajp-connector" value="connector">
+ <!-- see http://jakarta.apache.org/tomcat/tomcat-5.5-doc/config/ajp.html for reference -->
+ <property name="allowTrace" value="false"/>
+ <property name="emptySessionPath" value="false"/>
+ <property name="enableLookups" value="false"/>
+ <property name="maxPostSize" value="2097152"/>
+ <property name="protocol" value="AJP/1.3"/>
+ <property name="proxyName" value=""/>
+ <property name="proxyPort" value=""/>
+ <property name="redirectPort" value=""/>
+ <property name="scheme" value="http"/>
+ <property name="secure" value="false"/>
+ <property name="URIEncoding" value="UTF-8"/>
+ <property name="useBodyEncodingForURI" value="false"/>
+ <property name="xpoweredBy" value="true"/>
+ <!-- AJP/13 connector attributes -->
+ <property name="address" value="0.0.0.0"/>
+ <property name="backlog" value="10"/>
+ <property name="maxSpareThreads" value="50"/>
+ <property name="maxThreads" value="200"/>
+ <property name="minSpareThreads" value="4"/>
+ <property name="port" value="8009"/>
+ <property name="tcpNoDelay" value="true"/>
+ <property name="soTimeout" value="60000"/>
+ <property name="tomcatAuthentication" value="true"/>
+ </property>
+ <property name="http-connector" value="connector">
+ <!-- see http://jakarta.apache.org/tomcat/tomcat-5.5-doc/config/http.html for reference -->
+ <property name="allowTrace" value="false"/>
+ <property name="emptySessionPath" value="false"/>
+ <property name="enableLookups" value="false"/>
+ <property name="maxPostSize" value="2097152"/>
+ <property name="protocol" value="HTTP/1.1"/>
+ <property name="proxyName" value=""/>
+ <property name="proxyPort" value=""/>
+ <property name="redirectPort" value=""/>
+ <property name="scheme" value="http"/>
+ <property name="secure" value="false"/>
+ <property name="URIEncoding" value="UTF-8"/>
+ <property name="useBodyEncodingForURI" value="false"/>
+ <property name="xpoweredBy" value="true"/>
+ <!-- HTTP connector attributes -->
+ <property name="acceptCount" value="10"/>
+ <property name="address" value="0.0.0.0"/>
+ <property name="bufferSize" value="2048"/>
+ <property name="compression" value="on"/>
+ <property name="compressableMimeType" value="text/html,text/xml,text/plain,text/javascript,text/css"/>
+ <property name="noCompressionUserAgents" value=""/>
+ <property name="connectionLinger" value="-1"/>
+ <property name="connectionTimeout" value="60000"/>
+ <property name="disableUploadTimeout" value="false"/>
+ <property name="maxHttpHeaderSize" value="4096"/>
+ <property name="maxKeepAliveRequests" value="100"/>
+ <property name="maxSpareThreads" value="50"/>
+ <property name="maxThreads" value="100"/>
+ <property name="minSpareThreads" value="4"/>
+ <property name="port" value="8080"/>
+ <property name="restrictedUserAgents" value=""/>
+ <property name="server" value=""/>
+ <property name="socketBuffer" value="9000"/>
+ <property name="strategy" value="lf"/>
+ <property name="tcpNoDelay" value="true"/>
+ <property name="threadPriority" value="java.lang.Thread#NORM_PRIORITY"/>
+ </property>
+ <property name="https-connector" value="connector">
+ <!-- see http://jakarta.apache.org/tomcat/tomcat-5.5-doc/config/http.html for reference -->
+ <property name="allowTrace" value="false"/>
+ <property name="emptySessionPath" value="false"/>
+ <property name="enableLookups" value="false"/>
+ <property name="maxPostSize" value="2097152"/>
+ <property name="protocol" value="HTTP/1.1"/>
+ <property name="proxyName" value=""/>
+ <property name="proxyPort" value=""/>
+ <property name="redirectPort" value=""/>
+ <property name="scheme" value="https"/>
+ <property name="secure" value="true"/>
+ <property name="URIEncoding" value="UTF-8"/>
+ <property name="useBodyEncodingForURI" value="false"/>
+ <property name="xpoweredBy" value="true"/>
+ <!-- HTTP connector attributes -->
+ <property name="acceptCount" value="10"/>
+ <property name="address" value="0.0.0.0"/>
+ <property name="bufferSize" value="2048"/>
+ <property name="compression" value="on"/>
+ <property name="compressableMimeType" value="text/html,text/xml,text/plain,text/javascript,text/css"/>
+ <property name="noCompressionUserAgents" value=""/>
+ <property name="connectionLinger" value="-1"/>
+ <property name="connectionTimeout" value="60000"/>
+ <property name="disableUploadTimeout" value="false"/>
+ <property name="maxHttpHeaderSize" value="4096"/>
+ <property name="maxKeepAliveRequests" value="100"/>
+ <property name="maxSpareThreads" value="50"/>
+ <property name="maxThreads" value="100"/>
+ <property name="minSpareThreads" value="4"/>
+ <property name="port" value="8443"/>
+ <property name="restrictedUserAgents" value=""/>
+ <property name="server" value=""/>
+ <property name="socketBuffer" value="9000"/>
+ <property name="strategy" value="lf"/>
+ <property name="tcpNoDelay" value="true"/>
+ <property name="threadPriority" value="java.lang.Thread#NORM_PRIORITY"/>
+ <!-- SSL connector attributes -->
+ <property name="sSLImplementation" value="org.ofbiz.catalina.container.SSLImpl"/>
+ <property name="algorithm" value="SunX509"/>
+ <!-- the clientAuth to "want" in order to receive certs from the client;
+ note that this isn't set this way by default because with certain browsers
+ (like Safari) it breaks access via HTTPS, so until that problem is fixed
+ the default will be false -->
+ <property name="clientAuth" value="false"/>
+ <property name="keystoreFile" value="framework/base/config/ofbizssl.jks"/>
+ <property name="keystorePass" value="changeit"/>
+ <property name="keystoreType" value="JKS"/>
+ <property name="sslProtocol" value="TLS"/>
+ <property name="ciphers" value=""/>
+ </property>
+ </container>
+ <container name="catalina-container-test" loaders="test" class="org.ofbiz.catalina.container.CatalinaContainer">
+ <!-- static configuration for tomcat -->
+ <property name="delegator-name" value="default"/>
+ <property name="use-naming" value="false"/>
+ <property name="debug" value="0"/>
+ <property name="catalina-runtime-home" value="runtime/catalina"/>
+ <property name="apps-context-reloadable" value="false"/>
+ <property name="apps-cross-context" value="false"/>
+ <property name="apps-distributable" value="false"/><!-- you must also set all the webapps you want distributable, by adding <distributable/> in their web.xml file -->
+ <!-- one or more tomcat engines (servers); map to this + host -->
+ <property name="default-server" value="engine">
+ <property name="default-host" value="0.0.0.0"/>
+ <property name="jvm-route" value="jvm1"/>
+ <property name="access-log-pattern">
+ <property-value>%h %l %u %t "%r" %s %b "%{Referer}i" "%{User-Agent}i"</property-value>
+ </property>
+ <property name="access-log-resolve" value="true"/>
+ <property name="access-log-rotate" value="true"/>
+ <property name="access-log-prefix" value="access_log."/>
+ <property name="access-log-dir" value="runtime/logs"/>
+ <property name="enable-request-dump" value="false"/>
+ <!-- uncomment for cluster support
+ <property name="default-server-cluster" value="cluster">
+ <property name="rep-valve-filter">
+ <property-value>.*\.gif;.*\.js;.*\.jpg;.*\.htm;.*\.html;.*\.txt;.*\.png;.*\.css;.*\.ico;.*\.htc;</property-value>
+ </property>
+ <property name="manager-class" value="org.apache.catalina.cluster.session.DeltaManager"/>
+ <property name="debug" value="5"/>
+ <property name="replication-mode" value="org.apache.catalina.tribes.transport.bio.PooledMultiSender"/>
+ <property name="tcp-listen-host" value="auto"/>
+ <property name="tcp-listen-port" value="4001"/>
+ <property name="tcp-sector-timeout" value="100"/>
+ <property name="tcp-thread-count" value="6"/>
+ <property name="mcast-bind-addr" value="192.168.2.1"/>
+ <property name="mcast-addr" value="224.0.0.1"/>
+ <property name="mcast-port" value="45564"/>
+ <property name="mcast-freq" value="500"/>
+ <property name="mcast-drop-time" value="3000"/>
+ </property>
+ -->
+ <!-- <property name="ssl-accelerator-port" value="8443"/> -->
+ </property>
+ <!-- all connectors support type, host, port, enable-lookups -->
+ <property name="ajp-connector" value="connector">
+ <!-- see http://jakarta.apache.org/tomcat/tomcat-5.5-doc/config/ajp.html for reference -->
+ <property name="allowTrace" value="false"/>
+ <property name="emptySessionPath" value="false"/>
+ <property name="enableLookups" value="false"/>
+ <property name="maxPostSize" value="2097152"/>
+ <property name="protocol" value="AJP/1.3"/>
+ <property name="proxyName" value=""/>
+ <property name="proxyPort" value=""/>
+ <property name="redirectPort" value=""/>
+ <property name="scheme" value="http"/>
+ <property name="secure" value="false"/>
+ <property name="URIEncoding" value="UTF-8"/>
+ <property name="useBodyEncodingForURI" value="false"/>
+ <property name="xpoweredBy" value="true"/>
+ <!-- AJP/13 connector attributes -->
+ <property name="address" value="0.0.0.0"/>
+ <property name="backlog" value="10"/>
+ <property name="maxSpareThreads" value="50"/>
+ <property name="maxThreads" value="200"/>
+ <property name="minSpareThreads" value="4"/>
+ <property name="port" value="8010"/>
+ <property name="tcpNoDelay" value="true"/>
+ <property name="soTimeout" value="60000"/>
+ <property name="tomcatAuthentication" value="true"/>
+ </property>
+ <property name="http-connector" value="connector">
+ <!-- see http://jakarta.apache.org/tomcat/tomcat-5.5-doc/config/http.html for reference -->
+ <property name="allowTrace" value="false"/>
+ <property name="emptySessionPath" value="false"/>
+ <property name="enableLookups" value="false"/>
+ <property name="maxPostSize" value="2097152"/>
+ <property name="protocol" value="HTTP/1.1"/>
+ <property name="proxyName" value=""/>
+ <property name="proxyPort" value=""/>
+ <property name="redirectPort" value=""/>
+ <property name="scheme" value="http"/>
+ <property name="secure" value="false"/>
+ <property name="URIEncoding" value="UTF-8"/>
+ <property name="useBodyEncodingForURI" value="false"/>
+ <property name="xpoweredBy" value="true"/>
+ <!-- HTTP connector attributes -->
+ <property name="acceptCount" value="10"/>
+ <property name="address" value="0.0.0.0"/>
+ <property name="bufferSize" value="2048"/>
+ <property name="compressableMimeType" value="text/html,text/xml,text/plain"/>
+ <property name="compression" value="on"/>
+ <property name="connectionLinger" value="-1"/>
+ <property name="connectionTimeout" value="60000"/>
+ <property name="disableUploadTimeout" value="false"/>
+ <property name="maxHttpHeaderSize" value="4096"/>
+ <property name="maxKeepAliveRequests" value="100"/>
+ <property name="maxSpareThreads" value="50"/>
+ <property name="maxThreads" value="100"/>
+ <property name="minSpareThreads" value="4"/>
+ <property name="noCompressionUserAgents" value=""/>
+ <property name="port" value="8081"/>
+ <property name="restrictedUserAgents" value=""/>
+ <property name="server" value=""/>
+ <property name="socketBuffer" value="9000"/>
+ <property name="strategy" value="lf"/>
+ <property name="tcpNoDelay" value="true"/>
+ <property name="threadPriority" value="java.lang.Thread#NORM_PRIORITY"/>
+ </property>
+ <property name="https-connector" value="connector">
+ <!-- see http://jakarta.apache.org/tomcat/tomcat-5.5-doc/config/http.html for reference -->
+ <property name="allowTrace" value="false"/>
+ <property name="emptySessionPath" value="false"/>
+ <property name="enableLookups" value="false"/>
+ <property name="maxPostSize" value="2097152"/>
+ <property name="protocol" value="HTTP/1.1"/>
+ <property name="proxyName" value=""/>
+ <property name="proxyPort" value=""/>
+ <property name="redirectPort" value=""/>
+ <property name="scheme" value="https"/>
+ <property name="secure" value="true"/>
+ <property name="URIEncoding" value="UTF-8"/>
+ <property name="useBodyEncodingForURI" value="false"/>
+ <property name="xpoweredBy" value="true"/>
+ <!-- HTTP connector attributes -->
+ <property name="acceptCount" value="10"/>
+ <property name="address" value="0.0.0.0"/>
+ <property name="bufferSize" value="2048"/>
+ <property name="compressableMimeType" value="text/html,text/xml,text/plain"/>
+ <property name="compression" value="on"/>
+ <property name="connectionLinger" value="-1"/>
+ <property name="connectionTimeout" value="60000"/>
+ <property name="disableUploadTimeout" value="false"/>
+ <property name="maxHttpHeaderSize" value="4096"/>
+ <property name="maxKeepAliveRequests" value="100"/>
+ <property name="maxSpareThreads" value="50"/>
+ <property name="maxThreads" value="100"/>
+ <property name="minSpareThreads" value="4"/>
+ <property name="noCompressionUserAgents" value=""/>
+ <property name="port" value="8444"/>
+ <property name="restrictedUserAgents" value=""/>
+ <property name="server" value=""/>
+ <property name="socketBuffer" value="9000"/>
+ <property name="strategy" value="lf"/>
+ <property name="tcpNoDelay" value="true"/>
+ <property name="threadPriority" value="java.lang.Thread#NORM_PRIORITY"/>
+ <!-- SSL connector attributes -->
+ <property name="sSLImplementation" value="org.ofbiz.catalina.container.SSLImpl"/>
+ <property name="algorithm" value="SunX509"/>
+ <property name="clientAuth" value="want"/>
+ <property name="keystoreFile" value="framework/base/config/ofbizssl.jks"/>
+ <property name="keystorePass" value="changeit"/>
+ <property name="keystoreType" value="JKS"/>
+ <property name="sslProtocol" value="TLS"/>
+ <property name="ciphers" value=""/>
+ </property>
+ </container>
<!--
<webapp name="catalina-root"
title="ROOT"
Modified: ofbiz/branches/20120329_portletWidget/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java?rev=1356181&r1=1356180&r2=1356181&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java (original)
+++ ofbiz/branches/20120329_portletWidget/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java Mon Jul 2 11:02:34 2012
@@ -171,12 +171,15 @@ 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 configFile) throws ContainerException {
+ public void init(String[] args, String name, String configFile) throws ContainerException {
+ this.name = name;
// 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!");
}
@@ -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/branches/20120329_portletWidget/framework/common/config/SecurityUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/config/SecurityUiLabels.xml?rev=1356181&r1=1356180&r2=1356181&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/common/config/SecurityUiLabels.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/common/config/SecurityUiLabels.xml Mon Jul 2 11:02:34 2012
@@ -52,6 +52,7 @@
<value xml:lang="zh_TW">(å¾å表)ææ¬éæ·»å å°å®å
¨çµ</value>
</property>
<property key="AddProtectedViewToSecurityGroup">
+ <value xml:lang="de">Geschützte Ansicht zu Sicherheitsgruppe hinzufügen</value>
<value xml:lang="en">Add a Protected View to SecurityGroup</value>
<value xml:lang="es">Añadir una vista protegida a grupo de seguridad</value>
<value xml:lang="fr">Ajouter une vue protégée à ce groupe de sécurité</value>
@@ -91,6 +92,7 @@
<value xml:lang="zh_TW">å
件</value>
</property>
<property key="CertDetails">
+ <value xml:lang="de">Zertifikats-Details</value>
<value xml:lang="en">Cert Details</value>
<value xml:lang="es">Detalles del certificado</value>
<value xml:lang="pt_BR">Detalhes do certificado</value>
@@ -229,6 +231,7 @@
<value xml:lang="zh_TW">建ç«ä½¿ç¨è
ç»å
¥</value>
</property>
<property key="FindUserLogin">
+ <value xml:lang="de">Benutzer Login suchen</value>
<value xml:lang="en">Find User Login</value>
<value xml:lang="es">Buscar nombre de usuario</value>
<value xml:lang="it">Ricerca utenti</value>
@@ -265,6 +268,7 @@
<value xml:lang="zh_TW">ç®åå¯ç¢¼é©è¨¼</value>
</property>
<property key="FormFieldTitle_disabledDateTime">
+ <value xml:lang="de">Deaktiviert am</value>
<value xml:lang="en">Disabled Date Time</value>
<value xml:lang="es">Deshabilitado el</value>
<value xml:lang="it">Disabilitato dal</value>
@@ -288,16 +292,19 @@
<value xml:lang="zh_TW">ææ</value>
</property>
<property key="FormFieldTitle_externalAuthId">
+ <value xml:lang="de">Externe Authentifizierungs-ID</value>
<value xml:lang="en">External Auth Id</value>
<value xml:lang="es">Código de autentificación externa</value>
<value xml:lang="it">Codice autenticazione esterna</value>
</property>
<property key="FormFieldTitle_hasLoggedOut">
+ <value xml:lang="de">Hat sich abgemeldet</value>
<value xml:lang="en">Has Logged Out</value>
<value xml:lang="es">Se ha desconectado</value>
<value xml:lang="it">Uscito dal sistema</value>
</property>
<property key="FormFieldTitle_maxHits">
+ <value xml:lang="de">Maximale Anzahl der Besuche</value>
<value xml:lang="en">Maximum number of visits</value>
<value xml:lang="es">Número máximo de visitas</value>
<value xml:lang="fr">Nombre maximum de visites</value>
@@ -309,6 +316,7 @@
<value xml:lang="zh_TW">æ大訪åæ¸é</value>
</property>
<property key="FormFieldTitle_maxHitsDuration">
+ <value xml:lang="de">Zeitspanne die für einen Besuch angenommen werden (in Sekunden)</value>
<value xml:lang="en">Duration during which the visits are considered (in seconds)</value>
<value xml:lang="es">PerÃodo durante el que las visitas son consideradas (en segundos)</value>
<value xml:lang="fr">Durée pendant laquelle les visites sont considérées (en secondes)</value>
@@ -348,11 +356,13 @@
<value xml:lang="zh_TW">æ°å¯ç¢¼é©è¨¼</value>
</property>
<property key="FormFieldTitle_passwordHint">
+ <value xml:lang="de">Passwort Hinweis</value>
<value xml:lang="en">Password Hint</value>
<value xml:lang="es">Pista para la clave</value>
<value xml:lang="it">Suggerimento password</value>
</property>
<property key="FormFieldTitle_requirePasswordChange">
+ <value xml:lang="de">Passwortänderung benötigt</value>
<value xml:lang="en">Require Password Change</value>
<value xml:lang="es">Debe cambiar la clave</value>
<value xml:lang="fr">Changement mot de passe obligatoire</value>
@@ -363,11 +373,13 @@
<value xml:lang="zh_TW">å¿
é ä¿®æ¹å¯ç¢¼</value>
</property>
<property key="FormFieldTitle_successiveFailedLogins">
+ <value xml:lang="de">Fehlgeschlagene, aufeinanderfolgende Anmeldeversuche</value>
<value xml:lang="en">Successive Failed Logins</value>
<value xml:lang="es">Intentos de acceso fallidos</value>
<value xml:lang="it">Accessi falliti consecutivi</value>
</property>
<property key="FormFieldTitle_tarpitDuration">
+ <value xml:lang="de">Zeitspanne für die die Ansicht nicht angezeigt wird (in Sekunden)</value>
<value xml:lang="en">Duration during which the view will not be accessible (in seconds)</value>
<value xml:lang="es">PerÃodo durante el cual la vista no será accesible (en segundos)</value>
<value xml:lang="fr">Durée pendant laquelle la vue ne sera plus accessible (en secondes)</value>
@@ -405,6 +417,7 @@
<value xml:lang="zh_TW">使ç¨è
ç»å
¥ID</value>
</property>
<property key="FormFieldTitle_viewNameId">
+ <value xml:lang="de">Ansicht Name</value>
<value xml:lang="en">View Name</value>
<value xml:lang="es">Nombre de la vista</value>
<value xml:lang="fr">Nom de la vue</value>
@@ -415,6 +428,7 @@
<value xml:lang="zh_TW">ç覽å稱</value>
</property>
<property key="LookupUserLogin">
+ <value xml:lang="de">Benutzer Anmeldung suchen</value>
<value xml:lang="en">Lookup User Login</value>
<value xml:lang="es">Buscar nombre de usuario</value>
<value xml:lang="pt_BR">Pesquisar Nome de Usuário</value>
@@ -571,6 +585,7 @@
<value xml:lang="zh_TW">æ¬é</value>
</property>
<property key="ProtectedViews">
+ <value xml:lang="de">Geschützte Ansichten</value>
<value xml:lang="en">Protected Views</value>
<value xml:lang="es">Vistas protegidas</value>
<value xml:lang="fr">Vues protégées</value>
@@ -629,6 +644,7 @@
<value xml:lang="zh_TW">SecurityViewPermissionError ä½ æ²ææ¬éç覽æ¬é é¢ã (éè¦"SECURITY_VIEW" æ "SECURITY_ADMIN")</value>
</property>
<property key="UserLogin">
+ <value xml:lang="de">Benutzeranmeldung</value>
<value xml:lang="en">User Login</value>
<value xml:lang="es">Nombre de usuario</value>
<value xml:lang="it">Utente</value>
Modified: ofbiz/branches/20120329_portletWidget/framework/common/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/ofbiz-component.xml?rev=1356181&r1=1356180&r2=1356181&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/common/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/common/ofbiz-component.xml Mon Jul 2 11:02:34 2012
@@ -27,7 +27,8 @@ under the License.
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_olap.xml"/>
<entity-resource type="group" reader-name="main" loader="main" location="entitydef/entitygroup_olap.xml"/>
- <entity-resource type="data" reader-name="security" loader="main" location="data/CommonSecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonSecurityPermissionSeedData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/CommonSecurityGroupDemoData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/CommonSystemPropertyData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/CommonTypeData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/CountryCodeData.xml"/>
Modified: ofbiz/branches/20120329_portletWidget/framework/common/webcommon/WEB-INF/actions/includes/GetLocaleList.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/webcommon/WEB-INF/actions/includes/GetLocaleList.groovy?rev=1356181&r1=1356180&r2=1356181&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/common/webcommon/WEB-INF/actions/includes/GetLocaleList.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/framework/common/webcommon/WEB-INF/actions/includes/GetLocaleList.groovy Mon Jul 2 11:02:34 2012
@@ -25,12 +25,26 @@ import org.ofbiz.base.util.UtilMisc;
locales = [] as LinkedList;
availableLocales = UtilMisc.availableLocales()
+// Debug.logInfo(parameters.localeString + "==" + parameters.localeName);
+
if (availableLocales) {
availableLocales.each { availableLocale ->
locale = [:];
locale.localeName = availableLocale.getDisplayName(availableLocale);
locale.localeString = availableLocale.toString();
- locales.add(locale);
+ if (UtilValidate.isNotEmpty(parameters.localeString)) {
+ if (locale.localeString.toUpperCase().contains(parameters.localeString.toUpperCase())) {
+ locales.add(locale);
+ }
+ }
+ if (UtilValidate.isNotEmpty(parameters.localeName)) {
+ if (locale.localeName.toUpperCase().contains(parameters.localeName.toUpperCase())) {
+ locales.add(locale);
+ }
+ }
+ if (UtilValidate.isEmpty(parameters.localeString) && UtilValidate.isEmpty(parameters.localeName)) {
+ locales.add(locale);
+ }
}
}
Propchange: ofbiz/branches/20120329_portletWidget/framework/common/widget/HelpScreens.xml
------------------------------------------------------------------------------
Merged /ofbiz/trunk/framework/common/widget/HelpScreens.xml:r1351867-1355999
Modified: ofbiz/branches/20120329_portletWidget/framework/common/widget/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/widget/LookupForms.xml?rev=1356181&r1=1356180&r2=1356181&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/common/widget/LookupForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/common/widget/LookupForms.xml Mon Jul 2 11:02:34 2012
@@ -116,9 +116,8 @@ under the License.
</form>
<form name="LookupLocale" type="single" target="LookupLocale">
- <field name="localeString"><text-find/></field>
- <field name="localeName" title="${uiLabelMap.CommonLanguageTitle}"><text-find/></field>
- <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
+ <field name="localeString"><text-find hide-options="true"/></field>
+ <field name="localeName" title="${uiLabelMap.CommonLanguageTitle}"><text-find hide-options="true"/></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field>
</form>
Modified: ofbiz/branches/20120329_portletWidget/framework/entity/src/org/ofbiz/entity/GenericDelegator.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/entity/src/org/ofbiz/entity/GenericDelegator.java?rev=1356181&r1=1356180&r2=1356181&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/entity/src/org/ofbiz/entity/GenericDelegator.java (original)
+++ ofbiz/branches/20120329_portletWidget/framework/entity/src/org/ofbiz/entity/GenericDelegator.java Mon Jul 2 11:02:34 2012
@@ -76,7 +76,6 @@ import org.ofbiz.entity.util.EntityCrypt
import org.ofbiz.entity.util.EntityFindOptions;
import org.ofbiz.entity.util.EntityListIterator;
import org.ofbiz.entity.util.SequenceUtil;
-//import org.ofbiz.service.ServiceDispatcher;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -105,7 +104,6 @@ public class GenericDelegator implements
protected Cache cache = null;
protected DistributedCacheClear distributedCacheClear = null;
- protected boolean enableJMS = true;
protected EntityEcaHandler<?> entityEcaHandler = null;
protected SequenceUtil sequencer = null;
protected EntityCrypto crypto = null;
@@ -2922,9 +2920,6 @@ public class GenericDelegator implements
}
}
- /* (non-Javadoc)
- * @see org.ofbiz.entity.Delegator#getEnableJMS()
- */
public boolean useDistributedCacheClear() {
return this.getDelegatorInfo().useDistributedCacheClear;
}
Modified: ofbiz/branches/20120329_portletWidget/framework/entityext/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/entityext/ofbiz-component.xml?rev=1356181&r1=1356180&r2=1356181&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/entityext/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/entityext/ofbiz-component.xml Mon Jul 2 11:02:34 2012
@@ -29,8 +29,15 @@ under the License.
<entity-resource type="data" reader-name="seed" loader="main" location="data/EntityExtTypeData.xml"/>
<entity-resource type="data" reader-name="seed-initial" loader="main" location="data/EntityScheduledServices.xml"/>
- <entity-resource type="data" reader-name="security" loader="main" location="data/EntityExtSecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/EntityExtSecurityPermissionSeedData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/EntityExtSecurityGroupDemoData.xml"/>
<service-resource type="model" loader="main" location="servicedef/services.xml"/>
<service-resource type="group" loader="main" location="servicedef/groups.xml"/>
+
+ <!-- load the data load container, runs the entity data load stuff -->
+ <container name="dataload-container" loaders="install" class="org.ofbiz.entityext.data.EntityDataLoadContainer">
+ <property name="delegator-name" value="default"/>
+ <property name="entity-group-name" value="org.ofbiz"/>
+ </container>
</ofbiz-component>
Modified: ofbiz/branches/20120329_portletWidget/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java?rev=1356181&r1=1356180&r2=1356181&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java (original)
+++ ofbiz/branches/20120329_portletWidget/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java Mon Jul 2 11:02:34 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");
@@ -570,4 +573,8 @@ public class EntityDataLoadContainer imp
*/
public void stop() throws ContainerException {
}
+
+ public String getName() {
+ return name;
+ }
}
Modified: ofbiz/branches/20120329_portletWidget/framework/geronimo/src/org/ofbiz/geronimo/GeronimoContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/geronimo/src/org/ofbiz/geronimo/GeronimoContainer.java?rev=1356181&r1=1356180&r2=1356181&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/geronimo/src/org/ofbiz/geronimo/GeronimoContainer.java (original)
+++ ofbiz/branches/20120329_portletWidget/framework/geronimo/src/org/ofbiz/geronimo/GeronimoContainer.java Mon Jul 2 11:02:34 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!");
}
@@ -83,4 +85,8 @@ public class GeronimoContainer implement
// TODO: how to stop the Geronimo transaction manager? is it even needed?
}
+ public String getName() {
+ return name;
+ }
+
}