Revert previous change done unintentionnaly while testing Subclipse 1…

….4 new interface (so far I preferred the old one...)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@676279 13f79535-47bb-0310-9956-ffa450edef68

.project

@@ -1,6 +1,25 @@
 <?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
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
 <projectDescription>
-	<name>ofbizRun</name>
+	<name>ofbiz</name>
 	<comment></comment>
 	<projects>
 	</projects>

framework/base/config/ofbiz-containers.xml

@@ -34,14 +34,14 @@ under the License.
 
     <!-- load the naming (JNDI) server -->
     <container name="naming-container" class="org.ofbiz.base.container.NamingServiceContainer">
-        <property name="port" value="10099"/>
+        <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="10099"/>
+        <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"/>
@@ -186,7 +186,7 @@ under the License.
             <property name="maxThreads" value="100"/>
             <property name="minSpareThreads" value="4"/>
             <property name="noCompressionUserAgents" value=""/>
-            <property name="port" value="18080"/>
+            <property name="port" value="8080"/>
             <property name="restrictedUserAgents" value=""/>
             <property name="server" value=""/>
             <property name="socketBuffer" value="9000"/>
@@ -224,7 +224,7 @@ under the License.
             <property name="maxThreads" value="100"/>
             <property name="minSpareThreads" value="4"/>
             <property name="noCompressionUserAgents" value=""/>
-            <property name="port" value="18443"/>
+            <property name="port" value="8443"/>
             <property name="restrictedUserAgents" value=""/>
             <property name="server" value=""/>
             <property name="socketBuffer" value="9000"/>
@@ -247,4 +247,10 @@ under the License.
         </property>
     </container>
 
+    <!-- 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="app-name" value="OFBiz"/>
+    </container>
 </ofbiz-containers>

framework/common/config/general.properties

@@ -47,18 +47,13 @@ partner.trackingCodeId.default=
 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
-
+mail.notifications.enabled=N
 
 # -- redirect all mail notifications to this address for testing
 #mail.notifications.redirectTo=
-mail.notifications.redirectTo=[email protected]
 
 # -- the default mail server to use
-#mail.smtp.relay.host=smtp.9business.fr
 mail.smtp.relay.host=localhost
-#mail.smtp.relay.host=smtp.gmail.com
 
 # -- SMTP Auth settings
 #mail.smtp.auth.user=

framework/entity/config/entityengine.xml

@@ -38,7 +38,7 @@ access. For a detailed description see the core/docs/entityconfig.html file.
     </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 @@ access. For a detailed description see the core/docs/entityconfig.html file.
     <!-- 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 @@ access. For a detailed description see the core/docs/entityconfig.html file.
 
     <!-- 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" 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 name="other" entity-model-reader="main" entity-group-reader="main" entity-eca-reader="main">
+        <group-map group-name="org.ofbiz" datasource-name="localpostgres"/>        
     </delegator>
 
     <!-- need to at least define a name for each component to use -->
@@ -91,7 +90,7 @@ access. For a detailed description see the core/docs/entityconfig.html file.
     <entity-data-reader name="ext"/>
     <entity-data-reader name="ext-test"/>
     <entity-data-reader name="ext-demo"/>
-
+    
     <field-type name="hsql" loader="fieldfile" location="fieldtypehsql.xml"/>
     <field-type name="derby" loader="fieldfile" location="fieldtypederby.xml"/>
     <field-type name="cloudscape" loader="fieldfile" location="fieldtypecloudscape.xml"/>
@@ -190,7 +189,6 @@ access. For a detailed description see the core/docs/entityconfig.html file.
             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"
@@ -348,7 +346,7 @@ access. For a detailed description see the core/docs/entityconfig.html file.
         <read-data reader-name="ext"/>
         <inline-jdbc
                 jdbc-driver="org.postgresql.Driver"
-                jdbc-uri="jdbc:postgresql://127.0.0.1:5434/ofbizRun"
+                jdbc-uri="jdbc:postgresql://127.0.0.1/ofbiz"
                 jdbc-username="ofbiz"
                 jdbc-password="ofbiz"
                 isolation-level="ReadCommitted"
@@ -470,7 +468,7 @@ access. For a detailed description see the core/docs/entityconfig.html file.
         <!-- <jndi-jdbc jndi-server-name="default" jndi-name="comp/env/jdbc/xa/localfirebird" isolation-level="ReadCommitted"/> --> <!-- Orion Style JNDI name -->
         <!-- <tyrex-dataSource dataSource-name="firebird" isolation-level="ReadCommitted"/> Â -->
     </datasource>
-    <!--
+    <!-- 
      The following has been tested with SQL Server 2005 + MS SQL Server JDBC Driver 1.1
      Tips:
       1. Make sure your SQL Server has mixed mode authentication as per this post:
@@ -479,13 +477,13 @@ access. For a detailed description see the core/docs/entityconfig.html file.
       3. Make sure you have installed JDBC Driver XA support as per MSSQL_JDBC_HOME/enu/xa/xa_install.sql
       4. Make sure that you have created and authorized the ofbiz database and login
       5. Make sure that schema-name, jdbc-username, jdbc-password and databaseName are all correct!
-
+     
      Notes:
      a. The reason for putting SelectMethod=cursor property in URL is explained here:
       http://forum.java.sun.com/thread.jspa?forumID=48&threadID=184797
      b. If using an old version of the driver, beware of this resource leak:
       http://support.microsoft.com/kb/820773/
-    -->
+    --> 
     <datasource name="localmssql"
             helper-class="org.ofbiz.entity.datasource.GenericHelperDAO"
             schema-name="dbo"

framework/webapp/config/url.properties

@@ -22,11 +22,11 @@
 
 # HTTPS Port (Secure port)
 port.https.enabled=Y
-port.https=18443
+port.https=8443
 force.https.host=
 
 # HTTP Port (Not Secure port)
-port.http=18080
+port.http=8080
 force.http.host=
 
 # Static Content URLs to make it easy to move the serving load for static content to other machines