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 2013/09/28 10:06:24 UTC

svn commit: r1527165 - in /ofbiz/trunk/specialpurpose: ebay/data/ ebaystore/data/ ebaystore/src/org/ofbiz/ebaystore/ googlebase/config/ googlebase/data/

Author: jleroux
Date: Sat Sep 28 08:06:24 2013
New Revision: 1527165

URL: http://svn.apache.org/r1527165
Log:
Replaces http://demo.ofbiz.org by https://demo-trunk.ofbiz.apache.org

Modified:
    ofbiz/trunk/specialpurpose/ebay/data/DemoEbayData.xml
    ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml
    ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java
    ofbiz/trunk/specialpurpose/googlebase/config/autoUpdateToGoogleBase.properties
    ofbiz/trunk/specialpurpose/googlebase/data/DemoGoogleBaseData.xml

Modified: ofbiz/trunk/specialpurpose/ebay/data/DemoEbayData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/data/DemoEbayData.xml?rev=1527165&r1=1527164&r2=1527165&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/data/DemoEbayData.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/data/DemoEbayData.xml Sat Sep 28 08:06:24 2013
@@ -20,7 +20,7 @@ under the License.
 
 <entity-engine-xml>
     <ProductStore productStoreId="9000"/>
-    <WebSite webSiteId="EBAY" siteName="eBay" standardContentPrefix="http://demo.ofbiz.org" productStoreId="9000"/>
+    <WebSite webSiteId="EBAY" siteName="eBay" standardContentPrefix="http://demo-trunk.ofbiz.apache.org" productStoreId="9000"/>
     <EbayConfig productStoreId="9000" devId="ppodkYk34Kh-279a-6khr-a07c-06fd1d65824b" appId="ApacheOFB-bf44-4c32-ac45-3e099a32b675" certId="99ca5f9f-dd5c-3de-9a4c-13b247ieidfg" compatibilityLevel="635" siteId="0" xmlGatewayUri="https://api.sandbox.ebay.com/ws/api.dll" webSiteId="EBAY">
         <token><![CDATA[APACHEeerer**AQresT**aOFBIZ**Dddddg**nY+sHZ2PrBmdj6wVnY+sEZ2PrA2dj6wFddddddddsssererdafjk23232uy+seQ**IzABAA**AAMAAA**6kOEMXRyvyVRLt7vAL7W+5dfjdkfjkldfjlkdjfldj121219fjlkdfjldjf+oRU0d07B0jfdFxJj6OolPHiQN5c0qmVNDRsSKaOucPjXTHSBmVm62p7M9/YmRCag/Mz1DjvDTFyS1kaBinGH2lwd9AjcBSBUbD9tSZVTdKn5PQBh3kkCh5Fe+UK5fyq9OeikM/Bdfafja377dkdkBddDDll+zPbG8pYL13cBgCGj8/zzMSGX2ugZkbU01bCLKkTzLOSqIcxj9xgJ4uDHxhjjizyWlHd2ovFKP8mmc/bEjLANUqS1z0vhR0NHydU/izZR8eYAruTvX6eYzSfsZA85sVOpIAjVEYX9M4CqgXazYxDFAT+y7E4+oM9N+tx8+/dkdkfdoTTKdHhdlKwVmgdULRhW0nP04BMugLpRCQrITSVpSJ1mfkwwb4JEQRNwSSUOe/1P3t21JhUBj3OJjpwC1ds84DSh9nlyykxF3X+EfFxtE4rTKUO+fODRDD5FBDO2+TD3AROz/3u/OWOvTWUm13u2kxMiiEQ3DNkuxN4g7Gj5xhKk7uNMIRRM8YoxoDoiJnbvuLQctBtpn1vibjUJsxTlnq92PLOhsgkp2NfhcxzS1JJfDKX1snOkmWfiluqyW5oDayJoZnrHIVKD0RkYNd2h+U5DOyOJ2/YXYIAPJAcWloGLpKO7k]]></token>
         <customXml><![CDATA[<custom-xml><Currency>USD</Currency><UseTaxTable>false</UseTaxTable><DispatchTimeMax>3</DispatchTimeMax><ReturnPolicy><ReturnsAcceptedOption>ReturnsNotAccepted</ReturnsAcceptedOption></ReturnPolicy><ShippingDetails><ShippingType>Flat</ShippingType><ShippingServiceOptions><ShippingService>UPS2ndDay</ShippingService><ShippingServicePriority>1</ShippingServicePriority><ShippingServiceCost>5</ShippingServiceCost><ShippingServiceAdditionalCost>2</ShippingServiceAdditionalCost><ShippingSurcharge>1</ShippingSurcharge></ShippingServiceOptions></ShippingDetails></custom-xml>]]></customXml>

