You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2010/02/04 06:43:05 UTC
svn commit: r906372 - in /ofbiz/trunk/specialpurpose/ebay: ./ config/ data/
entitydef/ script/ src/org/ofbiz/ebay/ webapp/ebay/WEB-INF/
webapp/ebay/WEB-INF/actions/automationPreferences/
webapp/ebay/WEB-INF/actions/feedback/ webapp/ebay/WEB-INF/actions...
Author: hansbak
Date: Thu Feb 4 05:43:04 2010
New Revision: 906372
URL: http://svn.apache.org/viewvc?rev=906372&view=rev
Log:
reverting all changes starting with r900298 in the ebay component, new java api functions have been moved to the new ebaystore special purpose component
Removed:
ofbiz/trunk/specialpurpose/ebay/script/
ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/automationPreferences/
ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/feedback/
ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/store/
ofbiz/trunk/specialpurpose/ebay/webapp/ebay/feedback/
ofbiz/trunk/specialpurpose/ebay/webapp/ebay/store/
ofbiz/trunk/specialpurpose/ebay/widget/EbayAccountForms.xml
ofbiz/trunk/specialpurpose/ebay/widget/EbayAccountScreens.xml
ofbiz/trunk/specialpurpose/ebay/widget/EbayInventoryForms.xml
ofbiz/trunk/specialpurpose/ebay/widget/EbayStoreForms.xml
Modified:
ofbiz/trunk/specialpurpose/ebay/build.xml
ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml
ofbiz/trunk/specialpurpose/ebay/config/ebayExport.properties
ofbiz/trunk/specialpurpose/ebay/data/DemoEbayData.xml
ofbiz/trunk/specialpurpose/ebay/data/EbayHelpData.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/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/specialpurpose/ebay/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/build.xml?rev=906372&r1=906371&r2=906372&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/build.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/build.xml Thu Feb 4 05:43:04 2010
@@ -29,7 +29,6 @@
<property name="name" value="ofbiz-ebay"/>
<path id="local.class.path">
- <fileset dir="." includes="lib/*.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/EbayUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml?rev=906372&r1=906371&r2=906372&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml Thu Feb 4 05:43:04 2010
@@ -572,5 +572,4 @@
<value xml:lang="th">รายà¸à¸²à¸£à¸ªà¸´à¸à¸à¹à¸²à¸ªà¹à¸à¸à¸¢à¹à¸²à¸à¸à¸¹à¸à¸à¹à¸à¸à¸à¸¶à¸à¸à¸µà¹à¸à¸¢à¹</value>
<value xml:lang="zh">产åæç»è¢«æ£ç¡®åéå°äºeBay</value>
</property>
-
</resource>
Modified: ofbiz/trunk/specialpurpose/ebay/config/ebayExport.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/config/ebayExport.properties?rev=906372&r1=906371&r2=906372&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/config/ebayExport.properties (original)
+++ ofbiz/trunk/specialpurpose/ebay/config/ebayExport.properties Thu Feb 4 05:43:04 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=906372&r1=906371&r2=906372&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/data/DemoEbayData.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/data/DemoEbayData.xml Thu Feb 4 05:43:04 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,4 +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"/>
+
</entity-engine-xml>
Modified: ofbiz/trunk/specialpurpose/ebay/data/EbayHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/data/EbayHelpData.xml?rev=906372&r1=906371&r2=906372&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/data/EbayHelpData.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/data/EbayHelpData.xml Thu Feb 4 05:43:04 2010
@@ -83,4 +83,5 @@
objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY_eBayOrders.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="EBAY_EbayOrders" contentTypeId="DOCUMENT" contentName="Ebay orders import" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_EbayOrders" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_EbayOrders" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_FindEbayOrders"/>
+
</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=906372&r1=906371&r2=906372&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/data/EbayTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/data/EbayTypeData.xml Thu Feb 4 05:43:04 2010
@@ -24,5 +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"/>
+ <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=906372&r1=906371&r2=906372&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/entitydef/entitymodel.xml Thu Feb 4 05:43:04 2010
@@ -88,6 +88,5 @@
<key-map field-name="shipmentMethodTypeId"/>
</relation>
</entity>
-
</entitymodel>
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/ebay/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/ofbiz-component.xml?rev=906372&r1=906371&r2=906372&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/ofbiz-component.xml Thu Feb 4 05:43:04 2010
@@ -26,12 +26,10 @@
<classpath type="jar" location="build/lib/*"/>
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
-
<entity-resource type="data" reader-name="seed" loader="main" location="data/EbaySecurityData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/EbayTypeData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/EbayHelpData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoEbayData.xml"/>
-
<service-resource type="model" loader="main" location="servicedef/services.xml"/>
<service-resource type="eca" loader="main" location="servicedef/secas.xml"/>
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=906372&r1=906371&r2=906372&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java (original)
+++ ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java Thu Feb 4 05:43:04 2010
@@ -82,7 +82,6 @@
buildEbayConfigContext.put("compatibilityLevel", eBayConfig.getString("compatibilityLevel"));
buildEbayConfigContext.put("siteID", eBayConfig.getString("siteId"));
buildEbayConfigContext.put("xmlGatewayUri", eBayConfig.getString("xmlGatewayUri"));
- buildEbayConfigContext.put("apiServerUrl", UtilProperties.getPropertyValue(configFileName, "eBayExport.apiServerUrl"));
}
} else {
buildEbayConfigContext.put("devID", UtilProperties.getPropertyValue(configFileName, "eBayExport.devID"));
@@ -92,7 +91,6 @@
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;
}
@@ -607,4 +605,4 @@
}
return productId;
}
-}
+}
\ 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=906372&r1=906371&r2=906372&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java (original)
+++ ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java Thu Feb 4 05:43:04 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=906372&r1=906371&r2=906372&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml Thu Feb 4 05:43:04 2010
@@ -1,59 +1,59 @@
<?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.
-->
<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
+ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
<include location="component://product/webapp/catalog/WEB-INF/controller.xml"/>
-
+
<description>eBay Component Site Configuration File</description>
-
+
<request-map uri="main">
<security https="true" auth="true"/>
<response name="success" type="view" value="main"/>
</request-map>
-
+
<request-map uri="ProductsExportToEbay">
<security https="true" auth="true"/>
<response name="success" type="view" value="ProductsExportToEbay"/>
</request-map>
-
+
<request-map uri="PostProductsToEbay">
<security https="true" auth="true"/>
<event type="service" path="" invoke="exportToEbay"/>
<response name="success" type="view" value="ProductsExportToEbay"/>
<response name="error" type="view" value="ProductsExportToEbay"/>
</request-map>
-
+
<request-map uri="ManageOrdersFromEbay">
<security https="true" auth="true"/>
<response name="success" type="view" value="ManageOrdersFromEbay"/>
<response name="failure" type="view" value="ManageOrdersFromEbay"/>
</request-map>
-
+
<request-map uri="ImportOrdersSearchFromEbay">
<security https="true" auth="true"/>
<event type="service" path="" invoke="importOrdersSearchFromEbay"/>
<response name="success" type="view" value="ManageOrdersFromEbay"/>
<response name="failure" type="view" value="ManageOrdersFromEbay"/>
</request-map>
-
+
<request-map uri="ImportOrderFromEbay">
<security https="true" auth="true"/>
<event type="service-multi" path="" invoke="importOrderFromEbay"/>
@@ -61,7 +61,7 @@
<response name="error" type="view" value="ManageOrdersFromEbay"/>
<response name="failure" type="view" value="ManageOrdersFromEbay"/>
</request-map>
-
+
<request-map uri="setEbayOrderToComplete">
<security https="true" auth="true"/>
<event type="service" invoke="setEbayOrderToComplete"/>
@@ -124,14 +124,14 @@
<response name="success" type="view" value="FindEbayOrders"/>
<response name="failure" type="view" value="FindEbayOrders"/>
</request-map>
-
+
<request-map uri="GetEbayOrders">
<security https="true" auth="true"/>
<event type="service" invoke="getEbayOrders"/>
<response name="success" type="view" value="EbayOrders"/>
<response name="failure" type="view" value="EbayOrders"/>
</request-map>
-
+
<request-map uri="importEbayOrders">
<security https="true" auth="true"/>
<event type="service-multi" invoke="importEbayOrders"/>
@@ -139,7 +139,7 @@
<response name="failure" type="view" value="FindEbayOrders"/>
<response name="error" type="view" value="FindEbayOrders"/>
</request-map>
-
+
<request-map uri="updatedEbayOrders">
<security https="true" auth="true"/>
<event type="groovy" path="component://ebay/webapp/ebay/WEB-INF/actions/find/" invoke="updatedEbayOrders.groovy"/>
@@ -147,14 +147,14 @@
<response name="failure" type="view" value="FindEbayOrders"/>
<response name="error" type="view" value="FindEbayOrders"/>
</request-map>
-
+
<request-map uri="EditEbayConfiguration">
<security https="true" auth="true"/>
<response name="success" type="view" value="EditEbayConfiguration"/>
<response name="error" type="view" value="EditEbayConfiguration"/>
</request-map>
<!-- end of request mappings -->
-
+
<!-- View Mappings -->
<view-map name="main" type="screen" page="component://ebay/widget/EbayScreens.xml#advancedsearch"/>
<view-map name="advancedsearch" type="screen" page="component://ebay/widget/EbayScreens.xml#advancedsearch"/>
Modified: ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml?rev=906372&r1=906371&r2=906372&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml Thu Feb 4 05:43:04 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>
@@ -41,35 +41,11 @@
</section>
</screen>
- <screen name="permission-decorator">
- <section>
- <actions>
- </actions>
- <widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <section>
- <condition>
- <if-has-permission permission="EBAY" action="_VIEW"/>
- </condition>
- <widgets>
- <decorator-section-include name="body"/>
- </widgets>
- <fail-widgets>
- <label style="h3">${uiLabelMap.EbayViewPermissionError}</label>
- </fail-widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
-
<screen name="CommonProductDecorator">
<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"/>
@@ -91,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"/>
@@ -106,7 +82,7 @@
</container>
</widgets>
</section>
-
+
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
@@ -118,6 +94,31 @@
</widgets>
</section>
</screen>
+
+ <screen name="permission-decorator">
+ <section>
+ <actions>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <if-has-permission permission="EBAY" action="_VIEW"/>
+ </condition>
+ <widgets>
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label style="h3">${uiLabelMap.EbayViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
<screen name="CommonEbayConfigDecorator">
<section>
<actions>
@@ -147,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=906372&r1=906371&r2=906372&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml Thu Feb 4 05:43:04 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,81 +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="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>
- <!-- feedback -->
- <form name="ItemsAwaitingFeedback" type="list" list-name="itemsAwaitingFeedbackList"
- odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
- <row-actions>
- <set field="leave" value="${commentType}"/>
- </row-actions>
- <field name="itemID"><display description="${itemID} - ${title}"/></field>
- <field name="userID"><display description="${userID}"/></field>
- <field name="actions" use-when=""${commentType}" == """>
- <hyperlink target="LeaveFeedback" description="Leave Feedback">
- <parameter param-name="itemId" value="${itemID}"/>
- <parameter param-name="transactionId" value="${transactionID}"/>
- <parameter param-name="productStoreId" value="${parameters.productStoreId}"/>
- <parameter param-name="targetUser" value="${userID}"/>
- <parameter param-name="commentingUser" value="${commentingUser}"/>
- <parameter param-name="role" value="${role}"/>
- </hyperlink>
- </field>
- </form>
- <form name="RecentFeedback" type="list" list-name="recentFeedbackList"
- odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
- <field name="contentId" title="Feedback Id"><display/></field>
- <field name="dataResourceId" title="Comment Text">
- <display-entity entity-name="ElectronicText" key-field-name="dataResourceId" description="${textData}"/>
- </field>
- <field name="commentator" title="Commentator"><display/></field>
- <field name="createdDate"><display type="date"/></field>
- </form>
- <form name="EditAutomationRelistSoldItems" target="createEbayAutomaticRelistItems" type="single">
- <alt-target use-when="job!=null" target="updateEbayAutomaticRelistItems"/>
- <field name="jobId" use-when="job!=null"><hidden value="${job.jobId}"/></field>
- <field name="jobId" use-when="job==null"><hidden value="${jobId}"/></field>
- <field name="authUserLoginId"><hidden value="${userLoginId}"/></field>
- <field name="productStoreId"><hidden value="${parameters.productStoreId}"/></field>
- <field name="startDateTime"><date-time default-value="${job.startDateTime}"/></field>
- <field name="finishDateTime"><date-time default-value="${job.finishDateTime}"/></field>
- <field name="submit" use-when="job!=null" title="${uiLabelMap.CommonApply}"><submit/></field>
- <field name="submit" use-when="job==null" title="${uiLabelMap.CommonCreate}"><submit/></field>
- </form>
- <!-- block out of stock items -->
- <form name="blockItemsOutOfStock" type="single" target="runBlockItemOutOfStock">
- <field name="productStoreId"><hidden value="${parameters.productStoreId}"/></field>
- <field name="productStore" entry-name="parameters.productStoreId" ><display-entity entity-name="ProductStore" description="${storeName} [${productStoreId}]" key-field-name="productStoreId" ></display-entity></field>
- <field name="submitButton" title="${uiLabelMap.BlockItemsOutOfStock}"><submit button-type="button"/></field>
- </form>
</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=906372&r1=906371&r2=906372&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml Thu Feb 4 05:43:04 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">
@@ -47,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>
@@ -55,4 +55,4 @@
<link target="EditEbayConfiguration"/>
</menu-item>
</menu>
-</menus>
\ No newline at end of file
+</menus>
Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml?rev=906372&r1=906371&r2=906372&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml Thu Feb 4 05:43:04 2010
@@ -287,4 +287,5 @@
</widgets>
</section>
</screen>
+
</screens>
\ No newline at end of file