Author: jleroux
Date: Tue May 3 20:50:10 2016
New Revision: 1742196
URL: http://svn.apache.org/viewvc?rev=1742196&view=rev
Log:
"Continue the work on the form widget grid element" -
https://issues.apache.org/jira/browse/OFBIZ-7029
Completes in screens the changes done in forms at r1741873. I then replaced few
form lists by grids, where it was possible to do it with regexp.
Also complete StatsForms.xml to use only grids and "searchList" form in
ecommerce ContentForms to NOT use grid (not called in screen)
Added:
ofbiz/trunk/framework/images/webapp/images/commons-safe-head.ftl (with
props)
Modified:
ofbiz/trunk/README
ofbiz/trunk/applications/accounting/config/payment.properties
ofbiz/trunk/applications/accounting/config/paymentTest.properties
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealPaymentServiceTest.java
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/readme
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
ofbiz/trunk/applications/content/config/content.properties
ofbiz/trunk/applications/product/config/SeoConfig.xml
ofbiz/trunk/applications/product/widget/catalog/ImageManagementScreens.xml
ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml
ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java
ofbiz/trunk/framework/service/config/serviceengine.xml
ofbiz/trunk/framework/service/src/org/ofbiz/service/test/XmlRpcTests.java
ofbiz/trunk/framework/webapp/config/fop.xconf
ofbiz/trunk/framework/webapp/config/url.properties
ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
ofbiz/trunk/framework/webtools/widget/CacheScreens.xml
ofbiz/trunk/framework/webtools/widget/StatsForms.xml
ofbiz/trunk/framework/webtools/widget/StatsScreens.xml
ofbiz/trunk/framework/widget/config/widget.properties
ofbiz/trunk/specialpurpose/birt/webapp/birt/webcontent/birt/ajax/utility/BirtUtility.js
ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/ofbizFooter.ftl
ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountScreens.xml
ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml
ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml
ofbiz/trunk/specialpurpose/ecommerce/data/DemoSurvey.xml
ofbiz/trunk/specialpurpose/ecommerce/data/DemoTestSurveyData.xml
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/ecommerce/widget/ContentForms.xml
ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogScreens.xml
ofbiz/trunk/specialpurpose/googlecheckout/config/googleCheckout.properties
Modified: ofbiz/trunk/README
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/README?rev=1742196&r1=1742195&r2=1742196&view=diff
==============================================================================
--- ofbiz/trunk/README (original)
+++ ofbiz/trunk/README Tue May 3 20:50:10 2016
@@ -21,7 +21,7 @@ ant start
(you can also run directly "ant load-demo start")
Once OFBiz starts, you can look at the demo storefront at:
-http://localhost:8080/ecommerce
+https://localhost:8443/ecommerce
the back office at:
https://localhost:8443/ordermgr
Modified: ofbiz/trunk/applications/accounting/config/payment.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/payment.properties?rev=1742196&r1=1742195&r2=1742196&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/payment.properties (original)
+++ ofbiz/trunk/applications/accounting/config/payment.properties Tue May 3
20:50:10 2016
@@ -423,7 +423,7 @@ merchantSubId=0
# URL van de pagina in de webshop waarnaar de consument wordt geredirect na de
iDEAL transactie
#merchantReturnURL=http://[yourServerName]/ecommerce/control/payPalNotify
-merchantReturnURL=http://localhost:8080/ecommerce/control/idealNotify
+merchantReturnURL=https://localhost:8443/ecommerce/control/idealNotify
## acquirer attributes
# URL van de acquirer van de acceptant; niet wijzigen
Modified: ofbiz/trunk/applications/accounting/config/paymentTest.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/paymentTest.properties?rev=1742196&r1=1742195&r2=1742196&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/paymentTest.properties (original)
+++ ofbiz/trunk/applications/accounting/config/paymentTest.properties Tue May
3 20:50:10 2016
@@ -79,7 +79,7 @@ merchantSubId=0
# URL van de pagina in de webshop waarnaar de consument wordt geredirect na de
iDEAL transactie
#merchantReturnURL=http://[yourServerName]/ecommerce/control/payPalNotify
-merchantReturnURL=http://localhost:8080/ecommerce/control/idealNotify
+merchantReturnURL=https://localhost:8443/ecommerce/control/idealNotify
## acquirer attributes
# URL van de acquirer van de acceptant; niet wijzigen
Modified:
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealPaymentServiceTest.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealPaymentServiceTest.java?rev=1742196&r1=1742195&r2=1742196&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealPaymentServiceTest.java
(original)
+++
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealPaymentServiceTest.java
Tue May 3 20:50:10 2016
@@ -55,7 +55,7 @@ public class IdealPaymentServiceTest ext
orderId = "testOrder1000";
issuerId = "0151";
orderDiscription = "Test Order Description";
- merchantReturnURL = "http://localhost:8080/ecommerce";;
+ merchantReturnURL = "https://localhost:8443/ecommerce";;
}
public void testDirectoryRequest() throws Exception{
Modified:
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/readme
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/readme?rev=1742196&r1=1742195&r2=1742196&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/readme
(original)
+++
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/readme
Tue May 3 20:50:10 2016
@@ -41,7 +41,7 @@ You can config on payment.properties
merchantId=005040237
merchantSubId=0
-merchantReturnURL=http://localhost:8080/ecommerce/control/idealNotify
+merchantReturnURL=https://localhost:8443/ecommerce/control/idealNotify
acquirerURL=https://idealtest.secure-ing.com/ideal/iDeal
acquirerTimeout=10
expirationPeriod=PT1H
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=1742196&r1=1742195&r2=1742196&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
Tue May 3 20:50:10 2016
@@ -377,7 +377,7 @@ under the License.
<response name="success" type="view"
value="FindSalesInvoicesByDueDate"/>
</request-map>
<request-map uri="findSalesInvoicesByDueDate">
- <security https="false" auth="true"/>
+ <security https="true" auth="true"/>
<event type="service"
invoke="getInvoicePaymentInfoListByDueDateOffset"/>
<response name="success" type="view"
value="FindSalesInvoicesByDueDate"/>
<response name="error" type="view" value="FindSalesInvoicesByDueDate"/>
@@ -387,7 +387,7 @@ under the License.
<response name="success" type="view"
value="FindPurchaseInvoicesByDueDate"/>
</request-map>
<request-map uri="findPurchaseInvoicesByDueDate">
- <security https="false" auth="true"/>
+ <security https="true" auth="true"/>
<event type="service"
invoke="getInvoicePaymentInfoListByDueDateOffset"/>
<response name="success" type="view"
value="FindPurchaseInvoicesByDueDate"/>
<response name="error" type="view"
value="FindPurchaseInvoicesByDueDate"/>
Modified: ofbiz/trunk/applications/content/config/content.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/content.properties?rev=1742196&r1=1742195&r2=1742196&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/config/content.properties (original)
+++ ofbiz/trunk/applications/content/config/content.properties Tue May 3
20:50:10 2016
@@ -22,7 +22,7 @@ img.request.param.name=imgId
stream.permission.service=genericContentPermission
-baseUrl=http://localhost:8080
+baseUrl=https://localhost:8443
disable.ftl.template.cache=true
permissionRecorderOn=true
allowedHasRoleOperations=HAS_USER_ROLE|HAS_AUTHOR_ROLE|HAS_EDITOR_ROLE|HAS_ADMIN_ROLE|HAS_PUBLISHER_ROLE
Modified: ofbiz/trunk/applications/product/config/SeoConfig.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/SeoConfig.xml?rev=1742196&r1=1742195&r2=1742196&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/SeoConfig.xml (original)
+++ ofbiz/trunk/applications/product/config/SeoConfig.xml Tue May 3 20:50:10
2016
@@ -1,36 +1,20 @@
<?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. -->
<seo-config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="../dtd/SeoConfig.xsd">
<regexpifmatch>^.*/.*$</regexpifmatch>
<category-url>
- <value>enable</value>
- <!-- enable/disable
- 1. if enable, the product seo url will be
/product-name-product-id.html or /category-name-product-name-product-id.html
- 2. if disable, the CatalogUrlServlet.makeCatalogUrl will be used -->
+ <value>disable</value>
+ <!-- enable/disable 1. if enable, the product seo url will be
/product-name-product-id.html or /category-name-product-name-product-id.html 2.
if disable, the CatalogUrlServlet.makeCatalogUrl
+ will be used -->
<allowed-context-paths>/:/ecomseo</allowed-context-paths>
<!-- if category-url is enabled, only context paths listed here will
be allowed to use the new seo transformers -->
- <category-name>disable</category-name>
- <!-- enable/disable
- 1. if enable, the product seo url will be
/category-name-product-name-product-id.html
- 2. if disable, the product seo url will be
/product-name-product-id.html -->
+ <category-name>enable</category-name>
+ <!-- enable/disable 1. if enable, the product seo url will be
/category-name-product-name-product-id.html 2. if disable, the product seo url
will be /product-name-product-id.html -->
<category-url-suffix>.html</category-url-suffix>
<!-- suffix to add to the product seo url -->
</category-url>
@@ -38,15 +22,13 @@ under the License.
<jsessionid>
<anonymous>
<value>disable</value>
- <!-- enable/disable
- 1. when disable, the seo url patterns that contains jsessionid
will be applied;
- 2. when enable, the seo url patterns that contains jsessionid
will be skipped -->
+ <!-- enable/disable 1. when disable, the seo url patterns that
contains jsessionid will be applied; 2. when enable, the seo url patterns that
contains jsessionid will be
+ skipped -->
</anonymous>
<user>
<value>disable</value>
- <!-- enable/disable
- 1. when disable, the url-patterns under exceptions will be used
to skip the seo url patterns that contains jsessionid;
- 2. when enable, the seo url patterns that contains jsessionid
will be skipped -->
+ <!-- enable/disable 1. when disable, the url-patterns under
exceptions will be used to skip the seo url patterns that contains jsessionid;
2. when enable, the seo url patterns
+ that contains jsessionid will be skipped -->
<exceptions>
<url-pattern>^.*/(keywordsearch|logout).*$</url-pattern>
<!-- sample: ^.*/(keywordsearch|logout).*$ -->
