svn commit: r825046 - in /ofbiz/trunk: applications/content/data/ContentHelpData.xml framework/base/config/both-containers.xml

Author: jleroux
Date: Wed Oct 14 07:36:33 2009
New Revision: 825046

URL: http://svn.apache.org/viewvc?rev=825046&view=rev
Log:
A patch from Erwan de FERRIERES "Translation of the OFBiz help system in French" (https://issues.apache.org/jira/browse/OFBIZ-3036) - OFBIZ-3036
Here is the beginning of the translation for the OFBiz help system in French. This is only the root page.

Modified:
    ofbiz/trunk/applications/content/data/ContentHelpData.xml
    ofbiz/trunk/framework/base/config/both-containers.xml

Modified: ofbiz/trunk/applications/content/data/ContentHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/ContentHelpData.xml?rev=825046&r1=825045&r2=825046&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/data/ContentHelpData.xml (original)
+++ ofbiz/trunk/applications/content/data/ContentHelpData.xml Wed Oct 14 07:36:33 2009
@@ -39,7 +39,10 @@
     <DataResource dataResourceId="HELP_ROOT_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/content/data/helpdata/HELP_ROOT_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Help system root" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="HELP_ROOT_NL" contentTypeId="DOCUMENT" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_ROOT_NL" localeString="nl" statusId="CTNT_IN_PROGRESS" contentName="Help system root in dutch" mimeTypeId="text/html"/>
     <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_ROOT_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-01-12 01:01:01"/>
-    
+    <DataResource dataResourceId="HELP_ROOT_FR" localeString="fr" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/content/data/helpdata/HELP_ROOT_FR.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Help system root" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="HELP_ROOT_FR" contentTypeId="DOCUMENT" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_ROOT_FR" localeString="fr" statusId="CTNT_IN_PROGRESS" contentName="Help system root in french" mimeTypeId="text/html"/>
+    <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_ROOT_FR" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-01-12 01:01:01"/>
+
     <!-- Content specific -->
     <DataResource dataResourceId="HELP_CONTENT" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/content/data/helpdata/HELP_CONTENT.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Content Manager Help" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="HELP_CONTENT" contentTypeId="DOCUMENT" contentName="Content Manager Help" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_CONTENT" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>

Modified: ofbiz/trunk/framework/base/config/both-containers.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/both-containers.xml?rev=825046&r1=825045&r2=825046&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/config/both-containers.xml (original)
+++ ofbiz/trunk/framework/base/config/both-containers.xml Wed Oct 14 07:36:33 2009
@@ -38,14 +38,14 @@
     <!-- 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"/>
+        <property name="port" value="51099"/>
     </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="bound-port" value="51099"/>
         <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"/>
@@ -196,7 +196,7 @@
             <property name="maxThreads" value="100"/>
             <property name="minSpareThreads" value="4"/>
             <property name="noCompressionUserAgents" value=""/>
-            <property name="port" value="8080"/>
+            <property name="port" value="58080"/>
             <property name="restrictedUserAgents" value=""/>
             <property name="server" value=""/>
             <property name="socketBuffer" value="9000"/>
@@ -234,7 +234,7 @@
             <property name="maxThreads" value="100"/>
             <property name="minSpareThreads" value="4"/>
             <property name="noCompressionUserAgents" value=""/>
-            <property name="port" value="8443"/>
+            <property name="port" value="58443"/>
             <property name="restrictedUserAgents" value=""/>
             <property name="server" value=""/>
             <property name="socketBuffer" value="9000"/>
@@ -289,7 +289,7 @@
     <!-- load BeanShell remote telnet server -->
     <container name="beanshell-container" class="org.ofbiz.base.container.BeanShellContainer">
         <!-- the port below and port-1 will be opened by beanshell -->
-        <property name="telnet-port" value="9990"/>
+        <property name="telnet-port" value="59994"/>
         <property name="app-name" value="OFBiz"/>
     </container>
 </ofbiz-containers>