Accident right? Regards Scott
On 19/04/2009, at 10:27 PM, [email protected] wrote:
Author: jleroux Date: Sun Apr 19 10:27:47 2009 New Revision: 766443 URL: http://svn.apache.org/viewvc?rev=766443&view=rev Log: (empty) Modified: ofbiz/trunk/.project ofbiz/trunk/framework/base/config/limited-containers.xml ofbiz/trunk/framework/base/config/ofbiz-containers.xml ofbiz/trunk/framework/common/config/general.properties ofbiz/trunk/framework/entity/config/entityengine.xml ofbiz/trunk/framework/webapp/config/url.properties Modified: ofbiz/trunk/.project URL: http://svn.apache.org/viewvc/ofbiz/trunk/.project?rev=766443&r1=766442&r2=766443&view=diff = = = = = = = = ====================================================================== --- ofbiz/trunk/.project (original) +++ ofbiz/trunk/.project Sun Apr 19 10:27:47 2009 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>ofbiz</name> + <name>ofbizDev</name> <comment></comment> <projects> </projects> Modified: ofbiz/trunk/framework/base/config/limited-containers.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/limited-containers.xml?rev=766443&r1=766442&r2=766443&view=diff = = = = = = = = ======================================================================--- ofbiz/trunk/framework/base/config/limited-containers.xml (original) +++ ofbiz/trunk/framework/base/config/limited-containers.xml Sun Apr 19 10:27:47 2009@@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -30,16 +30,17 @@ <!-- RMI Service Dispatcher --><container name="rmi-dispatcher" class="org.ofbiz.service.rmi.RmiServiceContainer">- <property name="use-initial-context" value="true"/> + <property name="use-initial-context" value="ftrue"/> <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="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="true"/> + <property name="ssl-client-auth" value="true"/-->+ <property name="client-factory" value ="org.ofbiz.service.rmi.socket.zip.CompressionClientSocketFactory"/> + <property name="server-factory" value ="org.ofbiz.service.rmi.socket.zip.CompressionServerSocketFactory"/>+ <property name="ssl-client-auth" value="false"/> </container> <!-- load BeanShell remote telnet server --> Modified: ofbiz/trunk/framework/base/config/ofbiz-containers.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/ofbiz-containers.xml?rev=766443&r1=766442&r2=766443&view=diff= = = = = = = = ======================================================================--- ofbiz/trunk/framework/base/config/ofbiz-containers.xml (original)+++ ofbiz/trunk/framework/base/config/ofbiz-containers.xml Sun Apr 19 10:27:47 2009@@ -22,6 +22,7 @@xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-containers.xsd "><!-- 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"/>@@ -37,14 +38,14 @@ <!-- load the naming (JNDI) server --><container name="naming-container" class="org.ofbiz.base.container.NamingServiceContainer">- <property name="port" value="1099"/> + <property name="port" value="20099"/> </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="20099"/> <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"/>@@ -195,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="28080"/> <property name="restrictedUserAgents" value=""/> <property name="server" value=""/> <property name="socketBuffer" value="9000"/> @@ -233,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="28443"/> <property name="restrictedUserAgents" value=""/> <property name="server" value=""/> <property name="socketBuffer" value="9000"/> @@ -259,7 +260,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="29990"/> <property name="app-name" value="OFBiz"/> </container> </ofbiz-containers> Modified: ofbiz/trunk/framework/common/config/general.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/general.properties?rev=766443&r1=766442&r2=766443&view=diff= = = = = = = = ======================================================================--- ofbiz/trunk/framework/common/config/general.properties (original)+++ ofbiz/trunk/framework/common/config/general.properties Sun Apr 19 10:27:47 2009@@ -60,17 +60,17 @@usps.address.match=(^.*?p[\\. ]*o[\\. ]*box.*$)|(^.*?post.*?office.*? box.*$)|((^|(^.*? ))r[\\. ]*r[\\. ]*(( +)|([0-9#]+)).*$)|(^.*? rural.*?route.*$)# -- mail notifications enabled (Y|N) -mail.notifications.enabled=N +mail.notifications.enabled=Y # -- redirect all mail notifications to this address for testing -#mail.notifications.redirectTo= [email protected] # -- the default mail server to use -mail.smtp.relay.host=localhost +mail.smtp.relay.host=192.168.2.3 # -- SMTP Auth settings -#mail.smtp.auth.user= -#mail.smtp.auth.password= +mail.smtp.auth.user= +mail.smtp.auth.password=# -- Additional Required Fields needed for Gmail and other non traditional smtp servers# -- These added fields also work for Yahoo business mail for instance Modified: ofbiz/trunk/framework/entity/config/entityengine.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/config/entityengine.xml?rev=766443&r1=766442&r2=766443&view=diff= = = = = = = = ======================================================================--- ofbiz/trunk/framework/entity/config/entityengine.xml (original)+++ ofbiz/trunk/framework/entity/config/entityengine.xml Sun Apr 19 10:27:47 2009@@ -38,7 +38,7 @@ </transaction-factory> --> <!--- It is common to use UserTransaction for the TransactionManager, but if that doesn't work, try this: <transaction- manager-jndi jndi-server-name="default" jndi-name="java:comp/ TransactionManager"/> + It is common to use UserTransaction for the TransactionManager, but if that doesn't work, try this: <transaction- manager-jndi jndi-server-name="default" jndi-name="java:comp/ TransactionManager"/>Common UserTransaction locations:java:comp/UserTransaction (most servers: Resin, Orion, OC4J, etc)UserTransaction (RexIP) @@ -49,7 +49,7 @@<!-- the connection factory class to use, one is needed for obtaining connections/pools for defined resources --> <connection-factory class="org.ofbiz.entity.connection.DBCPConnectionFactory"/>- <delegator name="default" entity-model-reader="main" entity- group-reader="main" entity-eca-reader="main" distributed-cache-clear- enabled="false"> + <delegator name="localderby" entity-model-reader="main" entity- group-reader="main" entity-eca-reader="main" distributed-cache-clear- enabled="false"> <group-map group-name="org.ofbiz" datasource- name="localderby"/> <group-map group-name="org.ofbiz.olap" datasource- name="localderbyolap"/></delegator> @@ -60,11 +60,12 @@<!-- be sure that your default delegator (or the one you use) uses the same datasource for test. You must run "ant run-install" before running "ant run-tests" --> <delegator name="test" entity-model-reader="main" entity-group- reader="main" entity-eca-reader="main"> - <group-map group-name="org.ofbiz" datasource- name="localderby"/> + <group-map group-name="org.ofbiz" datasource- name="localpostgres"/> <group-map group-name="org.ofbiz.olap" datasource- name="localderbyolap"/></delegator>- <delegator name="other" entity-model-reader="main" entity-group- reader="main" entity-eca-reader="main"> + <delegator name="default" sequenced-id-prefix="OFB" entity- model-reader="main" entity-group-reader="main" entity-eca- reader="main"> <group-map group-name="org.ofbiz" datasource- name="localpostgres"/> + <group-map group-name="org.ofbiz.olap" datasource- name="localderbyolap"/></delegator> <!-- need to at least define a name for each component to use --> @@ -191,6 +192,7 @@ pool-maxsize="250"/><!-- <jndi-jdbc jndi-server-name="localjndi" jndi- name="java:/DerbyDataSource" isolation-level="ReadCommitted"/> --></datasource> + <datasource name="localderbyolap"helper- class="org.ofbiz.entity.datasource.GenericHelperDAO"schema-name="OFBIZ" @@ -338,6 +340,7 @@ use-fk-initially-deferred="false" alias-view-columns="false" join-style="ansi" + result-fetch-size="50" use-binary-type-for-blob="true"><!-- use this attribute to make the EntityListIterator more effective for pgjdbc 7.5devel and later:result-fetch-size="50" @@ -348,7 +351,7 @@ <read-data reader-name="ext"/> <inline-jdbc jdbc-driver="org.postgresql.Driver" - jdbc-uri="jdbc:postgresql://127.0.0.1/ofbiz" + jdbc-uri="jdbc:postgresql://127.0.0.1:5434/ofbizDev" jdbc-username="ofbiz" jdbc-password="ofbiz" isolation-level="ReadCommitted" Modified: ofbiz/trunk/framework/webapp/config/url.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/config/url.properties?rev=766443&r1=766442&r2=766443&view=diff= = = = = = = = ======================================================================--- ofbiz/trunk/framework/webapp/config/url.properties (original)+++ ofbiz/trunk/framework/webapp/config/url.properties Sun Apr 19 10:27:47 2009@@ -22,11 +22,11 @@ # HTTPS Port (Secure port) port.https.enabled=Y -port.https=8443 +port.https=28443 force.https.host= # HTTP Port (Not Secure port) -port.http=8080 +port.http=28080 force.http.host=# Static Content URLs to make it easy to move the serving load for static content to other machines
smime.p7s
Description: S/MIME cryptographic signature
