You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/04/19 13:06:56 UTC
svn commit: r766446 - in /ofbiz/trunk/framework:
base/config/limited-containers.xml base/config/ofbiz-containers.xml
common/config/general.properties entity/config/entityengine.xml
webapp/config/url.properties
Author: jleroux
Date: Sun Apr 19 11:06:54 2009
New Revision: 766446
URL: http://svn.apache.org/viewvc?rev=766446&view=rev
Log:
Revert r766443 commited by accident
Modified:
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/framework/base/config/limited-containers.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/limited-containers.xml?rev=766446&r1=766445&r2=766446&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/config/limited-containers.xml (original)
+++ ofbiz/trunk/framework/base/config/limited-containers.xml Sun Apr 19 11:06:54 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,17 +30,16 @@
<!-- RMI Service Dispatcher -->
<container name="rmi-dispatcher" class="org.ofbiz.service.rmi.RmiServiceContainer">
- <property name="use-initial-context" value="ftrue"/>
+ <property name="use-initial-context" value="true"/>
<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-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"/>
+ <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"/>
</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=766446&r1=766445&r2=766446&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/config/ofbiz-containers.xml (original)
+++ ofbiz/trunk/framework/base/config/ofbiz-containers.xml Sun Apr 19 11:06:54 2009
@@ -22,7 +22,6 @@
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"/>
@@ -38,14 +37,14 @@
<!-- load the naming (JNDI) server -->
<container name="naming-container" class="org.ofbiz.base.container.NamingServiceContainer">
- <property name="port" value="20099"/>
+ <property name="port" value="1099"/>
</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="20099"/>
+ <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"/>
@@ -196,7 +195,7 @@
<property name="maxThreads" value="100"/>
<property name="minSpareThreads" value="4"/>
<property name="noCompressionUserAgents" value=""/>
- <property name="port" value="28080"/>
+ <property name="port" value="8080"/>
<property name="restrictedUserAgents" value=""/>
<property name="server" value=""/>
<property name="socketBuffer" value="9000"/>
@@ -234,7 +233,7 @@
<property name="maxThreads" value="100"/>
<property name="minSpareThreads" value="4"/>
<property name="noCompressionUserAgents" value=""/>
- <property name="port" value="28443"/>
+ <property name="port" value="8443"/>
<property name="restrictedUserAgents" value=""/>
<property name="server" value=""/>
<property name="socketBuffer" value="9000"/>
@@ -260,7 +259,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="29990"/>
+ <property name="telnet-port" value="9990"/>
<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=766446&r1=766445&r2=766446&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/general.properties (original)
+++ ofbiz/trunk/framework/common/config/general.properties Sun Apr 19 11:06:54 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=Y
+mail.notifications.enabled=N
# -- redirect all mail notifications to this address for testing
-mail.notifications.redirectTo=ofbiz@les7arts.com
+#mail.notifications.redirectTo=
# -- the default mail server to use
-mail.smtp.relay.host=192.168.2.3
+mail.smtp.relay.host=localhost
# -- 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
@@ -110,11 +110,8 @@
https.demo.ofbiz.org=ABQIAAAAtt0d8djaYFkk8N5LJVcDSBT8mLFVw0UmWN4r07bOuUQ4UabwzBR-S6mi2C6yWQ3KgNfeTwPMkzxS3w
http.demo.ofbiz.org=ABQIAAAAtt0d8djaYFkk8N5LJVcDSBRoVXyd5dd326mHOq_i9bqLAUXkDBRqjQ4AJUrcmS2zceBQ5QbrIybgdA
-https.demo904.ofbiz.org=ABQIAAAAtt0d8djaYFkk8N5LJVcDSBS-zH98ouEWMGSTtMT5OXqfumgA8hSRIGRTY_YC0K-6_hP7jNaWeRYcBw
-http.demo904.ofbiz.org=ABQIAAAAtt0d8djaYFkk8N5LJVcDSBQ40GxeoIYvic1lQQv1lf_QVdXOMhTx4uvOBVGpk7eDWpQLPY9iIhc3TQ
-
https.lamouline.myvnc.com=ABQIAAAAtt0d8djaYFkk8N5LJVcDSBSzEzroB3fSdgSb-2dwDb6HBu9wWBToPcXMOlizmh-CuuHcApTmyJLuZA
http.lamouline.myvnc.com=ABQIAAAAtt0d8djaYFkk8N5LJVcDSBSW4gdJuhtquQGZ6TdBCoQ9-UcKjBR51jwokpCIee0XaL6FQu35VzcqxA
https.localhost=ABQIAAAAtt0d8djaYFkk8N5LJVcDSBQN-clGH2vvMMwJjYtcwF78UzZgEBTN70S6uIgRoAtXRkADNoesbw5etg
-http.localhost=ABQIAAAAtt0d8djaYFkk8N5LJVcDSBT2yXp_ZAY8_ufC3CFXhHIE1NvwkxR3euHYk9bpwvdF2Qg1EYO1LQitHA
+http.localhost=ABQIAAAAtt0d8djaYFkk8N5LJVcDSBT2yXp_ZAY8_ufC3CFXhHIE1NvwkxR3euHYk9bpwvdF2Qg1EYO1LQitHA
\ No newline at end of file
Modified: ofbiz/trunk/framework/entity/config/entityengine.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/config/entityengine.xml?rev=766446&r1=766445&r2=766446&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/config/entityengine.xml (original)
+++ ofbiz/trunk/framework/entity/config/entityengine.xml Sun Apr 19 11:06:54 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="localderby" entity-model-reader="main" entity-group-reader="main" entity-eca-reader="main" distributed-cache-clear-enabled="false">
+ <delegator name="default" 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,12 +60,11 @@
<!-- 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="localpostgres"/>
+ <group-map group-name="org.ofbiz" datasource-name="localderby"/>
<group-map group-name="org.ofbiz.olap" datasource-name="localderbyolap"/>
</delegator>
- <delegator name="default" sequenced-id-prefix="OFB" entity-model-reader="main" entity-group-reader="main" entity-eca-reader="main">
+ <delegator name="other" 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 -->
@@ -192,7 +191,6 @@
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"
@@ -340,7 +338,6 @@
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"
@@ -351,7 +348,7 @@
<read-data reader-name="ext"/>
<inline-jdbc
jdbc-driver="org.postgresql.Driver"
- jdbc-uri="jdbc:postgresql://127.0.0.1:5434/ofbizDev"
+ jdbc-uri="jdbc:postgresql://127.0.0.1/ofbiz"
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=766446&r1=766445&r2=766446&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/config/url.properties (original)
+++ ofbiz/trunk/framework/webapp/config/url.properties Sun Apr 19 11:06:54 2009
@@ -22,11 +22,11 @@
# HTTPS Port (Secure port)
port.https.enabled=Y
-port.https=28443
+port.https=8443
force.https.host=
# HTTP Port (Not Secure port)
-port.http=28080
+port.http=8080
force.http.host=
# Static Content URLs to make it easy to move the serving load for static content to other machines