Modified: ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml?rev=1527165&r1=1527164&r2=1527165&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml Sat Sep 28 08:06:24 2013
@@ -43,7 +43,7 @@
     <ProductStoreCatalog productStoreId="90101" prodCatalogId="eBayCatalog" fromDate="2010-01-01 16:19:47.058"/>
     <ProductStoreFacility productStoreId="90101" facilityId="WebStoreWarehouse" fromDate="2010-01-01 16:19:47.058"/>
 
-    <WebSite webSiteId="EBAY_STORE1" siteName="eBay Store1" standardContentPrefix="http://demo.ofbiz.org" productStoreId="90101"/>
+    <WebSite webSiteId="EBAY_STORE1" siteName="eBay Store1" standardContentPrefix="http://demo-trunk.ofbiz.apache.org" productStoreId="90101"/>
     <EbayConfig productStoreId="90101" devId="9f4e7862-1396-4ce3-a1e4-3eaf287ea930" appId="Company0-cd63-4e3c-83f6-d426f7d92f6f" certId="bf73e23e-f04b-4fbc-88f9-da6952a8150d" compatibilityLevel="643" siteId="0" xmlGatewayUri="https://api.sandbox.ebay.com/ws/api.dll"  apiServerUrl="https://api.sandbox.ebay.com/wsapi"  webSiteId="EBAY_STORE1">
         <token><![CDATA[AgAAAA**AQAAAA**aAAAAA**ip+5Sw**nY+sHZ2PrBmdj6wVnY+sEZ2PrA2dj6wFk4CoAJGCqAydj6x9nY+seQ**PkwBAA**AAMAAA**J0SbAVqPUlahSPGG9MiqBFBewiqcQ5249jACRMmke/XoqR0m0CgFR7qtleDZVbC9Y4NYwsO8ZQE7pNi8lE5LaBtUgfeGFq5sygZ3V0X/s7mNljhieX54GvgUw1AsMn3CIuE5wYDQfrdFtga6mYcPUTS+HgmnGSGhhxhSEYPOv2kR5id7+deNgsvLtgEQT9rWhMmDf9GZMLJsiRqAy86spRVFjROhTapwTRbuLf4YDQc8iv4hu9Q7V6wZTpbxL3tvmW1VNnMo4V8dUDy47nh1pEVF7px6+Mi80ADE3+uGlFHpCIG4POWXMXa3Q/v2jq0AEidK9Aw79+CcrwVumfH8bfka5sxGjJ1Jszr8txzfbS/Ns3n9ITlMcW8UxglP/VUV7jWAK2e0tmwlzthVdDbR8O21oKyczHkOIQcdm9ANLjK9/HBwjCO9Rp4tge3qFp3UMTtexTHWjrbbmVaaNcHS6upcGVmJp8VvT5y0HrFD8RUGHF2DChJbAbHkmnCmf8N9iytlSTVwjYy4ksEr0u0OHr2uLidAD8oOOZBntKKe4PHJUiZusMG/uW/QbSV1UTxgDPTfxTjWO1TiYqT27UkPpKztEvAYi+865ayy9ET9Ys1jtk4VwCcFkfOKDbvtNwXwRvc3R4dixWahV/WobUKM7qqY8s0xdJw1MwZ95udHK3tz0ChyC1p3ww92V7cFcabkbODDUJdjblHVQW+hzTHt1J/jZdkJupbmDDKfZcru1hbSQOqT7bl+pifbnDZ/uqiE]]></token>
         <customXml><![CDATA[<custom-xml><Currency>USD</Currency><UseTaxTable>false</UseTaxTable><DispatchTimeMax>3</DispatchTimeMax><ReturnPolicy><ReturnsAcceptedOption>ReturnsNotAccepted</ReturnsAcceptedOption></ReturnPolicy><ShippingDetails><ShippingType>Flat</ShippingType><ShippingServiceOptions><ShippingService>UPS2ndDay</ShippingService><ShippingServicePriority>1</ShippingServicePriority><ShippingServiceCost>5</ShippingServiceCost><ShippingServiceAdditionalCost>2</ShippingServiceAdditionalCost><ShippingSurcharge>1</ShippingSurcharge></ShippingServiceOptions></ShippingDetails></custom-xml>]]></customXml>
@@ -123,7 +123,7 @@
     <ProductStoreCatalog productStoreId="90102" prodCatalogId="eBayCatalog" fromDate="2010-01-01 16:19:47.058"/>
     <ProductStoreFacility productStoreId="90102" facilityId="WebStoreWarehouse" fromDate="2010-01-01 16:19:47.058"/>
 
-    <WebSite webSiteId="EBAY_STORE2" siteName="eBay Store2" standardContentPrefix="http://demo.ofbiz.org" productStoreId="90102"/>
+    <WebSite webSiteId="EBAY_STORE2" siteName="eBay Store2" standardContentPrefix="http://demo-trunk.ofbiz.apache.org" productStoreId="90102"/>
     <EbayConfig productStoreId="90102" devId="63655096-de90-4e82-bae4-67566f15bf53" appId="Company0-9f43-4ad4-96f7-19753fbc4e8d" certId="57a28c38-d491-4236-b702-a87e1d10e9a2" compatibilityLevel="643" siteId="0" xmlGatewayUri="https://api.sandbox.ebay.com/ws/api.dll"  apiServerUrl="https://api.sandbox.ebay.com/wsapi"  webSiteId="EBAY_STORE2">
         <token><![CDATA[AgAAAA**AQAAAA**aAAAAA**xaa5Sw**nY+sHZ2PrBmdj6wVnY+sEZ2PrA2dj6wFk4CoAJGCqA6dj6x9nY+seQ**QkwBAA**AAMAAA**Gw+sbEXV/KlY0mtzVtkoyvyI/cqJTPLFljiknR9nqxJIB+lxOif0atqUMsOFqTz8Kvqc7F3Ri7JK5jPOaNyxW0+MKeKMoOcWTUTav4kmvTdeqdVLUi6kAtttD6uK/kRN1CyBqe3e9xd7GLLPedOyrtoB0j7mS1sMyu2uPCyeY/QROIxR8ljRSjmcGUco1STOmZ0bqlEudZ+FBKjLxigbnY15I2m09lEOMfmCIIs02im2wp+EPcin72wMMo+RP++Dfl/pL1tYntCEimHJilAtJsAarSUTyXbOwEqG47/jX2u+XXXjF3xlcAwP/i/P4G+qf4NbWOlZY2BrNuOZJw4PRYPMuBgfcAUnHnS7aw/eXlJ0FCCJVgSIwJdTXbQCI5SjluFWGHvC7zsCgqV0AzT6VozlY//2wJTX4RL/b5+O04DkVUtce0/bhkzXPssEOUaVKka97+89zhwuGPjTqBO8+HnAxHVMrKZPcxn2brU4zIi4K7D94zPTfOQfYfRuPmvpsTojmBgLqYABXAOStKKGzT+4EJ0m6qPVV7/frzwTmNj28+SfJOy1LgnvRKMu6+tv6ZBxGbK4aAjot/MV+8arhYEuq0U2x/laCJhfuYAKGW+AZHCDVEhEMGN6VOgHe6X0qymiQKwZaWM3VztThnczYp9GFmiEwlJqtRJvHxVdyVrvWaUxgF4eIQzHAaVjLmXT/3szBapbuO52Q7z/wdjez1rLraqqKDXJsJxuwLIUNuXGkLOgkIYUNTFGcix0u0yJ]]></token>
         <customXml><![CDATA[<custom-xml><Currency>USD</Currency><UseTaxTable>false</UseTaxTable><DispatchTimeMax>3</DispatchTimeMax><ReturnPolicy><ReturnsAcceptedOption>ReturnsNotAccepted</ReturnsAcceptedOption></ReturnPolicy><ShippingDetails><ShippingType>Flat</ShippingType><ShippingServiceOptions><ShippingService>UPS2ndDay</ShippingService><ShippingServicePriority>1</ShippingServicePriority><ShippingServiceCost>5</ShippingServiceCost><ShippingServiceAdditionalCost>2</ShippingServiceAdditionalCost><ShippingSurcharge>1</ShippingSurcharge></ShippingServiceOptions></ShippingDetails></custom-xml>]]></customXml>

Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java?rev=1527165&r1=1527164&r2=1527165&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java Sat Sep 28 08:06:24 2013
@@ -173,7 +173,7 @@ public class EbayEvents {
 
         ApiContext apiContext = EbayStoreHelper.getApiContext(productStoreId, locale, delegator);
         //String webSiteUrl = (String) requestParams.get("webSiteUrl");
-        String webSiteUrl = "http://demo.ofbiz.org";
+        String webSiteUrl = "http://demo-trunk.ofbiz.apache.org";
         Map<String,Object> addItemObject = getAddItemListingObject(request, apiContext);
         List<Map<String,Object>> itemObjs = null;
         if (UtilValidate.isNotEmpty(addItemObject.get("itemListings"))) {

Modified: ofbiz/trunk/specialpurpose/googlebase/config/autoUpdateToGoogleBase.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/config/autoUpdateToGoogleBase.properties?rev=1527165&r1=1527164&r2=1527165&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/config/autoUpdateToGoogleBase.properties (original)
+++ ofbiz/trunk/specialpurpose/googlebase/config/autoUpdateToGoogleBase.properties Sat Sep 28 08:06:24 2013
@@ -38,8 +38,8 @@ autoUpdateGoogleBase.productStore.option
 autoUpdateGoogleBase.productStore.option.backInStock=Y
 
 # productStore.webSiteUrl of productStore; if null, it will get from standardContentPrefix field of WebSite entity
-# default value: http://demo.ofbiz.org
-autoUpdateGoogleBase.productStore.webSiteUrl=http://demo.ofbiz.org
+# default value: http://demo-trunk.ofbiz.apache.org
+autoUpdateGoogleBase.productStore.webSiteUrl=http://demo-trunk.ofbiz.apache.org
 # productStore.actionType including: "insert", "update", "delete"
 # default value: "insert"
 autoUpdateGoogleBase.productStore.actionType=insert

Modified: ofbiz/trunk/specialpurpose/googlebase/data/DemoGoogleBaseData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/data/DemoGoogleBaseData.xml?rev=1527165&r1=1527164&r2=1527165&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/data/DemoGoogleBaseData.xml (original)
+++ ofbiz/trunk/specialpurpose/googlebase/data/DemoGoogleBaseData.xml Sat Sep 28 08:06:24 2013
@@ -19,6 +19,6 @@ under the License.
 -->
 
 <entity-engine-xml>
-    <WebSite webSiteId="GOOGLEBASE" standardContentPrefix="http://demo.ofbiz.org" productStoreId="9000" />
+    <WebSite webSiteId="GOOGLEBASE" standardContentPrefix="http://demo-trunk.ofbiz.apache.org" productStoreId="9000" />
     <GoogleBaseConfig productStoreId="9000" developerKey="HKLh9khgVieditoO0b4JR2fnBT2yXp_ZAY8_yft3CFXhHIE1NvwkxQ1pZ4qyVEGh_FtRe5KtJPTKDorNP" authenticationUrl="https://www.google.com/accounts/ClientLogin" accountEmail="ofbiztest@example.com" accountPassword="47b56994cbc2b6d10aa1be30f70165adb305a41a" postItemsUrl="http://www.google.com/base/feeds/items/batch" webSiteId="GOOGLEBASE"/>       
 </entity-engine-xml>