svn commit: r986641 - in /ofbiz/branches/jquery: .project applications/product/config/shipment.properties framework/base/config/ofbiz-containers.xml framework/webapp/config/url.properties

Author: jleroux
Date: Wed Aug 18 12:12:50 2010
New Revision: 986641

URL: http://svn.apache.org/viewvc?rev=986641&view=rev
Log:
Oops, some unwanted changes slipped in

Modified:
    ofbiz/branches/jquery/.project
    ofbiz/branches/jquery/applications/product/config/shipment.properties
    ofbiz/branches/jquery/framework/base/config/ofbiz-containers.xml
    ofbiz/branches/jquery/framework/webapp/config/url.properties

Modified: ofbiz/branches/jquery/.project
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/.project?rev=986641&r1=986640&r2=986641&view=diff
==============================================================================
--- ofbiz/branches/jquery/.project (original)
+++ ofbiz/branches/jquery/.project Wed Aug 18 12:12:50 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-    <name>ami</name>
+    <name>ofbiz</name>
     <comment></comment>
     <projects>
     </projects>

Modified: ofbiz/branches/jquery/applications/product/config/shipment.properties
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/config/shipment.properties?rev=986641&r1=986640&r2=986641&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/config/shipment.properties (original)
+++ ofbiz/branches/jquery/applications/product/config/shipment.properties Wed Aug 18 12:12:50 2010
@@ -189,11 +189,10 @@ shipment.template.fedex.ship.location=co
 shipment.template.fedex.subscription.location=component://product/templates/shipment/FedexSubscriptionRequestTemplate.xml.ftl
 
 # Credentials
-# AMI test key FwWX3ONaajR1z4pz
-shipment.fedex.access.accountNbr=510087380
-shipment.fedex.access.meterNumber=118518275
-shipment.fedex.access.userCredential.key=rlhowell77
-shipment.fedex.access.userCredential.password=fedex123
+shipment.fedex.access.accountNbr=
+shipment.fedex.access.meterNumber=
+shipment.fedex.access.userCredential.key=
+shipment.fedex.access.userCredential.password=
 
 # Connection details
 # https://gatewaybeta.fedex.com/GatewayDC - Test URL

Modified: ofbiz/branches/jquery/framework/base/config/ofbiz-containers.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/config/ofbiz-containers.xml?rev=986641&r1=986640&r2=986641&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/base/config/ofbiz-containers.xml (original)
+++ ofbiz/branches/jquery/framework/base/config/ofbiz-containers.xml Wed Aug 18 12:12:50 2010
@@ -38,14 +38,14 @@ under the License.
     <!-- 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="31099"/>
+        <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="31099"/>
+        <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 +196,7 @@ under the License.
             <property name="maxThreads" value="100"/>
             <property name="minSpareThreads" value="4"/>
             <property name="noCompressionUserAgents" value=""/>
-            <property name="port" value="38080"/>
+            <property name="port" value="8080"/>
             <property name="restrictedUserAgents" value=""/>
             <property name="server" value=""/>
             <property name="socketBuffer" value="9000"/>
@@ -234,7 +234,7 @@ under the License.
             <property name="maxThreads" value="100"/>
             <property name="minSpareThreads" value="4"/>
             <property name="noCompressionUserAgents" value=""/>
-            <property name="port" value="38443"/>
+            <property name="port" value="8443"/>
             <property name="restrictedUserAgents" value=""/>
             <property name="server" value=""/>
             <property name="socketBuffer" value="9000"/>
@@ -267,7 +267,7 @@ under the License.
     <!-- 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="39990"/>
+        <property name="telnet-port" value="9990"/>
         <property name="app-name" value="OFBiz"/>
     </container>
 </ofbiz-containers>

Modified: ofbiz/branches/jquery/framework/webapp/config/url.properties
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webapp/config/url.properties?rev=986641&r1=986640&r2=986641&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webapp/config/url.properties (original)
+++ ofbiz/branches/jquery/framework/webapp/config/url.properties Wed Aug 18 12:12:50 2010
@@ -22,11 +22,11 @@
 
 # HTTPS Port (Secure port)
 port.https.enabled=Y
-port.https=38443
+port.https=8443
 force.https.host=
 
 # HTTP Port (Not Secure port)
-port.http=38080
+port.http=8080
 force.http.host=
 
 # Static Content URLs to make it easy to move the serving load for static content to other machines