svn commit: r1369382 [5/19] - in /ofbiz/branches/20120329_portl
Locked
svn commit: r1369382 [5/19] - in /ofbiz/branches/20120329_portl
 
|
Modified: ofbiz/branches/20120329_portletWidget/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/build.xml?rev=1369382&r1=1369381&r2=1369382&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/build.xml (original) +++ ofbiz/branches/20120329_portletWidget/build.xml Sat Aug 4 18:11:00 2012 @@ -27,7 +27,7 @@ under the License. <property name="memory.initial.param" value="-Xms128M"/> <property name="memory.max.param" value="-Xmx512M"/> <property name="pos.memory.max.param" value="-Xmx512M"/> - <property name="memory.maxpermsize.param" value="-XX:MaxPermSize=512m"/> + <property name="memory.maxpermsize.param" value="-XX:MaxPermSize=512M"/> <available file="applications/build.xml" property="applications.present"/> <available file="specialpurpose/build.xml" property="specialpurpose.present"/> @@ -188,7 +188,7 @@ under the License. <xmlproperty file="runtime/svninfo_tmp.xml"/> <echo message="Rev:${info.entry.commit(revision)}"/> <basename property="releasePath" file="${info.entry.url}"/> - <echo message=" - Release-revision : ${releasePath}-${info.entry.commit(revision)}" file="runtime/svninfo.ftl"/> + <echo message=" - Release-revision : ${releasePath}-r${info.entry.commit(revision)}" file="runtime/svninfo.ftl"/> <delete file="runtime/svninfo_tmp.xml"/> <echo message="Done!"/> </target> @@ -278,7 +278,6 @@ under the License. <fileset dir="${ofbiz.home.dir}/framework/base/lib/commons" includes="*.jar"/> <fileset dir="${ofbiz.home.dir}/framework/base/lib/j2eespecs" includes="*.jar"/> <fileset dir="${ofbiz.home.dir}/framework/base/lib/scripting" includes="*.jar"/> - <fileset dir="${ofbiz.home.dir}/framework/birt/lib" includes="*.jar"/> <fileset dir="${ofbiz.home.dir}/framework/catalina/lib" includes="*.jar"/> <fileset dir="${ofbiz.home.dir}/framework/entity/lib" includes="*.jar"/> <fileset dir="${ofbiz.home.dir}/framework/geronimo/lib" includes="*.jar"/> @@ -287,6 +286,7 @@ under the License. <fileset dir="${ofbiz.home.dir}/framework/testtools/lib" includes="*.jar"/> <fileset dir="${ofbiz.home.dir}/framework/webapp/lib" includes="*.jar"/> <fileset dir="${ofbiz.home.dir}/framework/webapp/build/lib" includes="*.jar"/> + <fileset dir="${ofbiz.home.dir}/specialpurpose/birt/lib" includes="*.jar"/> <fileset dir="${ofbiz.home.dir}/specialpurpose/ebaystore/lib" includes="*.jar"/> <fileset dir="${ofbiz.home.dir}/specialpurpose/googlecheckout/lib" includes="*.jar"/> <fileset dir="${ofbiz.home.dir}/specialpurpose/ldap/lib" includes="*.jar"/> @@ -376,7 +376,7 @@ under the License. description="Start OFBiz"> <java jar="ofbiz.jar" fork="true"> <jvmarg value="${memory.initial.param}"/> - <jvmarg value="${pos.memory.max.param}"/> + <jvmarg value="${memory.max.param}"/> <jvmarg value="${memory.maxpermsize.param}"/> </java> </target> @@ -384,7 +384,7 @@ under the License. description="Start OFBiz as a separate process"> <java jar="ofbiz.jar" fork="true" spawn="true"> <jvmarg value="${memory.initial.param}"/> - <jvmarg value="${pos.memory.max.param}"/> + <jvmarg value="${memory.max.param}"/> <jvmarg value="${memory.maxpermsize.param}"/> </java> </target> @@ -929,6 +929,36 @@ under the License. </condition> </fail> </target> + <target name="run-test-debug" + description="Run a single test in debug mode, syntax eg: ant run-test-debug -Dtest.component=service -Dtest.case=service-soap-tests"> + <fail unless="test.component">test.component is a required parameter: -Dtest.component=componentname</fail> + <fail unless="test.case">test.case is a required parameter: -Dtest.case=testcasename</fail> + <java jar="ofbiz.jar" fork="true" resultproperty="test.result"> + <jvmarg value="${memory.initial.param}"/> + <jvmarg value="${memory.max.param}"/> + <jvmarg value="${memory.maxpermsize.param}"/> + <jvmarg value="-Xnoagent"/> + <jvmarg value="-Djava.compiler=NONE"/> + <jvmarg value="-Xdebug"/> + <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8091"/> + <arg value="test"/> + <arg value="-component=${test.component}"/> + <arg value="-case=${test.case}"/> + <env key="LC_ALL" value="C"/> + </java> + <delete dir="runtime/logs/test-results/${test.component}-${test.case}"/> + <mkdir dir="runtime/logs/test-results/${test.component}-${test.case}"/> + <move todir="runtime/logs/test-results/${test.component}-${test.case}"> + <fileset dir="runtime/logs/test-results" includes="*.xml"/> + </move> + <fail message="Test run was unsuccessful"> + <condition> + <not> + <equals arg1="${test.result}" arg2="0"/> + </not> + </condition> + </fail> + </target> <target name="run-test-suite" description="Run a single test suite, syntax eg: ant run-test-suite -Dtest.component=mycomponent -Dtest.suiteName=mytests"> <fail unless="test.component">test.component is a required parameter: -Dtest.component=componentname</fail> @@ -1019,7 +1049,7 @@ under the License. </exec> <xmlproperty file="runtime/svninfo_tmp.xml"/> - <property name="sonar.sources" value="framework/appserver/src, framework/base/src, framework/bi/src, framework/birt/src, + <property name="sonar.sources" value="framework/appserver/src, framework/base/src, framework/bi/src, framework/catalina/src, framework/common/src, framework/datafile/src, framework/entity/src, framework/entityext/src, framework/example/src, framework/geronimo/src, framework/jetty/src, framework/minilang/src, framework/security/src, framework/service/src, framework/sql/src, framework/start/src, @@ -1029,7 +1059,7 @@ under the License. applications/product/src, applications/securityext/src, applications/workeffort/src, specialpurpose/assetmaint/src, specialpurpose/ebay/src, specialpurpose/ebaystore/src, specialpurpose/ecommerce/src, specialpurpose/googlebase/src, specialpurpose/googlecheckout/src, specialpurpose/hhfacility/src, specialpurpose/oagis/src, specialpurpose/pos/src, - specialpurpose/scrum/src" /> + specialpurpose/scrum/src, specialpurpose/birt/src" /> <property name="sonar.tests" value="framework/base/src/org/ofbiz/base/test, framework/entity/src/org/ofbiz/entity/test, framework/service/src/org/ofbiz/service/test, framework/sql/src/org/ofbiz/sql/test, applications/accounting/src/org/ofbiz/accounting/test, applications/content/src/org/ofbiz/content/test, Modified: ofbiz/branches/20120329_portletWidget/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java?rev=1369382&r1=1369381&r2=1369382&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java (original) +++ ofbiz/branches/20120329_portletWidget/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java Sat Aug 4 18:11:00 2012 @@ -74,7 +74,7 @@ public class GenerateContainer implement private String name; /** - * @see org.ofbiz.base.container.Container#init(java.lang.String[], java.lang.String) + * @see org.ofbiz.base.container.Container#init(String[] args, String name, String configFile) */ public void init(String[] args, String name, String configFile) { this.name = name; Modified: ofbiz/branches/20120329_portletWidget/framework/base/config/ofbiz-containers.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/base/config/ofbiz-containers.xml?rev=1369382&r1=1369381&r2=1369382&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/framework/base/config/ofbiz-containers.xml (original) +++ ofbiz/branches/20120329_portletWidget/framework/base/config/ofbiz-containers.xml Sat Aug 4 18:11:00 2012 @@ -20,73 +20,19 @@ under the License. <ofbiz-containers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-containers.xsd"> - <loader name="main"/> - <!-- load the ofbiz component container (always first) --> - <container name="component-container" class="org.ofbiz.base.container.ComponentContainer"/> - - <!-- load the cached classloader container (always second) --> - <container name="classloader-container" class="org.ofbiz.base.container.ClassLoaderContainer"/> - <!-- load JNDI/JOTM; this is no longer needed, leaving this in for now just in case someone wants to drop in JOTM from the specialized directory - <container name="jotm-container" class="org.ofbiz.jotm.container.JotmContainer"> - <property name="jndi-config" value="iiop.properties"/> - </container> - --> + <!-- load the ofbiz component container (always first) --> + <container name="component-container" loaders="main,rmi,pos,install" class="org.ofbiz.base.container.ComponentContainer"/> - <!-- load the naming (JNDI) server --> - <container name="naming-container" class="org.ofbiz.base.container.NamingServiceContainer"> - <property name="host" value="0.0.0.0"/> - <property name="port" value="1099"/> + <container name="component-container-test" loaders="test" class="org.ofbiz.base.container.ComponentContainer"> + <property name="ofbiz.instrumenterClassName" value="org.ofbiz.base.config.CoberturaInstrumenter"/> + <property name="ofbiz.instrumenterFile" value="runtime/logs/cobertura-components.dat"/> </container> - <!-- RMI Service Dispatcher --> - <container name="rmi-dispatcher" class="org.ofbiz.service.rmi.RmiServiceContainer"> - <property name="bound-name" value="RMIDispatcher"/> - <property name="bound-host" value="127.0.0.1"/> - <property name="bound-port" value="1099"/> - <property name="delegator-name" value="default"/> - <property name="client-factory" value="org.ofbiz.service.rmi.socket.ssl.SSLClientSocketFactory"/> - <property name="server-factory" value="org.ofbiz.service.rmi.socket.ssl.SSLServerSocketFactory"/> - <property name="ssl-keystore" value="framework/base/config/ofbizrmi.jks"/> - <property name="ssl-keystore-type" value="JKS"/> - <property name="ssl-keystore-pass" value="changeit"/> - <property name="ssl-keystore-alias" value="rmissl"/> - <property name="ssl-client-auth" value="false"/> + <container name="component-container-limited" loaders="limited" class="org.ofbiz.base.container.ComponentContainer"> + <property name="update-classpath" value="false"/> </container> - <!-- JavaMail Listener Container - Triggers MCA Rules --> - <!-- if delete-mail is set to true, will delete messages after fetching them. otherwise, will try to mark them as seen - mail.store.protocol supports both imap and pop3, but pop3 will not be able to mark messages as seen, so you would need to delete them--> - <!-- To use the mail listerner just uncomment and go... - <container name="javamail-container" class="org.ofbiz.service.mail.JavaMailContainer"> - <property name="delegator-name" value="default"/> - <property name="dispatcher-name" value="JavaMailDispatcher"/> - <property name="run-as-user" value="system"/> - <property name="poll-delay" value="300000"/> - <property name="delete-mail" value="false"/> - <property name="maxSize" value="100000"/> - <property name="default-listener" value="store-listener"> - <property name="mail.store.protocol" value="imap"/> - <property name="mail.host" value="[host]"/> - <property name="mail.user" value="[user]"/> - <property name="mail.pass" value="[pass]"/> - <property name="mail.debug" value="false"/> - </property> - </container> - --> + <container name="component-container" loaders="testlist" class="org.ofbiz.base.container.JustLoadComponentsContainer"/> - <!-- load BeanShell remote telnet server --> - <!-- Commented out by default for security reasons --> - <!-- the port below and port-1 will be opened by Beanshell --> - <!--container name="beanshell-container" class="org.ofbiz.base.container.BeanShellContainer"> - <property name="telnet-port" value="9990"/> - <property name="app-name" value="OFBiz"/> - </container--> - - <!-- load Groovy remote telnet server --> - <!-- Commented out by default for security reasons --> - <!-- the port below will be opened by Groovy --> - <!--container name="groovyshell-container" class="org.ofbiz.base.container.GroovyShellContainer"> - <property name="telnet-port" value="9991"/> - </container--> </ofbiz-containers> Modified: ofbiz/branches/20120329_portletWidget/framework/base/dtd/ofbiz-containers.xsd URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/base/dtd/ofbiz-containers.xsd?rev=1369382&r1=1369381&r2=1369382&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/framework/base/dtd/ofbiz-containers.xsd (original) +++ ofbiz/branches/20120329_portletWidget/framework/base/dtd/ofbiz-containers.xsd Sat Aug 4 18:11:00 2012 @@ -21,19 +21,10 @@ under the License. <xs:element name="ofbiz-containers"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="loader"/> <xs:element maxOccurs="unbounded" ref="container"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="loader"> - <xs:complexType> - <xs:attributeGroup ref="attlist.loader"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.loader"> - <xs:attribute type="xs:string" name="name" use="required"/> - </xs:attributeGroup> <xs:element name="container"> <xs:complexType> <xs:sequence> Modified: ofbiz/branches/20120329_portletWidget/framework/base/dtd/ofbiz-properties.xsd URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/base/dtd/ofbiz-properties.xsd?rev=1369382&r1=1369381&r2=1369382&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/framework/base/dtd/ofbiz-properties.xsd (original) +++ ofbiz/branches/20120329_portletWidget/framework/base/dtd/ofbiz-properties.xsd Sat Aug 4 18:11:00 2012 @@ -18,31 +18,30 @@ specific language governing permissions under the License. --> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"> - <xs:import namespace="http://www.w3.org/XML/1998/namespace" - schemaLocation="http://www.w3.org/2001/xml.xsd"/> + <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd" /> + + <xs:complexType name="valueType"> + <xs:simpleContent> + <xs:extension base="xs:string"> + <xs:attribute ref="xml:lang" /> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + <xs:element name="resource"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="1" maxOccurs="unbounded" ref="property"/> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="property" /> </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="property"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="1" maxOccurs="unbounded" name="value" type="valueType"/> + <xs:element minOccurs="1" maxOccurs="unbounded" name="value" type="valueType" /> </xs:sequence> - <xs:attributeGroup ref="attlist.property"/> + <xs:attribute type="xs:string" name="key" use="required" /> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.property"> - <xs:attribute type="xs:string" name="key" use="required"/> - </xs:attributeGroup> - <xs:complexType name="valueType"> - <xs:simpleContent> - <xs:extension base="xs:string"> - <xs:attribute ref="xml:lang"/> - </xs:extension> - </xs:simpleContent> - </xs:complexType> </xs:schema> Modified: ofbiz/branches/20120329_portletWidget/framework/base/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/base/ofbiz-component.xml?rev=1369382&r1=1369381&r2=1369382&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/framework/base/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/framework/base/ofbiz-component.xml Sat Aug 4 18:11:00 2012 @@ -27,4 +27,29 @@ under the License. <classpath type="jar" location="lib/*"/> <test-suite loader="main" location="testdef/basetests.xml"/> + + <!-- load the cached classloader container (always second) --> + <container name="classloader-container" loaders="main,rmi,pos,install,test" class="org.ofbiz.base.container.ClassLoaderContainer"/> + + <!-- load the naming (JNDI) server --> + <container name="naming-container" loaders="rmi" class="org.ofbiz.base.container.NamingServiceContainer"> + <property name="host" value="0.0.0.0"/> + <property name="port" value="1099"/> + </container> + + <!-- load BeanShell remote telnet server --> + <!-- Commented out by default for security reasons --> + <!-- the port below and port-1 will be opened by Beanshell --> + <!--container name="beanshell-container" class="org.ofbiz.base.container.BeanShellContainer"> + <property name="telnet-port" value="9990"/> + <property name="app-name" value="OFBiz"/> + </container--> + + <!-- load Groovy remote telnet server --> + <!-- Commented out by default for security reasons --> + <!-- the port below will be opened by Groovy --> + <!--container name="groovyshell-container" class="org.ofbiz.base.container.GroovyShellContainer"> + <property name="telnet-port" value="9991"/> + </container--> + </ofbiz-component> Modified: ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/concurrent/ExecutionPool.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/concurrent/ExecutionPool.java?rev=1369382&r1=1369381&r2=1369382&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/concurrent/ExecutionPool.java (original) +++ ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/concurrent/ExecutionPool.java Sat Aug 4 18:11:00 2012 @@ -18,7 +18,7 @@ *******************************************************************************/ package org.ofbiz.base.concurrent; -import java.lang.management.ManagementFactory; +import java.lang.Runtime; import java.util.Collection; import java.util.Iterator; import java.util.List; @@ -39,7 +39,7 @@ import org.ofbiz.base.util.Debug; @SourceMonitored public final class ExecutionPool { public static final String module = ExecutionPool.class.getName(); - public static final ScheduledExecutorService GLOBAL_EXECUTOR = getExecutor(null, "ofbiz-config", -1, true); + public static final ScheduledExecutorService GLOBAL_EXECUTOR = getExecutor(null, "OFBiz-config", -1, true); protected static class ExecutionPoolThreadFactory implements ThreadFactory { private final ThreadGroup group; @@ -78,7 +78,7 @@ public final class ExecutionPool { if (threadCount == 0) { threadCount = 1; } else if (threadCount < 0) { - int numCpus = ManagementFactory.getOperatingSystemMXBean().getAvailableProcessors(); + int numCpus = Runtime.getRuntime().availableProcessors(); threadCount = Math.abs(threadCount) * numCpus; } ThreadFactory threadFactory = createThreadFactory(group, namePrefix); @@ -134,11 +134,11 @@ public final class ExecutionPool { static { ExecutionPoolPulseWorker worker = new ExecutionPoolPulseWorker(); - int processorCount = ManagementFactory.getOperatingSystemMXBean().getAvailableProcessors(); + int processorCount = Runtime.getRuntime().availableProcessors(); for (int i = 0; i < processorCount; i++) { Thread t = new Thread(worker); t.setDaemon(true); - t.setName("ExecutionPoolPulseWorker(" + i + ")"); + t.setName("OFBiz-ExecutionPoolPulseWorker-" + i); t.start(); } } Modified: ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/BeanShellContainer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/BeanShellContainer.java?rev=1369382&r1=1369381&r2=1369382&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/BeanShellContainer.java (original) +++ ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/BeanShellContainer.java Sat Aug 4 18:11:00 2012 @@ -39,7 +39,7 @@ public class BeanShellContainer implemen protected int port; /** - * @see org.ofbiz.base.container.Container#init(java.lang.String[], java.lang.String) + * @see org.ofbiz.base.container.Container#init(String[] args, String name, String configFile) */ public void init(String[] args, String name, String configFile) { this.containerName = name; @@ -47,7 +47,7 @@ public class BeanShellContainer implemen } /** - * @see org.ofbiz.base.container.Container#init(java.lang.String[], java.lang.String) + * @see org.ofbiz.base.container.Container#init(String[] args, String name, String configFile) */ public boolean start() throws ContainerException { // get the container config Modified: ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/ClassLoaderContainer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/ClassLoaderContainer.java?rev=1369382&r1=1369381&r2=1369382&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/ClassLoaderContainer.java (original) +++ ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/ClassLoaderContainer.java Sat Aug 4 18:11:00 2012 @@ -35,7 +35,7 @@ public class ClassLoaderContainer implem private String name; /** - * @see org.ofbiz.base.container.Container#init(java.lang.String[], java.lang.String) + * @see org.ofbiz.base.container.Container#init(String[] args, String name, String configFile) */ public void init(String[] args, String name, String configFile) throws ContainerException { this.name = name; Modified: ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/ComponentContainer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/ComponentContainer.java?rev=1369382&r1=1369381&r2=1369382&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/ComponentContainer.java (original) +++ ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/ComponentContainer.java Sat Aug 4 18:11:00 2012 @@ -56,7 +56,7 @@ public class ComponentContainer implemen private String instrumenterFile; /** - * @see org.ofbiz.base.container.Container#init(java.lang.String[], java.lang.String) + * @see org.ofbiz.base.container.Container#init(String[] args, String name, String configFile) */ public void init(String[] args, String name, String configFile) throws ContainerException { this.name = name; Modified: ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/ContainerConfig.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/ContainerConfig.java?rev=1369382&r1=1369381&r2=1369382&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/ContainerConfig.java (original) +++ ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/ContainerConfig.java Sat Aug 4 18:11:00 2012 @@ -49,29 +49,6 @@ public class ContainerConfig { @LockedBy("ContainerConfig.class") private static Map<String, Container> containers = new LinkedHashMap<String, Container>(); - public static List<String> getLoaders(String configFile) throws ContainerException { - URL xmlUrl = UtilURL.fromResource(configFile); - if (xmlUrl == null) { - throw new ContainerException("Could not find container config file " + configFile); - } - Document containerDocument = null; - try { - containerDocument = UtilXml.readXmlDocument(xmlUrl, true); - } catch (SAXException e) { - throw new ContainerException("Error reading the container config file: " + xmlUrl, e); - } catch (ParserConfigurationException e) { - throw new ContainerException("Error reading the container config file: " + xmlUrl, e); - } catch (IOException e) { - throw new ContainerException("Error reading the container config file: " + xmlUrl, e); - } - Element root = containerDocument.getDocumentElement(); - List<String> result = new ArrayList<String>(); - for (Element curElement: UtilXml.childElementList(root, "loader")) { - result.add(curElement.getAttribute("name")); - } - return result; - } - public static Container getContainer(String containerName, String configFile) throws ContainerException { Container container = containers.get(containerName); if (container == null) { Modified: ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/ContainerLoader.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/ContainerLoader.java?rev=1369382&r1=1369381&r2=1369382&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/ContainerLoader.java (original) +++ ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/ContainerLoader.java Sat Aug 4 18:11:00 2012 @@ -33,6 +33,7 @@ import org.ofbiz.base.start.Config; import org.ofbiz.base.start.StartupException; import org.ofbiz.base.start.StartupLoader; import org.ofbiz.base.util.Debug; +import org.ofbiz.base.util.StringUtil; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; @@ -47,22 +48,6 @@ import org.ofbiz.base.util.UtilXml; public class ContainerLoader implements StartupLoader { public static final String module = ContainerLoader.class.getName(); - private static Map<String, Container> containerMap = new ConcurrentHashMap<String, Container>(); - - /** - * Returns a <code>Container</code> that has the specified name. Returns - * <code>null</code> if the specified container was not loaded. If more than one - * instance of the container was loaded, then the last instance that was loaded is - * returned. The returned <code>Container</code> will be initialized, but there is no - * guarantee that it will be in the running state. - * - * @param containerName - * The name of the container. - * @return A <code>Container</code> that has the specified name. - */ - public static Container getContainer(String containerName) { - return containerMap.get(containerName); - } private String configFile = null; private final List<Container> loadedContainers = new LinkedList<Container>(); @@ -79,13 +64,18 @@ public class ContainerLoader implements this.loadedContainers.clear(); // get this loader's configuration file this.configFile = config.containerConfig; - Debug.logInfo("[Startup] Loading containers from " + configFile, module); + + List<String> loaders = null; + for (Map loaderMap: config.loaders) { + if (module.equals((String)loaderMap.get("class"))) { + loaders = StringUtil.split((String)loaderMap.get("profiles"), ","); + } + } + + Debug.logInfo("[Startup] Loading containers from " + configFile + " for loaders " + loaders, module); Collection<ContainerConfig.Container> containers = null; try { containers = ContainerConfig.getContainers(configFile); - if (UtilValidate.isEmpty(containers)) { - throw new StartupException("No containers loaded; problem with configuration"); - } } catch (ContainerException e) { throw new StartupException(e); } @@ -93,41 +83,28 @@ public class ContainerLoader implements if (this.unloading) { return; } - Debug.logInfo("Loading container: " + containerCfg.name, module); - Container tmpContainer = loadContainer(containerCfg, args); - this.loadedContainers.add(tmpContainer); - containerMap.put(containerCfg.name, tmpContainer); - - // TODO: Put container-specific code in the container. - // This is only used in case of OFBiz running in Geronimo or WASCE. It allows to use the RMIDispatcher - if (containerCfg.name.equals("rmi-dispatcher") && configFile.equals("limited-containers.xml")) { - try { - ContainerConfig.Container.Property initialCtxProp = containerCfg.getProperty("use-initial-context"); - String useCtx = initialCtxProp == null || initialCtxProp.value == null ? "false" : initialCtxProp.value; - if (!useCtx.equalsIgnoreCase("true")) { - //system.setProperty("java.security.policy", "client.policy"); maybe used if needed... - if (System.getSecurityManager() == null) { // needed by WASCE with a client.policy file. - System.setSecurityManager(new java.rmi.RMISecurityManager()); - } - tmpContainer.start(); + boolean matchingLoaderFound = false; + if (UtilValidate.isEmpty(containerCfg.loaders) && UtilValidate.isEmpty(loaders)) { + matchingLoaderFound = true; + } else { + for (String loader: loaders) { + if (UtilValidate.isEmpty(containerCfg.loaders) || containerCfg.loaders.contains(loader)) { + matchingLoaderFound = true; + break; } - } catch (ContainerException e) { - throw new StartupException("Cannot start() " + tmpContainer.getClass().getName(), e); - } catch (java.lang.AbstractMethodError e) { - throw new StartupException("Cannot start() " + tmpContainer.getClass().getName(), e); } } + if (matchingLoaderFound) { + Debug.logInfo("Loading container: " + containerCfg.name, module); + Container tmpContainer = loadContainer(containerCfg, args); + this.loadedContainers.add(tmpContainer); + Debug.logInfo("Loaded container: " + containerCfg.name, module); + } } if (this.unloading) { return; } - List<String> loaders = null; - try { - loaders = ContainerConfig.getLoaders(configFile); - } catch (ContainerException e) { - throw new StartupException(e); - } List<ContainerConfig.Container> containersDefinedInComponents = ComponentConfig.getAllContainers(); for (ContainerConfig.Container containerCfg: containersDefinedInComponents) { boolean matchingLoaderFound = false; @@ -145,7 +122,7 @@ public class ContainerLoader implements Debug.logInfo("Loading component's container: " + containerCfg.name, module); Container tmpContainer = loadContainer(containerCfg, args); this.loadedContainers.add(tmpContainer); - containerMap.put(containerCfg.name, tmpContainer); + Debug.logInfo("Loaded component's container: " + containerCfg.name, module); } } // Get hot-deploy container configuration files @@ -163,7 +140,6 @@ public class ContainerLoader implements } Container tmpContainer = loadContainer(containerCfg, args); this.loadedContainers.add(tmpContainer); - containerMap.put(containerCfg.name, tmpContainer); } } } catch (Exception e) { 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=1369382&r1=1369381&r2=1369382&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 Sat Aug 4 18:11:00 2012 @@ -33,7 +33,7 @@ public class GroovyShellContainer implem private GroovyService gsh = null; /** - * @see org.ofbiz.base.container.Container#init(java.lang.String[], java.lang.String) + * @see org.ofbiz.base.container.Container#init(String[] args, String name, String configFile) */ @Override public void init(String[] args, String name, String configFile) { 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=1369382&r1=1369381&r2=1369382&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 Sat Aug 4 18:11:00 2012 @@ -32,7 +32,7 @@ public class JustLoadComponentsContainer private String name; /** - * @see org.ofbiz.base.container.Container#init(java.lang.String[], java.lang.String) + * @see org.ofbiz.base.container.Container#init(String[] args, String name, String configFile) */ public void init(String[] args, String name, String configFile) { this.name = name; Modified: ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/util/UtilURL.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/util/UtilURL.java?rev=1369382&r1=1369381&r2=1369382&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/util/UtilURL.java (original) +++ ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/util/UtilURL.java Sat Aug 4 18:11:00 2012 @@ -160,18 +160,4 @@ public class UtilURL { return buf.toString(); } - - //#Bam# portletWidget, used by addToParamsIfInContext for idDescription which is "user text" - /**This method can be used to remove all characters that may break a URL in the application - * @param in - * @return string after removing ', ", / and \ characters - */ - public static String removeBadCharForUrl(String in){ - if(UtilValidate.isNotEmpty(in)) - return in.replace("<", "").replace(">", "").replace("'", "").replace("/", "").replace("\\", "").replace("\"", "").replace("&", ""); - else - return ""; - } - //#Eam# portletWidget - } Modified: ofbiz/branches/20120329_portletWidget/framework/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/build.xml?rev=1369382&r1=1369381&r2=1369382&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/framework/build.xml (original) +++ ofbiz/branches/20120329_portletWidget/framework/build.xml Sat Aug 4 18:11:00 2012 @@ -28,7 +28,7 @@ under the License. security/build.xml,service/build.xml,entityext/build.xml, bi/build.xml,minilang/build.xml, webapp/build.xml,widget/build.xml, - common/build.xml,datafile/build.xml,birt/build.xml, + common/build.xml,datafile/build.xml, testtools/build.xml, appserver/build.xml,webtools/build.xml"/> 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=1369382&r1=1369381&r2=1369382&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 Sat Aug 4 18:11:00 2012 @@ -174,7 +174,7 @@ public class CatalinaContainer implement private String name; /** - * @see org.ofbiz.base.container.Container#init(java.lang.String[], java.lang.String) + * @see org.ofbiz.base.container.Container#init(String[] args, String name, String configFile) */ public void init(String[] args, String name, String configFile) throws ContainerException { this.name = name; Modified: ofbiz/branches/20120329_portletWidget/framework/common/config/CommonPortalEntityLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/config/CommonPortalEntityLabels.xml?rev=1369382&r1=1369381&r2=1369382&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/framework/common/config/CommonPortalEntityLabels.xml (original) +++ ofbiz/branches/20120329_portletWidget/framework/common/config/CommonPortalEntityLabels.xml Sat Aug 4 18:11:00 2012 @@ -19,242 +19,6 @@ under the License. --> <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - <!--#Bam# portletWidget --> - <property key="FieldDescription.component"> - <value xml:lang="en">Portlet component, used for search and classification and generate default value for other Portlet field (most of them, not mandatory but strongly recommended if portletType is used) </value> - <value xml:lang="fr">Le composant de référence pour cette portlet, utilisé pour rechercher et classifier les portlet et générer des valeur par défaut pour les autres champs (beaucoup, pas obligatoire mais fortement recommandé si un type de portlet est utilisé)</value> - </property> - <property key="FieldDescription.editAreaDivId"> - <value xml:lang="en">Used by some portlet template, to define an area where show via ajax, in addition to content already present, a portlet (for edition most of time); default value is {portletLongId}_EditArea</value> - <value xml:lang="fr">Utilisé par certain modèle de portlet, pour définir une zone où pouvoir afficher via ajax, en plus du contenu déja présent, une portlet (d'édition le plus souvent); la valeur par défaut est {portletLongId}_EditArea</value> - </property> - <property key="FieldDescription.editFormLocation"> - <value xml:lang="en">look at editFormName; default value is component://{component}/widget/({webapp}/ if webapp not empty){subComponent}Forms.xml</value> - <value xml:lang="fr">voir form d'édition; la valeur par défaut est component://{component}/widget/({webapp}/ si webapp non vide){subComponent}Forms.xml</value> - </property> - <property key="FieldDescription.editFormName"> - <value xml:lang="en">If portlet is customizable, form name to edit portlet parameters; default value is EditParam_{portletLongId}</value> - <value xml:lang="fr">Si la portlet est paramétrable, nom de la form pour éditer les paramètres; la valeur par défaut est EditParam_{portletLongId}</value> - </property> - <property key="FieldDescription.formLocation"> - <value xml:lang="en">look at formName; default value is component://{component}/widget/({webapp}/ if webapp not empty){subComponent}Forms.xml</value> - <value xml:lang="fr">voir nom de la form; la valeur par défaut est component://{component}/widget/({webapp}/ si webapp non vide){subComponent}Forms.xml</value> - </property> - <property key="FieldDescription.formName"> - <value xml:lang="en">Used by some portlet template, to define the form used (ex: SimpleScreenlet ); default value is {portletLongId}</value> - <value xml:lang="fr">Utilisé par certain modèle de portlet, pour définir la nom de la form utilisé (par ex: dans SimpleScreenlet); la valeur par défaut est le {portletLongId}</value> - </property> - <property key="FieldDescription.helpContentId"> - <value xml:lang="en">Used to give contentId which will be shown, on top before links to each portlet Help, when help on this page will be call</value> - <value xml:lang="fr">permet de préciser l'identifant d'un élément de contenu qui sera affiché dans l'écran de d'aide de cette page portail au-dessus des liens vers l'aide de chacune des portlets.</value> - </property> - <property key="FieldDescription.helpName"> - <value xml:lang="en">Id used to show help text about this portlet; default value is HELP_{portalPortletId}; if helpName is not empty and start with DETAIL_ the end is a user context field which contain last selected portletId to show in this place, so it's its helpName which will be used</value> - <value xml:lang="fr">identifiant utilisé afficher le help de cette portlet; la valeur par défaut est HELP_{portalPortletId}; si ce champ est non vide et commence par DETAIL_ alors la fin de ce champ représente le nom d'une variable du contexte utilisateur qui contient l'identifiant de la portlet dernièrement affiché à cet emplacement, c'est donc l'aide de celle-ci qui affiché.</value> - </property> - <property key="FieldDescription.menuLocation"> - <value xml:lang="en">look at menuName; default value is component://{component}/widget/({webapp}/ if webapp not empty){subComponent}Menus.xml</value> - <value xml:lang="fr">voir nom menu; la valeur par défaut est component://{component}/widget/({webapp}/ si webapp non vide){subComponent}Menus.xml</value> - </property> - <property key="FieldDescription.menuName"> - <value xml:lang="en">Used by some portlet template, to define menuName used (ex: in screenlet top); default value is {portletLongId}</value> - <value xml:lang="fr">Utilisé par certain modèle de portlet, pour définir la nom du menu utilisé (par ex: dans la barre du screenlet); la valeur par défaut est {portletLongId}</value> - </property> - <property key="FieldDescription.pkIdName"> - <value xml:lang="en">Used by some portlet template, to define field name to test in condition to show or not portlet; no default value </value> - <value xml:lang="fr">Utilisé par certain modèle de portlet, pour définir la nom du champ à tester pour savoir si on affiche ou non la portlet; il n'y a pas de valeur par défaut</value> - </property> - <property key="FieldDescription.portletLongId"> - <value xml:lang="en">Sometime portletId is too short to be readable, so a id more long, for generate default value for other field this field will be used; default value {portletLongId}</value> - <value xml:lang="fr">L'id de la portlet est quelque fois trop court pour être lisible, celui-ci est plus long, il sera utilisé pour la génération des valeur par défaut pour les autres champs; la valeur par défaut est {portletLongId}</value> - </property> - <property key="FieldDescription.portletName"> - <value xml:lang="en">Short description</value> - <value xml:lang="fr">Description courte</value> - </property> - <property key="FieldDescription.portletTypeId"> - <value xml:lang="en">Can be empty, define a portlet template name (enumCode): a screen in PortletTypeScreens.xml in common</value> - <value xml:lang="fr">Peux être vide, défini le modèle de portlet, le nom (enumCode) correspond à un screen dans PortletTypeScreens.xml dans common</value> - </property> - <property key="FieldDescription.screenLocation"> - <value xml:lang="en">look at screenName; default value is component://{component}/widget/({webapp}/ if webapp not empty){subComponent}Screens.xml</value> - <value xml:lang="fr">voir nom de screen; la valeur par défaut est component://{component}/widget/({webapp}/ si webapp non vide){subComponent}Screens.xml</value> - </property> - <property key="FieldDescription.screenName"> - <value xml:lang="en">if portletType is empty, it's the screen which will be used, otherwise it will include in template (if template need a screen); default value is {portletLongId}</value> - <value xml:lang="fr">Si portletTypeId est vide c'est le screen qui sera utilisé, sinon c'est celui qui sera inclus dans le modèle (si le modèle en a besoin); la valeur par défaut est le {portletLongId}</value> - </property> - <property key="FieldDescription.scriptName"> - <value xml:lang="en">Used by some portlet template (portletType not empty), to define the script to used (ex: SFScreenlet ); default value is {portletLongId} in file component://{component}/script/org/ofbiz/{component}/({webapp}/ if webapp not empty){subComponent}Wscripts.xml</value> - <value xml:lang="fr">Utilisé par certain modèle de portlet (portletType non vide), pour définir la nom du script à utiliser (par ex: dans SimpleScreenlet); la valeur par défaut est le {portletLongId} dans le fichier component://{component}/script/org/ofbiz/{component}/({webapp}/ if webapp not empty){subComponent}Wscripts.xml</value> - </property> - <property key="FieldDescription.securityMainAction"> - <value xml:lang="en">Can be empty, the main action which can be done with this portlet, possible values: CREATE UPDATE VIEW DELETE</value> - <value xml:lang="fr">Peux être vide, l'action principale réalisé par cette portlet, les valeurs possible sont CREATE UPDATE VIEW DELETE</value> - </property> - <property key="FieldDescription.securityPermission"> - <value xml:lang="en">Can be empty, if not, Permission needed to see Portlet (permission_mainAction)</value> - <value xml:lang="fr">Peux être vide, sinon, Permission que l'utilisateur doit avoir (avec l'action) pour pouvoir accéder à cette portlet</value> - </property> - <property key="FieldDescription.securityServiceName"> - <value xml:lang="en">Can be empty, the service named here is used to see if current user can see the portlet on the list of available portlets; the screen that the portlet calls should also call this service to check permission and not render; the service named here must implement the "permissionInterface" service just like services used for service permissions</value> - <value xml:lang="fr">Peux être vide, ce nom du service est utilisé pour valider si l'utilisateur actuel peut voir la portlet dans la liste des portlets disponibles; le screen que cette portlet appelle peut aussi appeler ce service pour verifier la permission et donc s'afficher ou non; Le service nomé ici doit implémenter l'interface du service "permissionInterface" comme tous les services de validation des permissions</value> - </property> - <property key="FieldDescription.subAreaDivId"> - <value xml:lang="en">Used by some portlet template, to define an area where show via ajax, a portlet (ex: for multiple tab); default value is {portletLongId}_SubArea</value> - <value xml:lang="fr">Utilisé par certain modèle de portlet, pour définir une zone où pouvoir afficher via ajax, une portlet (par ex: pour différent onglet); la valeur par défaut est {portletLongId}_SubArea</value> - </property> - <property key="FieldDescription.subComponent"> - <value xml:lang="en">same as component but to give main Entity (ex: Party, Communication, Classification, ...) (strongly recommended if portletType is used)</value> - <value xml:lang="fr">idem composant mais pour préciser l'entité majeur concerné (ex: Party, Communication, Classification, ...) (fortement recommandé si un type de portlet est utilisé)</value> - </property> - <property key="FieldDescription.titleLabel"> - <value xml:lang="en">Used by some portlet template, to define title used (ex: in screenlet top); default value is PageTitle{portletLongId}</value> - <value xml:lang="fr">Utilisé par certain modèle de portlet, pour définir le titre utilisé (par ex: dans la barre du screenlet); la valeur par défaut est PageTitle{portletLongId}</value> - </property> - <property key="FieldDescription.useMenu"> - <value xml:lang="en">Default value is N so portlet template will not use menuName, if Y it use menuName which is locate in MenuLocation. Not used if portletType is empty.</value> - <value xml:lang="fr">Par défaut est égale à N donc le modéle de portlet n'utilisera pas le menu, si =Y alors il utilisera menuName qui se trouve à menuLocation. Non utilisé si portletType est vide</value> - </property> - <property key="FieldDescription.useScreen"> - <value xml:lang="en">Default value is N so portlet template will use formName, if Y portlet will use screenName (which is in screenLocation). Not used if portletType is empty.</value> - <value xml:lang="fr">Par défaut est égale à N donc le modéle de portlet utilisera directement la form, si =Y alors c'est le screenName qui se trouve à screenLocation qui est utilisé. Non utilisé si portletType est vide</value> - </property> - <property key="FieldDescription.useScript"> - <value xml:lang="en">Default value is N so portlet template will not use scriptName in portlet template, if Y portlet will use scriptName. Not used if portletType is empty.</value> - <value xml:lang="fr">Par défaut est égale à N donc le modéle de portlet n'utilisera pas le scriptName, si =Y alors le scrpitName sera appelé. Non utilisé si portletType est vide</value> - </property> - <property key="FieldDescription.uiLabelLocation"> - <value xml:lang="en">Used by most of portlet template, to define portletUiLabelDecorator decorator location; default value is component://{component}/widget/({webapp}/ if webapp not empty)CommonScreens.xml</value> - <value xml:lang="fr">Utilisé par la plupart des modèles, pour définir le champ location du decorator portletUiLabelDecorator; la valeur par défaut est component://{component}/widget/({webapp}/ si webapp non vide)CommonScreens.xml</value> - </property> - <property key="FieldDescription.webapp"> - <value xml:lang="en">same as component, to group subComponent (ex : all file in a sub directory) (optional)</value> - <value xml:lang="fr">idem component, il représente un groupe de subComponent (par ex : pour regrouper les fichiers dans un sous répertoire) (optionnel)</value> - </property> - <!--#Eam# portletWidget --> - <!--#Bam# icons-purpose --> - <property key="PortalPage.portalPageName.IconsList"> - <value xml:lang="en">List all icons usable in portlets</value> - <value xml:lang="fr">Liste des icônes utilisables dans les portlets</value> - </property> - <!--#Eam# icons-purpose --> - - <!--#Bam# portletExample --> - <property key="PortalPage.portalPageName.ExampleFeatureNew"> - <value xml:lang="en">Example Features Creation</value> - <value xml:lang="fr">Créer des caractéristiques</value> - </property> - <property key="PortalPage.portalPageName.ExampleRecap"> - <value xml:lang="en">One example (RecapPage)</value> - <value xml:lang="fr">Un exemple (RecapPage)</value> - </property> - <property key="PortalPage.portalPageName.ExampleMgmt"> - <value xml:lang="en">Examples management (MgmtPage)</value> - <value xml:lang="fr">Gestion des exemples (MgmtPage)</value> - </property> - <property key="PortalPage.portalPageName.ExampleNew"> - <value xml:lang="en">Create a new example (NewPage)</value> - <value xml:lang="fr">Créer un nouvel exemple (NewPage)</value> - </property> - <property key="PortalPortlet.description.CreateExample"> - <value xml:lang="en">portlet (screenlet type) to create Example and associated entities</value> - <value xml:lang="fr">portlet (type Screenlet) de création d'un exemple et ses entités secondaires</value> - </property> - <property key="PortalPortlet.description.ExampleDetailsMenu"> - <value xml:lang="en">Example summary and menu to see all details portlet in the ExampleDetail container</value> - <value xml:lang="fr">portlet(type Screenlet) de résumé et menus liés à un exemple, et utilisant une portlet de contener de détails (ici ExampleDetail)</value> - </property> - <property key="PortalPortlet.description.ExampleDetail"> - <value xml:lang="en">Use this portlet (Empty type) to say where detail portlet call from a menu will be show</value> - <value xml:lang="fr">portlet (type Empty) servant de contener aux portlets de détails d'un exemple (commandé par le menu de la portlet ExampleDetailsMenu)</value> - </property> - <property key="PortalPortlet.description.ExampleFeatureAppls"> - <value xml:lang="en">List all ExampleFeatureAppls for one example, sub-portlet simple (Screenlet type, not list, to be able to add an external menu)</value> - <value xml:lang="fr">portlet listant les associations de caractéristiques d'exemple (type Screenlet, bien qu'utilisant une liste, pour pouvoir ajouter un menu externe)</value> - </property> - <property key="PortalPortlet.description.ExampleItems"> - <value xml:lang="en">portlet (screenletList type) to list and manage example items</value> - <value xml:lang="fr">portlet (type ScreenletList) de gestion des lignes d'un exemple (affiche la liste et le menu)</value> - </property> - <property key="PortalPortlet.description.ExampleStatus"> - <value xml:lang="en">List all ExampleStatus for one example (portlet which use portletType and showPortlet)</value> - <value xml:lang="fr">Liste tous les (évolution de) statuts de l'exemple (portlet utilisant un modéle de portlet et showPortlet)</value> - </property> - <property key="PortalPortlet.description.FindExample"> - <value xml:lang="en">portlet to define search criteria for Example list</value> - <value xml:lang="fr">portlet (type Screenlet) de critères de recherche pour la liste des exemples</value> - </property> - <property key="PortalPortlet.description.FindExampleFeature"> - <value xml:lang="en">portlet to define search criteria for ExampleFeature list</value> - <value xml:lang="fr">portlet (type Screenlet) de critères de recherche pour la liste des caractéristiques d'exemple</value> - </property> - <property key="PortalPortlet.description.ListExample"> - <value xml:lang="en">portlet to list example depending on search criteria, this portlet is call by FindExample</value> - <value xml:lang="fr">portlet (type ScreenletList) listant des exemples selon les critères de recherche fournis par une portlet de recherche (ici FindExample)</value> - </property> - <property key="PortalPortlet.description.ListExampleFeature"> - <value xml:lang="en">portlet to list example features depending on search criteria</value> - <value xml:lang="fr">portlet (type ScreenletList) listant des caractéristique d'exemples selon les critères de recherche fournis par une portlet de recherche (ici FindExampleFeature)</value> - </property> - <property key="PortalPortlet.description.SelectExample"> - <value xml:lang="en">portlet to select example id for overview page</value> - <value xml:lang="fr">portlet (type Screenlet) de sélection d'une entité pour une page de visualisation</value> - </property> - <property key="PortalPortlet.description.ShowExample"> - <value xml:lang="en">portlet (Screenlet type) to display/edit main entity record (here, example)</value> - <value xml:lang="fr">portlet (type Screenlet) de visualisation/modification d'une entité majeure (ici, exemple)</value> - </property> - <property key="PortalPortlet.portletName.CreateExample"> - <value xml:lang="en">Create Example Form</value> - <value xml:lang="fr">Créer un exemple</value> - </property> - <property key="PortalPortlet.portletName.ExampleDetailsMenu"> - <value xml:lang="en">Example summary and details menu (DetailsMenu)</value> - <value xml:lang="fr">Résumé et menus associés pour un exemple (DetailsMenu)</value> - </property> - <property key="PortalPortlet.portletName.ExampleDetail"> - <value xml:lang="en">Container to show Example portlet detail</value> - <value xml:lang="fr">Contener utilisé pour afficher des portlets de détails pour un exemple</value> - </property> - <property key="PortalPortlet.portletName.ExampleFeatureAppls"> - <value xml:lang="en">Example Feature Application</value> - <value xml:lang="fr">Association de caractéristiques à un exemple</value> - </property> - <property key="PortalPortlet.portletName.ExampleItems"> - <value xml:lang="en">List and manage exampleItems</value> - <value xml:lang="fr">Listes des lignes d'exemple</value> - </property> - <property key="PortalPortlet.portletName.ExampleStatus"> - <value xml:lang="en">List ExampleStatus</value> - <value xml:lang="fr">Liste des statuts de l'exemple</value> - </property> - <property key="PortalPortlet.portletName.FindExample"> - <value xml:lang="en">Find Example</value> - <value xml:lang="fr">Rechercher un exemple</value> - </property> - <property key="PortalPortlet.portletName.FindExampleFeature"> - <value xml:lang="en">Find Example Features</value> - <value xml:lang="fr">Rechercher des caractéristiques d'exemple</value> - </property> - <property key="PortalPortlet.portletName.ListExample"> - <value xml:lang="en">List Examples</value> - <value xml:lang="fr">Liste des exemples</value> - </property> - <property key="PortalPortlet.portletName.ListExampleFeature"> - <value xml:lang="en">List Example Features</value> - <value xml:lang="fr">Liste les caractéristiques d'exemple</value> - </property> - <property key="PortalPortlet.portletName.SelectExample"> - <value xml:lang="en">Select one Example</value> - <value xml:lang="fr">Sélectionner un exemple</value> - </property> - <property key="PortalPortlet.portletName.ShowExample"> - <value xml:lang="en">Display Example (all fields)</value> - <value xml:lang="fr">Montrer un exemple (tous les champs)</value> - </property> - <!--#Eam# portletExample --> <property key="PortalPage.portalPageName.MYPORTAL_EMPLOYEE"> <value xml:lang="en">Main</value> <value xml:lang="es">Principal</value> @@ -322,10 +86,4 @@ <value xml:lang="zh_CN">ä»å¨è®¾æ½</value> <value xml:lang="zh_TW">å ´æ</value> </property> - <!--#Bam# icons-purpose --> - <property key="PortalPortlet.portletName.IconsList"> - <value xml:lang="en">List all icons usable in portlets</value> - <value xml:lang="fr">Liste des icônes utilisables dans les portlets</value> - </property> - <!--#Eam# icons-purpose --> </resource> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |