svn commit: r900321 - in /ofbiz/trunk: ./ specialpurpose/ebay/ specialpurpose/ebay/config/ specialpurpose/ebay/data/ specialpurpose/ebay/entitydef/ specialpurpose/ebay/lib/ specialpurpose/ebay/script/ specialpurpose/ebay/servicedef
Locked
svn commit: r900321 - in /ofbiz/trunk: ./ specialpurpose/ebay/ specialpurpose/ebay/config/ specialpurpose/ebay/data/ specialpurpose/ebay/entitydef/ specialpurpose/ebay/lib/ specialpurpose/ebay/script/ specialpurpose/ebay/servicedef
 
|
Author: hansbak
Date: Mon Jan 18 09:58:26 2010 New Revision: 900321 URL: http://svn.apache.org/viewvc?rev=900321&view=rev Log: reverting 900298: wrong version of files, correction will follow, sorry for the inconveniance Removed: ofbiz/trunk/specialpurpose/ebay/lib/ ofbiz/trunk/specialpurpose/ebay/script/ ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayStore.java ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayStoreOptions.java ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/store/ ofbiz/trunk/specialpurpose/ebay/webapp/ebay/store/ ofbiz/trunk/specialpurpose/ebay/widget/EbayStoreForms.xml Modified: ofbiz/trunk/.classpath ofbiz/trunk/LICENSE ofbiz/trunk/specialpurpose/ebay/build.xml ofbiz/trunk/specialpurpose/ebay/config/ebayExport.properties ofbiz/trunk/specialpurpose/ebay/data/DemoEbayData.xml ofbiz/trunk/specialpurpose/ebay/data/EbayTypeData.xml ofbiz/trunk/specialpurpose/ebay/entitydef/entitymodel.xml ofbiz/trunk/specialpurpose/ebay/ofbiz-component.xml ofbiz/trunk/specialpurpose/ebay/servicedef/services.xml ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml Modified: ofbiz/trunk/.classpath URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=900321&r1=900320&r2=900321&view=diff ============================================================================== --- ofbiz/trunk/.classpath (original) +++ ofbiz/trunk/.classpath Mon Jan 18 09:58:26 2010 @@ -171,10 +171,6 @@ <classpathentry kind="lib" path="specialpurpose/pos/lib/jcl.jar"/> <classpathentry kind="lib" path="specialpurpose/pos/lib/jpos18-controls.jar"/> <classpathentry kind="lib" path="specialpurpose/pos/lib/looks-2.0.2.jar"/> - <classpathentry kind="lib" path="specialpurpose/ebay/lib/attributes.jar"/> - <classpathentry kind="lib" path="specialpurpose/ebay/lib/ebaycalls.jar"/> - <classpathentry kind="lib" path="specialpurpose/ebay/lib/ebaysdkcore.jar"/> - <classpathentry kind="lib" path="specialpurpose/ebay/lib/helper.jar"/> <classpathentry kind="src" path="applications/accounting/src" excluding="org/ofbiz/accounting/thirdparty/cybersource/**|org/ofbiz/accounting/thirdparty/verisign/**|org/ofbiz/accounting/thirdparty/worldpay/**|org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java|org/ofbiz/accounting/thirdparty/orbital/**"/> <classpathentry kind="src" path="applications/content/src" excluding="org/ofbiz/content/openoffice/|org/ofbiz/content/report/"/> <classpathentry kind="src" path="applications/manufacturing/src"/> Modified: ofbiz/trunk/LICENSE URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=900321&r1=900320&r2=900321&view=diff ============================================================================== --- ofbiz/trunk/LICENSE (original) +++ ofbiz/trunk/LICENSE Mon Jan 18 09:58:26 2010 @@ -1990,10 +1990,6 @@ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL): ofbiz/trunk/framework/base/lib/juel-2.1.1.jar (contains the javax.el package) ofbiz/trunk/framework/base/lib/mail.jar -ofbiz/trunk/specialpurpose/ebay/lib/attributes.jar -ofbiz/trunk/specialpurpose/ebay/lib/ebaysdkcore.jar -ofbiz/trunk/specialpurpose/ebay/lib/helper.jar -ofbiz/trunk/specialpurpose/ebay/lib/ebaycalls.jar ========================================================================= COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 1. Modified: ofbiz/trunk/specialpurpose/ebay/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/build.xml?rev=900321&r1=900320&r2=900321&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/build.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/build.xml Mon Jan 18 09:58:26 2010 @@ -29,7 +29,6 @@ <property name="name" value="ofbiz-ebay"/> <path id="local.class.path"> - <fileset dir="${lib.dir}" includes="*.jar"/> <fileset dir="../../framework/base/lib" includes="*.jar"/> <fileset dir="../../framework/base/lib/commons" includes="*.jar"/> <fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/> Modified: ofbiz/trunk/specialpurpose/ebay/config/ebayExport.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/config/ebayExport.properties?rev=900321&r1=900320&r2=900321&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/config/ebayExport.properties (original) +++ ofbiz/trunk/specialpurpose/ebay/config/ebayExport.properties Mon Jan 18 09:58:26 2010 @@ -30,7 +30,6 @@ eBayExport.siteID=0 # sandbox eBayExport.xmlGatewayUri=https://api.sandbox.ebay.com/ws/api.dll -eBayExport.apiServerUrl=https://api.sandbox.ebay.com/wsapi # production #eBayExport.xmlGatewayUri=https://api.ebay.com/ws/api.dll Modified: ofbiz/trunk/specialpurpose/ebay/data/DemoEbayData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/data/DemoEbayData.xml?rev=900321&r1=900320&r2=900321&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/data/DemoEbayData.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/data/DemoEbayData.xml Mon Jan 18 09:58:26 2010 @@ -1,31 +1,31 @@ <?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. +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. --> <entity-engine-xml> <ProductStore productStoreId="9000"/> <WebSite webSiteId="EBAY" siteName="eBay" standardContentPrefix="http://demo.ofbiz.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" apiServerUrl="https://api.sandbox.ebay.com/wsapi" webSiteId="EBAY"> + <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> </EbayConfig> - + <EbayShippingMethod methodTypeEnumId="EBAY_FLAT_RATE" shipmentMethodName="USPSPriority" productStoreId="9000" amount="20.00" carrierPartyId="USPS" shipmentMethodTypeId="STANDARD"/> <EbayShippingMethod methodTypeEnumId="EBAY_FLAT_RATE" shipmentMethodName="UPSGround" productStoreId="9000" amount="10.00" carrierPartyId="UPS" shipmentMethodTypeId="GROUND"/> <EbayShippingMethod methodTypeEnumId="EBAY_FLAT_RATE" shipmentMethodName="UPS3rdDay" productStoreId="9000" amount="0.00" carrierPartyId="UPS" shipmentMethodTypeId="THIRD_DAY"/> @@ -36,32 +36,5 @@ <EbayShippingMethod methodTypeEnumId="EBAY_FLAT_RATE" shipmentMethodName="ShippingMethodStandard" productStoreId="9000" amount="10.00" carrierPartyId="UPS" shipmentMethodTypeId="GROUND"/> <EbayShippingMethod methodTypeEnumId="EBAY_FLAT_RATE" shipmentMethodName="StandardInternational" productStoreId="9000" amount="0.00" carrierPartyId="USPS" shipmentMethodTypeId="INT_EXPRESS"/> <EbayShippingMethod methodTypeEnumId="EBAY_FLAT_RATE" shipmentMethodName="LocalDelivery" productStoreId="9000" amount="0.00" carrierPartyId="_NA_" shipmentMethodTypeId="STANDARD"/> - - - <!-- Ebay Store Demo Data --> - <RoleType roleTypeId="EBAY_ACCOUNT" hasTable="N" description="eBay Account"/> - <Party partyId="esandbox10543" partyTypeId="PERSON"/> - <Person partyId="esandbox10543" firstName="Demo ebay account" lastName="USA"/> - <PartyRole partyId="esandbox10543" roleTypeId="EBAY_ACCOUNT"/> - <UserLogin userLoginId="esandbox10543" partyId="esandbox10543" currentPassword="{SHA}bbf272ce445e1c48d94096afdba6a7888c1df1fe"/> - <ProductStore productStoreId="esandbox10543_store" storeName="OFBiz Ebay Store-USA" companyName="Apache OFBiz" title="Test esandbox10543 store" - subtitle="Part of the Open For Business Family of Open Source Software" payToPartyId="esandbox10543" daysToCancelNonPay="30" prorateShipping="Y" prorateTaxes="Y" - inventoryFacilityId="WebStoreWarehouse" oneInventoryFacility="Y" checkInventory="Y" reserveInventory="Y" balanceResOnOrderCreation="Y" reserveOrderEnumId="INVRO_FIFO_REC" requireInventory="N" - defaultLocaleString="en_US" defaultCurrencyUomId="USD" defaultSalesChannelEnumId="EBAY_SALES_CHANNEL" allowPassword="Y" explodeOrderItems="N" retryFailedAuths="Y" reqReturnInventoryReceive="N" - headerApprovedStatus="ORDER_APPROVED" itemApprovedStatus="ITEM_APPROVED" digitalItemApprovedStatus="ITEM_APPROVED" headerDeclinedStatus="ORDER_REJECTED" - itemDeclinedStatus="ITEM_REJECTED" headerCancelStatus="ORDER_CANCELLED" itemCancelStatus="ITEM_CANCELLED" orderNumberPrefix="WS" - authDeclinedMessage="There has been a problem with your method of payment. Please try a different method or call customer service." - authFraudMessage="Your order has been rejected and your account has been disabled due to fraud." - authErrorMessage="Problem connecting to payment processor; we will continue to retry and notify you by email." - storeCreditValidDays="90" storeCreditAccountEnumId="FIN_ACCOUNT" - visualThemeId="EC_DEFAULT" prodSearchExcludeVariants="Y" autoApproveInvoice="Y" shipIfCaptureFails="Y" autoApproveOrder="Y" showOutOfStockProducts="Y"/> - <ProductStoreRole partyId="esandbox10543" roleTypeId="EBAY_ACCOUNT" productStoreId="esandbox10543_store" fromDate="2010-01-01 16:19:47.058"/> - <ProductStoreCatalog productStoreId="esandbox10543_store" prodCatalogId="eBayCatalog" fromDate="2010-01-01 16:19:47.058"/> - - <WebSite webSiteId="EBAY" siteName="eBay" standardContentPrefix="http://demo.ofbiz.org" productStoreId="esandbox10543_store"/> - <EbayConfig productStoreId="esandbox10543_store" devId="f3586481-93c7-4aaf-ab87-d383d56b71b1" appId="antwebc0f-9bf9-4829-998b-e5e8fb773ac" certId="7f363bc0-11d6-489a-a54d-4a44de82f790" compatibilityLevel="643" siteId="0" xmlGatewayUri="https://api.sandbox.ebay.com/ws/api.dll" apiServerUrl="https://api.sandbox.ebay.com/wsapi" webSiteId="EBAY"> - <token><![CDATA[AgAAAA**AQAAAA**aAAAAA**PC5MSw**nY+sHZ2PrBmdj6wVnY+sEZ2PrA2dj6wJnY+lCZiGoA2dj6x9nY+seQ**0jgBAA**AAMAAA**YxqcpdWbgFwYg1G+3AhOonR2/yllz3IJ5VoJyU75texuETwabGgsN4f6OfeBGWejUx10heCKG7wcM4JI+Fqk8Zg64L51JL3/Vm7dYo8VHd8wfixWIdMmhheYFwOdBtxcTb93NLeJa6uxvBJYrSS7O0RcQ3KPhOVJvt7KfVT009o2/02tuX7vbMoHV+Meszli4eVAnB9Fbt6ag2nq46+2/AzMIO4rZE23ozLfh6c4W+QkD6BcaFzLmhVE+7Ni9y7y26QHfUUdjBOEF6ewLpZJsSIoQZC9y4J/yF15Ann9NiamtmFj5IeX4uNIKegEt8EwFSqtpxjgVngcAmMaM8/hk9uQVnFKHTjhK3koUrT7zu/+tk2twJfGF9odb+/5uTVJZ8Lywl/LwEdadv2wjpTdQqHF2bV84cSRhOKrlsYr9xFqgqNDpnmCFXkQKGhycWzMzxcBmiRT5VXJfBjbTGGdmfAf7TVcoU/4C3F3kvzEJhcxU9WbMvj58TmW+VvYS7oy4kOyTiyr3alkz/+HJYGIuttnkzqsIVIPaSXyyuFNWQmQL+0GlJ1n7EoKCevuVsTYgayQEN39TPeXg8ADmf5Pf19BlPxRFNkKvANxE0k3ac+whUwpkfBgx6lApOcwKQMXioi7NrN3MROL/1qrO2+N5sl4kr9nbuvEk9mPDJnmNdB7lzgoESo+se3ZmY9KJ6v08uQ02N1/SjHtmeiojayaR/DqeJiFSoAnU4winzA5GQGNjzEHUpSf1Kj+IZudhT9r]]></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> - </EbayConfig> - + </entity-engine-xml> Modified: ofbiz/trunk/specialpurpose/ebay/data/EbayTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/data/EbayTypeData.xml?rev=900321&r1=900320&r2=900321&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/data/EbayTypeData.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/data/EbayTypeData.xml Mon Jan 18 09:58:26 2010 @@ -24,8 +24,5 @@ <ProductContentType productContentTypeId="EBAY_DESCRIPTION" description="Detail Page for eBay Auctions"/> <EnumerationType description="Ebay Ship Types" enumTypeId="EBAY_SHIP_TYPE" hasTable="N" parentTypeId=""/> - <Enumeration description="Flat Rate Shipping" enumCode="FLAT_RATE" enumId="EBAY_FLAT_RATE" sequenceId="01" enumTypeId="EBAY_SHIP_TYPE"/> - - <RoleType roleTypeId="COMMENTATOR" hasTable="N" description="Commentator"/> - <RoleType roleTypeId="EBAY_ORGANIZATION" hasTable="N" description="eBay Organization"/> + <Enumeration description="Flat Rate Shipping" enumCode="FLAT_RATE" enumId="EBAY_FLAT_RATE" sequenceId="01" enumTypeId="EBAY_SHIP_TYPE"/> </entity-engine-xml> Modified: ofbiz/trunk/specialpurpose/ebay/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/entitydef/entitymodel.xml?rev=900321&r1=900320&r2=900321&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/entitydef/entitymodel.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/entitydef/entitymodel.xml Mon Jan 18 09:58:26 2010 @@ -51,7 +51,6 @@ <field name="compatibilityLevel" type="id"></field> <field name="siteId" type="id"></field> <field name="xmlGatewayUri" type="value"></field> - <field name="apiServerUrl" type="value"></field> <field name="customXml" type="very-long"></field> <field name="webSiteId" type="id-ne"></field> <prim-key field="productStoreId"/> Modified: ofbiz/trunk/specialpurpose/ebay/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/ofbiz-component.xml?rev=900321&r1=900320&r2=900321&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/ofbiz-component.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/ofbiz-component.xml Mon Jan 18 09:58:26 2010 @@ -23,7 +23,6 @@ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd"> <resource-loader name="main" type="component"/> <classpath type="dir" location="config"/> - <classpath type="jar" location="lib/*"/> <classpath type="jar" location="build/lib/*"/> <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/> Modified: ofbiz/trunk/specialpurpose/ebay/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/servicedef/services.xml?rev=900321&r1=900320&r2=900321&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/servicedef/services.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/servicedef/services.xml Mon Jan 18 09:58:26 2010 @@ -164,60 +164,4 @@ <auto-attributes include="pk" mode="IN" optional="false"/> </service> - <service name="createEbayAccount" engine="simple" - location="component://ebay/script/org/ofbiz/ebay/ebay/EbayServices.xml" invoke="createEbayAccount" auth="true"> - <attribute name="salutation" mode="IN" type="String" optional="true"/> - <attribute name="firstName" mode="IN" type="String" optional="false"/> - <attribute name="middleName" mode="IN" type="String" optional="true"/> - <attribute name="lastName" mode="IN" type="String" optional="false"/> - <attribute name="gender" mode="IN" type="String" optional="true"/> - <attribute name="userLoginId" mode="IN" type="String" optional="false"/> - <attribute name="currentPassword" mode="IN" type="String" optional="false"/> - <attribute name="currentPasswordVerify" mode="IN" type="String" optional="false"/> - <attribute name="statusId" mode="IN" type="String" optional="true"/> - <attribute name="productStoreId" mode="OUT" type="String" optional="false"/> - </service> - - <service name="exportCategoriesSelectedToEbayStore" engine="java" transaction-timeout="7200" - location="org.ofbiz.ebay.EbayStore" invoke="exportCategoriesSelectedToEbayStore" auth="true"> - <description>Export categories in store to eBay store</description> - <attribute name="productStoreId" type="String" mode="IN" optional="false"/> - <attribute name="prodCatalogId" type="String" mode="IN" optional="false"/> - <attribute name="paymentMethods" type="String" mode="IN" optional="false"/> - <attribute name="listingDuration" type="String" mode="IN" optional="false"/> - <attribute name="location" type="String" mode="IN" optional="false"/> - </service> - - <!-- Store output --> - <service name="getEbayStoreOutput" engine="java" transaction-timeout="7200" - location="org.ofbiz.ebay.EbayStore" invoke="getEbayStoreOutput" auth="true"> - <description>get ebay store description</description> - <attribute name="productStoreId" type="String" mode="IN" optional="false"/> - <attribute name="ebayStore" type="Map" mode="OUT" optional="true"/> - </service> - <service name="retrievePredesignedLogoOption" engine="java" transaction-timeout="7200" - location="org.ofbiz.ebay.EbayStore" invoke="retrievePredesignedLogoOption" auth="true"> - <description>get ebay store logos description</description> - <attribute name="productStoreId" type="String" mode="IN" optional="false"/> - <attribute name="storeLogoOptList" type="List" mode="OUT" optional="true"/> - </service> - <service name="retrieveBasicThemeArray" engine="java" transaction-timeout="7200" - location="org.ofbiz.ebay.EbayStore" invoke="retrieveBasicThemeArray" auth="true"> - <description>get ebay store Basic theme Array description</description> - <attribute name="productStoreId" type="String" mode="IN" optional="false"/> - <attribute name="storeThemeList" type="List" mode="OUT" optional="true"/> - </service> - <service name="retrieveAdvancedThemeArray" engine="java" transaction-timeout="7200" - location="org.ofbiz.ebay.EbayStore" invoke="retrieveAdvancedThemeArray" auth="true"> - <description>get ebay store Advanced theme Array description</description> - <attribute name="productStoreId" type="String" mode="IN" optional="false"/> - <attribute name="storeThemeList" type="List" mode="OUT" optional="true"/> - <attribute name="storeAdvancedThemeColorOptList" type="List" mode="OUT" optional="true"/> - </service> - <service name="retrieveStoreFontTheme" engine="java" transaction-timeout="7200" - location="org.ofbiz.ebay.EbayStore" invoke="retrieveStoreFontTheme" auth="true"> - <description>get ebay store Advanced theme Array description</description> - <attribute name="productStoreId" type="String" mode="IN" optional="false"/> - <attribute name="advanceFontTheme" type="Map" mode="OUT" optional="true"/> - </service> -</services> +</services> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java?rev=900321&r1=900320&r2=900321&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java (original) +++ ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java Mon Jan 18 09:58:26 2010 @@ -57,13 +57,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; -import com.ebay.sdk.ApiAccount; -import com.ebay.sdk.ApiContext; -import com.ebay.sdk.ApiCredential; -import com.ebay.sdk.ApiLogging; -import com.ebay.soap.eBLBaseComponents.SiteCodeType; - -public class EbayHelper { +public class EbayHelper { private static final String configFileName = "ebayExport.properties"; private static final String module = EbayHelper.class.getName(); public static final String resource = "EbayUiLabels"; @@ -81,14 +75,13 @@ return ServiceUtil.returnError(errMsg); } if (UtilValidate.isNotEmpty(eBayConfig)) { - buildEbayConfigContext.put("devId", eBayConfig.getString("devId")); + buildEbayConfigContext.put("devID", eBayConfig.getString("devId")); buildEbayConfigContext.put("appID", eBayConfig.getString("appId")); buildEbayConfigContext.put("certID", eBayConfig.getString("certId")); buildEbayConfigContext.put("token", eBayConfig.getString("token")); buildEbayConfigContext.put("compatibilityLevel", eBayConfig.getString("compatibilityLevel")); buildEbayConfigContext.put("siteID", eBayConfig.getString("siteId")); buildEbayConfigContext.put("xmlGatewayUri", eBayConfig.getString("xmlGatewayUri")); - buildEbayConfigContext.put("apiServerUrl", eBayConfig.getString("apiServerUrl")); } } else { buildEbayConfigContext.put("devID", UtilProperties.getPropertyValue(configFileName, "eBayExport.devID")); @@ -98,8 +91,7 @@ buildEbayConfigContext.put("compatibilityLevel", UtilProperties.getPropertyValue(configFileName, "eBayExport.compatibilityLevel")); buildEbayConfigContext.put("siteID", UtilProperties.getPropertyValue(configFileName, "eBayExport.siteID")); buildEbayConfigContext.put("xmlGatewayUri", UtilProperties.getPropertyValue(configFileName, "eBayExport.xmlGatewayUri")); - buildEbayConfigContext.put("apiServerUrl", UtilProperties.getPropertyValue(configFileName, "eBayExport.apiServerUrl")); - } + } return buildEbayConfigContext; } @@ -613,71 +605,4 @@ } return productId; } - - public static ApiContext getApiContext(String productStoreId,Locale locale, Delegator delegator){ - Map<String, Object> context = FastMap.newInstance(); - context.put("locale", locale); - context.put("productStoreId", productStoreId); - Map<String, Object> config = buildEbayConfig(context, delegator); - ApiCredential apiCredential = new ApiCredential(); - ApiLogging apiLogging = new ApiLogging(); - apiLogging.setEnableLogging(false); - apiLogging.setLogExceptions(false); - apiLogging.setLogSOAPMessages(false); - - String devID = (String)config.get("devId"); - String appID = (String)config.get("appID"); - String certID = (String)config.get("certID"); - String token = (String)config.get("token"); - String apiServerUrl = (String)config.get("apiServerUrl"); - - if(token != null){ - apiCredential.seteBayToken(token); - }else if(devID != null && appID != null && certID != null){ - ApiAccount apiAccount = new ApiAccount(); - apiAccount.setApplication(appID); - apiAccount.setCertificate(certID); - apiAccount.setDeveloper(devID); - apiCredential.setApiAccount(apiAccount); - } - ApiContext apiContext = new ApiContext(); - apiContext.setApiCredential(apiCredential); - apiContext.setApiServerUrl(apiServerUrl); - apiContext.setApiLogging(apiLogging); - apiContext.setErrorLanguage("en_US"); - return apiContext; - } - public static SiteCodeType getSiteCodeType(String productStoreId,Locale locale, Delegator delegator){ - Map<String, Object> context = FastMap.newInstance(); - context.put("locale", locale); - context.put("productStoreId", productStoreId); - Map<String, Object> config = buildEbayConfig(context, delegator); - String siteId = (String)config.get("siteID"); - if(siteId.equals("0")) return SiteCodeType.US; - if(siteId.equals("2")) return SiteCodeType.CANADA; - if(siteId.equals("3")) return SiteCodeType.UK; - if(siteId.equals("15")) return SiteCodeType.AUSTRALIA; - if(siteId.equals("16")) return SiteCodeType.AUSTRIA; - if(siteId.equals("23")) return SiteCodeType.BELGIUM_FRENCH; - if(siteId.equals("71")) return SiteCodeType.FRANCE; - if(siteId.equals("77")) return SiteCodeType.GERMANY; - if(siteId.equals("100")) return SiteCodeType.E_BAY_MOTORS; - if(siteId.equals("101")) return SiteCodeType.ITALY; - if(siteId.equals("123")) return SiteCodeType.BELGIUM_DUTCH; - if(siteId.equals("146")) return SiteCodeType.NETHERLANDS; - if(siteId.equals("189")) return SiteCodeType.SPAIN; - if(siteId.equals("193")) return SiteCodeType.SWITZERLAND; - if(siteId.equals("196")) return SiteCodeType.TAIWAN; - if(siteId.equals("201")) return SiteCodeType.HONG_KONG; - if(siteId.equals("203")) return SiteCodeType.INDIA; - if(siteId.equals("205")) return SiteCodeType.IRELAND; - if(siteId.equals("207")) return SiteCodeType.MALAYSIA; - if(siteId.equals("210")) return SiteCodeType.CANADA_FRENCH; - if(siteId.equals("211")) return SiteCodeType.PHILIPPINES; - if(siteId.equals("212")) return SiteCodeType.POLAND; - if(siteId.equals("216")) return SiteCodeType.SINGAPORE; - if(siteId.equals("218")) return SiteCodeType.SWEDEN; - if(siteId.equals("223")) return SiteCodeType.CHINA; - return SiteCodeType.US; - } -} +} \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java?rev=900321&r1=900320&r2=900321&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java (original) +++ ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java Mon Jan 18 09:58:26 2010 @@ -177,7 +177,7 @@ return result; } - public static Map buildDataItemsXml(DispatchContext dctx, Map context, StringBuffer dataItemsXml, String token, GenericValue prod) { + private static Map buildDataItemsXml(DispatchContext dctx, Map context, StringBuffer dataItemsXml, String token, GenericValue prod) { Locale locale = (Locale)context.get("locale"); try { Delegator delegator = dctx.getDelegator(); @@ -264,25 +264,22 @@ } setPaymentMethodAccepted(itemDocument, itemElem, context); setMiscDetails(itemDocument, itemElem, context, delegator); - String primaryCategoryId = (String)context.get("primaryCategoryId"); - if (UtilValidate.isEmpty(primaryCategoryId)) { - String categoryCode = (String)context.get("ebayCategory"); - if (categoryCode != null) { - String[] params = categoryCode.split("_"); - - if (params == null || params.length != 3) { - ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "productsExportToEbay.parametersNotCorrectInGetEbayCategories", locale)); - } else { - primaryCategoryId = params[1]; - } + String primaryCategoryId = ""; + String categoryCode = (String)context.get("ebayCategory"); + if (categoryCode != null) { + String[] params = categoryCode.split("_"); + + if (params == null || params.length != 3) { + ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "productsExportToEbay.parametersNotCorrectInGetEbayCategories", locale)); } else { - GenericValue productCategoryValue = EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("ProductCategoryAndMember", UtilMisc.toMap("productCategoryTypeId", "EBAY_CATEGORY", "productId", prod.getString("productId"))))); - if (UtilValidate.isNotEmpty(productCategoryValue)) { - primaryCategoryId = productCategoryValue.getString("categoryName"); - } + primaryCategoryId = params[1]; + } + } else { + GenericValue productCategoryValue = EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("ProductCategoryAndMember", UtilMisc.toMap("productCategoryTypeId", "EBAY_CATEGORY", "productId", prod.getString("productId"))))); + if (UtilValidate.isNotEmpty(productCategoryValue)) { + primaryCategoryId = productCategoryValue.getString("categoryName"); } } - Element primaryCatElem = UtilXml.addChildElement(itemElem, "PrimaryCategory", itemDocument); UtilXml.addChildElementValue(primaryCatElem, "CategoryID", primaryCategoryId, itemDocument); @@ -594,12 +591,4 @@ } return result; } - - public static List<String> getProductExportSuccessMessageList(){ - return productExportSuccessMessageList; - } - - public static List<String> getproductExportFailureMessageList(){ - return productExportFailureMessageList; - } } Modified: ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml?rev=900321&r1=900320&r2=900321&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml Mon Jan 18 09:58:26 2010 @@ -153,56 +153,6 @@ <response name="success" type="view" value="EditEbayConfiguration"/> <response name="error" type="view" value="EditEbayConfiguration"/> </request-map> - - <!-- Export categories selected to Ebay store --> - <request-map uri="exportCategoryEbayStore"> - <security https="true" auth="true"/> - <response name="success" type="view" value="exportCategoryEbayStore"/> - <response name="error" type="view" value="exportCategoryEbayStore"/> - </request-map> - - <request-map uri="exportCategoriesSelectedToEbayStore"> - <security https="true" auth="true"/> - <event type="service" invoke="exportCategoriesSelectedToEbayStore"/> - <response name="success" type="view" value="exportCategoryEbayStore"/> - <response name="error" type="view" value="exportCategoryEbayStore"/> - </request-map> - - <request-map uri="newEbayAccount"> - <security https="true" auth="true"/> - <response name="success" type="view" value="NewEbayAccount"/> - </request-map> - <request-map uri="createEbayAccount"> - <security https="true" auth="true"/> - <event type="service" invoke="createEbayAccount"/> - <response name="error" type="view" value="NewEbayAccount"/> - <response name="success" type="view" value="EditEbayConfiguration"/> - </request-map> - - <!-- Store output --> - <request-map uri="ebayStores"> - <security https="true" auth="true"/> - <response name="success" type="view" value="ebayStores"/> - <response name="error" type="view" value="ebayStores"/> - </request-map> - <request-map uri="getStoreDetail"> - <security https="true" auth="true"/> - <event type="service" invoke="getEbayStoreOutput"/> - <response name="success" type="view" value="ebayStoreDetail"/> - <response name="error" type="view" value="ebayStoreDetail"/> - </request-map> - <request-map uri="loadStoreLogo"> - <security https="true" auth="true"/> - <event type="service" invoke="retrieveAdvancedThemeArray"/> - <response name="success" type="view" value="ebayStoreDetail"/> - <response name="error" type="view" value="ebayStoreDetail"/> - </request-map> - <request-map uri="retrieveThemeColorSchemeByThemeId"> - <security https="true" auth="true"/> - <event type="java" path="org.ofbiz.ebay.EbayStoreOptions" invoke="retrieveThemeColorSchemeByThemeId"/> - <response name="success" type="view" value="ebayStoreDetail"/> - <response name="error" type="view" value="ebayStoreDetail"/> - </request-map> <!-- end of request mappings --> <!-- View Mappings --> @@ -216,12 +166,5 @@ <view-map name="FindEbayConfigurations" type="screen" page="component://ebay/widget/EbayScreens.xml#FindEbayConfigurations"/> <view-map name="EbayShippingMethods" type="screen" page="component://ebay/widget/EbayScreens.xml#EbayShippingMethods"/> <view-map name="EditEbayConfiguration" type="screen" page="component://ebay/widget/EbayScreens.xml#EditEbayConfiguration"/> - <view-map name="exportCategoryEbayStore" type="screen" page="component://ebay/widget/EbayScreens.xml#exportCategoryEbayStore"/> - - <!-- store output --> - <view-map name="NewEbayAccount" type="screen" page="component://ebay/widget/EbayScreens.xml#NewEbayAccount"/> - <view-map name="ebayStores" type="screen" page="component://ebay/widget/EbayScreens.xml#ebayStores"/> - <view-map name="ebayStoreDetail" type="screen" page="component://ebay/widget/EbayScreens.xml#ebayStoreDetail"/> - <!-- end of view mappings --> </site-conf> Modified: ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml?rev=900321&r1=900320&r2=900321&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml Mon Jan 18 09:58:26 2010 @@ -1,26 +1,26 @@ <?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. +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. --> <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> - + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> + <screen name="main-decorator"> <section> <actions> @@ -45,7 +45,7 @@ <section> <actions> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> - + <set field="productId" from-field="parameters.productId"/> <entity-one entity-name="Product" value-field="product"/> <set field="productName" from-field="product.productName"/> @@ -67,7 +67,7 @@ <label style="h1">${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}: ${product.internalName} [${uiLabelMap.CommonId}:${productId}] ${${extraFunctionName}}</label> <image src="${product.smallImageUrl}" height="40" width="40" url-mode="content"/> </container> - + <!-- add Create Product and View Product (in ecommerce) links --> <container style="button-bar"> <link target="EditProduct" text="${uiLabelMap.ProductNewProduct}" style="buttontext"/> @@ -82,7 +82,7 @@ </container> </widgets> </section> - + <decorator-section-include name="body"/> </widgets> <fail-widgets> @@ -94,7 +94,7 @@ </widgets> </section> </screen> - + <screen name="permission-decorator"> <section> <actions> @@ -107,16 +107,6 @@ <if-has-permission permission="EBAY" action="_VIEW"/> </condition> <widgets> - <container> - <section> - <condition> - <not><if-empty field="parameters.productStoreId"/></not> - </condition> - <widgets> - <include-menu name="EbayStoreFunctionTabBar" location="component://ebay/widget/EbayMenus.xml"/> - </widgets> - </section> - </container> <decorator-section-include name="body"/> </widgets> <fail-widgets> @@ -128,7 +118,7 @@ </widgets> </section> </screen> - + <screen name="CommonEbayConfigDecorator"> <section> <actions> @@ -158,7 +148,7 @@ </fail-widgets> </section> </decorator-section> - </decorator-screen> + </decorator-screen> </widgets> </section> </screen> Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml?rev=900321&r1=900320&r2=900321&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml Mon Jan 18 09:58:26 2010 @@ -175,7 +175,6 @@ <field name="compatibilityLevel"><text default-value="${ebayConfig.compatibilityLevel}" size="5"/></field> <field name="siteId"><text default-value="${ebayConfig.siteId}" size="5"/></field> <field name="xmlGatewayUri"><text size="40"/></field> - <field name="apiServerUrl"><text size="40"/></field> <field name="customXml"><textarea cols="60" rows="5"/></field> <field name="webSiteId" title="${uiLabelMap.ProductWebSite}"> <drop-down> @@ -270,60 +269,4 @@ <field name="noConditionFind"><hidden value="Y"/></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - - <form name="ListCurrentStores" type="single" target="exportCategoriesSelectedToEbayStore" - header-row-style="header-row" default-table-style="basic-table"> - <actions> - <entity-and entity-name="ProductStoreCatalog" list="storeCatalog"> - <field-map field-name="productStoreId" from-field="parameters.productStoreId"/> - </entity-and> - </actions> - <field name="productStoreId"><hidden value="${parameters.productStoreId}"/></field> - <field name="prodCatalogId"> - <drop-down> - <list-options list-name="storeCatalog" key-name="prodCatalogId" description="${prodCatalogId}"/> - <!--entity-options entity-name="ProdCatalog" description="${catalogName}" key-field-name="prodCatalogId"> - <entity-order-by field-name="catalogName"/> - </entity-options--> - </drop-down> - </field> - <field name="location"><text size="40"></text></field> - <field name="paymentMethods" title="Default Payment Methods"> - <drop-down> - <option key="paymentPayPal" description="${uiLabelMap.FormFieldTitle_paymentPayPal}"/> - <option key="paymentVisaMC" description="${uiLabelMap.FormFieldTitle_paymentVisaMC}"/> - <option key="paymentAmEx" description="${uiLabelMap.FormFieldTitle_paymentAmEx}"/> - <option key="paymentDiscover" description="${uiLabelMap.FormFieldTitle_paymentDiscover}"/> - <option key="paymentMOCC" description="${uiLabelMap.FormFieldTitle_paymentMOCC}"/> - <option key="paymentPersonalCheck" description="${uiLabelMap.FormFieldTitle_paymentPersonalCheck}"/> - <option key="paymentCCAccepted" description="${uiLabelMap.FormFieldTitle_paymentCCAccepted}"/> - <option key="paymentCashInPerson" description="${uiLabelMap.FormFieldTitle_paymentCashInPerson}"/> - <option key="paymentCashOnPickup" description="${uiLabelMap.FormFieldTitle_paymentCashOnPickup}"/> - <option key="paymentCOD" description="${uiLabelMap.FormFieldTitle_paymentCOD}"/> - <option key="paymentCODPrePayDelivery" description="${uiLabelMap.FormFieldTitle_paymentCODPrePayDelivery}"/> - <option key="paymentMoneyXferAccepted" description="${uiLabelMap.FormFieldTitle_paymentMoneyXferAccepted}"/> - </drop-down> - </field> - <field name="listingDuration"> - <drop-down> - <option key="Days_1" description="1 ${uiLabelMap.CommonDay}"/> - <option key="Days_3" description="3 ${uiLabelMap.CommonDays}"/> - <option key="Days_7" description="7 ${uiLabelMap.CommonDays}"/> - </drop-down> - </field> - <field name="submitButton" title="${uiLabelMap.EbayExportToEbayStore}"><submit button-type="button"/></field> - </form> - <form name="NewEbayAccount" type="single" target="createEbayAccount"> - <auto-fields-service service-name="createEbayAccount"/> - <field name="statusId"><hidden value="PARTY_ENABLED"/></field> - <field name="gender"> - <drop-down allow-empty="true"> - <option key="M" description="${uiLabelMap.CommonMale}"/> - <option key="F" description="${uiLabelMap.CommonFemale}"/> - </drop-down> - </field> - <field name="currentPassword"><password/></field> - <field name="currentPasswordVerify"><password/></field> - <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field> - </form> -</forms> +</forms> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml?rev=900321&r1=900320&r2=900321&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml Mon Jan 18 09:58:26 2010 @@ -1,21 +1,21 @@ <?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. +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. --> <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd"> <menu name="EbayAppBar" title="${uiLabelMap.EbayApplication}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> @@ -24,7 +24,6 @@ <menu-item name="export" title="${uiLabelMap.EbayExportToEbay}"><link target="advancedsearch"/></menu-item> <menu-item name="importOrders" title="${uiLabelMap.EbayImportSingleTransactionFromEbay}"><link target="ManageOrdersFromEbay"/></menu-item> <menu-item name="eBayOrders" title="${uiLabelMap.EbayEBayOrders}"><link target="eBayOrders"/></menu-item> - <menu-item name="ebayStore" title="${uiLabelMap.EbayStore}"><link target="ebayStores"></link></menu-item> </menu> <menu name="EbayConfigTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="find" title="${uiLabelMap.CommonFind}" > @@ -48,7 +47,7 @@ </menu-item> </menu> <menu name="EbayConfigSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" - menu-container-style="button-bar button-style-2"> + menu-container-style="button-bar button-style-2"> <menu-item name="createNew" title="${uiLabelMap.CommonCreateNew}"> <condition> <not><if-empty field="ebayConfig"/></not> @@ -56,22 +55,4 @@ <link target="EditEbayConfiguration"/> </menu-item> </menu> - <menu name="EbaySubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" - menu-container-style="button-bar button-style-2"> - <menu-item name="NewEbayAccount" title="New Ebay Account"> - <link target="newEbayAccount"/> - </menu-item> - </menu> - <menu name="EbayStoreFunctionTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> - <menu-item name="ebayStores" title="${uiLabelMap.EbayStores}"> - <link target="getStoreDetail"> - <parameter param-name="productStoreId" value="${parameters.productStoreId}"/> - </link> - </menu-item> - <menu-item name="ebayExportAllCategoryToEbayStore" title="${uiLabelMap.EbayExportAllCategoryToEbayStore}"> - <link target="exportCategoryEbayStore"> - <parameter param-name="productStoreId" value="${parameters.productStoreId}"/> - </link> - </menu-item> - </menu> </menus> Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml?rev=900321&r1=900320&r2=900321&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml Mon Jan 18 09:58:26 2010 @@ -288,78 +288,4 @@ </section> </screen> - <screen name="exportCategoryEbayStore"> - <section> - <actions> - <set field="titleProperty" value="EbayExportAllCategoryToEbayStore"/> - <set field="headerItem" value="exportCategoriesEbayStore"/> - <set field="productStoreId" value="${parameters.productStoreId}"/> - </actions> - <widgets> - <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <screenlet title="${uiLabelMap.EbayExportAllCategoryToEbayStore}"> - <include-form name="ListCurrentStores" location="component://ebay/widget/EbayForms.xml"/> - </screenlet> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - - <screen name="ebayStores"> - <section> - <actions> - <set field="titleProperty" value="${uiLabelMap.EbayStore}"/> - <set field="headerItem" value="ebayStores"/> - </actions> - <widgets> - <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <include-menu name="EbaySubTabBar" location="component://ebay/widget/EbayMenus.xml"/> - <screenlet title="${uiLabelMap.EbayStores}"> - <include-form name="EbayAccountList" location="component://ebay/widget/EbayStoreForms.xml"/> - </screenlet> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="NewEbayAccount"> - <section> - <actions> - <set field="tabButtonItem" value="NewEbayAccount"/> - </actions> - <widgets> - <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <screenlet title="New Ebay Account"> - <include-form name="NewEbayAccount" location="component://ebay/widget/EbayForms.xml"/> - </screenlet> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="ebayStoreDetail"> - <section> - <actions> - <set field="titleProperty" value="${uiLabelMap.EbayStoreSetting}"/> - <set field="headerItem" value="ebayStoresSetting"/> - <script location="component://ebay/webapp/ebay/WEB-INF/actions/store/RetrieveStoreOptions.groovy"/> - </actions> - <widgets> - <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <screenlet title="${uiLabelMap.EbayStoreSetting}"> - <platform-specific> - <html><html-template location="component://ebay/webapp/ebay/store/StoreSetting.ftl"/></html> - </platform-specific> - </screenlet> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - -</screens> +</screens> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |