Author: jleroux
Date: Tue May 3 21:03:11 2016
New Revision: 1742197
URL: http://svn.apache.org/viewvc?rev=1742197&view=rev
Log:
Things got totally wrong with r1742196 which contained much more than expected.
This reverts things which should not have been committed
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/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/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/ecommerce/data/DemoSurvey.xml
ofbiz/trunk/specialpurpose/ecommerce/data/DemoTestSurveyData.xml
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/googlecheckout/config/googleCheckout.properties
Modified: ofbiz/trunk/README
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/README?rev=1742197&r1=1742196&r2=1742197&view=diff
==============================================================================
--- ofbiz/trunk/README (original)
+++ ofbiz/trunk/README Tue May 3 21:03:11 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:
-https://localhost:8443/ecommerce
+http://localhost:8080/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=1742197&r1=1742196&r2=1742197&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/payment.properties (original)
+++ ofbiz/trunk/applications/accounting/config/payment.properties Tue May 3
21:03:11 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=https://localhost:8443/ecommerce/control/idealNotify
+merchantReturnURL=http://localhost:8080/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=1742197&r1=1742196&r2=1742197&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/paymentTest.properties (original)
+++ ofbiz/trunk/applications/accounting/config/paymentTest.properties Tue May
3 21:03:11 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=https://localhost:8443/ecommerce/control/idealNotify
+merchantReturnURL=http://localhost:8080/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=1742197&r1=1742196&r2=1742197&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 21:03:11 2016
@@ -55,7 +55,7 @@ public class IdealPaymentServiceTest ext
orderId = "testOrder1000";
issuerId = "0151";
orderDiscription = "Test Order Description";
- merchantReturnURL = "https://localhost:8443/ecommerce";;
+ merchantReturnURL = "http://localhost:8080/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=1742197&r1=1742196&r2=1742197&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 21:03:11 2016
@@ -41,7 +41,7 @@ You can config on payment.properties
merchantId=005040237
merchantSubId=0
-merchantReturnURL=https://localhost:8443/ecommerce/control/idealNotify
+merchantReturnURL=http://localhost:8080/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=1742197&r1=1742196&r2=1742197&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 21:03:11 2016
@@ -377,7 +377,7 @@ under the License.
<response name="success" type="view"
value="FindSalesInvoicesByDueDate"/>
</request-map>
<request-map uri="findSalesInvoicesByDueDate">
- <security https="true" auth="true"/>
+ <security https="false" 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="true" auth="true"/>
+ <security https="false" 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=1742197&r1=1742196&r2=1742197&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/config/content.properties (original)
+++ ofbiz/trunk/applications/content/config/content.properties Tue May 3
21:03:11 2016
@@ -22,7 +22,7 @@ img.request.param.name=imgId
stream.permission.service=genericContentPermission
-baseUrl=https://localhost:8443
+baseUrl=http://localhost:8080
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=1742197&r1=1742196&r2=1742197&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/SeoConfig.xml (original)
+++ ofbiz/trunk/applications/product/config/SeoConfig.xml Tue May 3 21:03:11
2016
@@ -1,20 +1,36 @@
<?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>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 -->
+ <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 -->
<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>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-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-url-suffix>.html</category-url-suffix>
<!-- suffix to add to the product seo url -->
</category-url>
@@ -22,13 +38,15 @@
<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).*$ -->
Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java?rev=1742197&r1=1742196&r2=1742197&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java
(original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java Tue
May 3 21:03:11 2016
@@ -324,8 +324,8 @@ public class CommonServices {
v.set("serverHostName", "localhost");
v.set("webappName", "webtools");
v.set("initialLocale", "en_US");
- v.set("initialRequest",
"https://localhost:8443/webtools/control/main";);
- v.set("initialReferrer",
"https://localhost:8443/webtools/control/main";);
+ v.set("initialRequest",
"http://localhost:8080/webtools/control/main";);
+ v.set("initialReferrer",
"http://localhost:8080/webtools/control/main";);
v.set("initialUserAgent", "Mozilla/5.0 (Macintosh; U; PPC Mac OS
X; en-us) AppleWebKit/124 (KHTML, like Gecko) Safari/125.1");
v.set("clientIpAddress", "127.0.0.1");
v.set("clientHostName", "localhost");
Modified: ofbiz/trunk/framework/service/config/serviceengine.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/config/serviceengine.xml?rev=1742197&r1=1742196&r2=1742197&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/config/serviceengine.xml (original)
+++ ofbiz/trunk/framework/service/config/serviceengine.xml Tue May 3 21:03:11
2016
@@ -57,11 +57,11 @@ under the License.
<engine name="jms" class="org.ofbiz.service.jms.JmsServiceEngine"/>
<engine name="rmi" class="org.ofbiz.service.rmi.RmiServiceEngine"/>
<engine name="soap" class="org.ofbiz.service.engine.SOAPClientEngine"/>
- <!-- The engine xml-rpc-local is only used by a test service and for
this reason it is configured to run on port 8443.
- In order to use this in OFBiz change the port accordingly (for
demo the default value is 8443)
+ <!-- The engine xml-rpc-local is only used by a test service and for
this reason it is configured to run on port 8080.
+ In order to use this in OFBiz change the port accordingly (for
demo the default value is 8080)
-->
<engine name="xml-rpc-local"
class="org.ofbiz.service.engine.XMLRPCClientEngine">
- <parameter name="url"
value="https://localhost:8443/webtools/control/xmlrpc"/>
+ <parameter name="url"
value="http://localhost:8080/webtools/control/xmlrpc"/>
<parameter name="login" value="admin"/>
<parameter name="password" value="ofbiz"/>
</engine>
@@ -71,10 +71,10 @@ under the License.
<service-location name="main-soap"
location="http://localhost:8080/webtools/control/SOAPService"/>
<service-location name="entity-sync-rmi"
location="rmi://localhost:1099/RMIDispatcher"/>
- <service-location name="entity-sync-http"
location="https://localhost:8443/webtools/control/httpService"/>
+ <service-location name="entity-sync-http"
location="http://localhost:8080/webtools/control/httpService"/>
<service-location name="rita-rmi"
location="rmi://localhost:1099/RMIDispatcher"/>
- <service-location name="eedcc-test"
location="https://localhost:8443/webtools/control/httpService"/>
+ <service-location name="eedcc-test"
location="http://localhost:8080/webtools/control/httpService"/>
<!-- default notification group for all services loaded with 'main'
loader
- uncomment this to enable error notification for all services
Modified:
ofbiz/trunk/framework/service/src/org/ofbiz/service/test/XmlRpcTests.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/test/XmlRpcTests.java?rev=1742197&r1=1742196&r2=1742197&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/test/XmlRpcTests.java
(original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/test/XmlRpcTests.java
Tue May 3 21:03:11 2016
@@ -38,7 +38,7 @@ public class XmlRpcTests extends Abstrac
public static final String module = XmlRpcTests.class.getName();
public static final String resource = "ServiceErrorUiLabels";
- public static String url =
"https://localhost:8443/webtools/control/xmlrpc";;
+ public static String url = "http://localhost:8080/webtools/control/xmlrpc";;
public XmlRpcTests(String name) {
super(name);
Modified: ofbiz/trunk/framework/webapp/config/fop.xconf
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/config/fop.xconf?rev=1742197&r1=1742196&r2=1742197&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/config/fop.xconf (original)
+++ ofbiz/trunk/framework/webapp/config/fop.xconf Tue May 3 21:03:11 2016
@@ -31,7 +31,7 @@ the location of this file.
<fop version="1.0">
<!-- Base URL for resolving relative URLs -->
- <base>https://localhost:8443</base>
+ <base>http://localhost:8080</base>
<!-- Source resolution in dpi (dots/pixels per inch) for determining the
size of pixels in SVG and bitmap images, default: 72dpi -->
<source-resolution>72</source-resolution>
Modified: ofbiz/trunk/framework/webapp/config/url.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/config/url.properties?rev=1742197&r1=1742196&r2=1742197&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/config/url.properties (original)
+++ ofbiz/trunk/framework/webapp/config/url.properties Tue May 3 21:03:11 2016
@@ -29,10 +29,6 @@ force.https.host=
port.http=8080
force.http.host=
-# If you want to use HTTP then set no.http=N. Else all requests will use HTTPS
except if put in the http.request-map.list
-no.http=Y
-http.request-map.list=SOAPService
-
# Static Content URLs to make it easy to move the serving load for static
content to other machines
# -- thse are for general content such as images, js & css files, or
non-dynamic HTML files
content.url.prefix.secure=
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml?rev=1742197&r1=1742196&r2=1742197&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml Tue
May 3 21:03:11 2016
@@ -49,7 +49,6 @@ under the License.
<response name="error" type="none"/>
</request-map>
<request-map uri="SOAPService">
- <security https="false"/>
<event type="soap"/>
<response name="error" type="none"/>
<response name="success" type="none"/>
@@ -604,7 +603,6 @@ under the License.
<request-map uri="WebtoolsLayoutDemoFop"><security https="true"
auth="true"/><response name="success" type="view"
value="WebtoolsLayoutDemoFop"/></request-map>
<request-map uri="WebtoolsLayoutDemoText"><security https="true"
auth="true"/><response name="success" type="view"
value="WebtoolsLayoutDemoText"/></request-map>
<request-map uri="WebtoolsLayoutDemoXml"><security https="true"
auth="true"/><response name="success" type="view"
value="WebtoolsLayoutDemoXml"/></request-map>
- <request-map uri="WebtoolsLayoutDemoXls"><security https="true"
auth="true"/><response name="success" type="view"
value="WebtoolsLayoutDemoXls"/></request-map>
<request-map uri="WebtoolsLayoutDemoCsv"><security https="true"
auth="true"/><response name="success" type="view"
value="WebtoolsLayoutDemoCsv"/></request-map>
<!-- end of request mappings -->
@@ -631,7 +629,7 @@ under the License.
<view-map name="dataMySql" page="/entity/dataMySql.jsp"/>
<view-map name="ModelWriter" page="/entity/ModelWriter.jsp"/>
<view-map name="ModelGroupWriter" page="/entity/ModelGroupWriter.jsp"/>
- <view-map name="ModelInduceFromDb" type="screen"
page="component://webtools/widget/EntityScreens.xml#ModelInduceFromDb"/>
+ <view-map name="ModelInduceFromDb" page="/entity/ModelInduceFromDb.jsp"/>
<view-map name="EntityEoModelBundle" type="screen"
page="component://webtools/widget/EntityScreens.xml#EntityEoModelBundle"/>
<view-map name="checkdb" type="screen"
page="component://webtools/widget/EntityScreens.xml#CheckDb"/>
@@ -711,8 +709,6 @@ under the License.
<view-map name="WebtoolsLayoutDemoText"
page="component://webtools/widget/MiscScreens.xml#WebtoolsLayoutDemoText"
type="screentext"/>
<view-map name="WebtoolsLayoutDemoXml"
page="component://webtools/widget/MiscScreens.xml#WebtoolsLayoutDemoText"
content-type="text/xml" type="screenxml"/>
<view-map name="WebtoolsLayoutDemoCsv"
page="component://webtools/widget/MiscScreens.xml#WebtoolsLayoutDemoText"
content-type="text/csv" type="screencsv"/>
- <view-map name="WebtoolsLayoutDemoXls"
page="component://webtools/widget/MiscScreens.xml#WebtoolsLayoutDemoText"
content-type="application/vnd.ms-excel" type="screenxls"/><!--#Eam#
xls-renderer -->
-
<!-- end of view mappings -->
</site-conf>
Modified: ofbiz/trunk/framework/widget/config/widget.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/config/widget.properties?rev=1742197&r1=1742196&r2=1742197&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/config/widget.properties (original)
+++ ofbiz/trunk/framework/widget/config/widget.properties Tue May 3 21:03:11
2016
@@ -28,7 +28,7 @@
widget.verbose=true
# Default number of items to be displayed per page in a list form
-widget.form.defaultViewSize=2
+widget.form.defaultViewSize=20
# Default number of items to be displayed in lookup ajax autocompleter
widget.autocompleter.defaultViewSize=10
Modified:
ofbiz/trunk/specialpurpose/birt/webapp/birt/webcontent/birt/ajax/utility/BirtUtility.js
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/birt/webcontent/birt/ajax/utility/BirtUtility.js?rev=1742197&r1=1742196&r2=1742197&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/birt/webapp/birt/webcontent/birt/ajax/utility/BirtUtility.js
(original)
+++
ofbiz/trunk/specialpurpose/birt/webapp/birt/webcontent/birt/ajax/utility/BirtUtility.js
Tue May 3 21:03:11 2016
@@ -181,7 +181,7 @@ BirtUtility.prototype =
/**
* Get a parameter specified in the URL. For example, if a URL is
- *
https://localhost:8443/iportal/wr?__report=/16.webrptdesign&iPortalID=YPTDAGCNPOYSOS
+ *
http://localhost:8080/iportal/wr?__report=/16.webrptdesign&iPortalID=YPTDAGCNPOYSOS
* getURLParameter(iPortalID) will return &iPortalID=YPTDAGCNPOYSOS
*/
getURLParameter: function ( url, parameterName )
Modified: ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/ofbizFooter.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/ofbizFooter.ftl?rev=1742197&r1=1742196&r2=1742197&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/ofbizFooter.ftl (original)
+++ ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/ofbizFooter.ftl Tue May
3 21:03:11 2016
@@ -21,7 +21,7 @@ under the License.
<br />
<div align="center">
<a
href="http://jigsaw.w3.org/css-validator/validator?uri=http://ofbiz.apache.org/";><img
style="border:0;width:88px;height:31px"
src="http://jigsaw.w3.org/css-validator/images/vcss"; alt="Valid CSS!"/></a>
- <a href="http://validator.w3.org/check?uri=referer";
onclick="this.href='http://validator.w3.org/check?uri=' +
escape(document.URL)"><img style="border:0;width:88px;height:31px"
src="http://www.w3.org/Icons/valid-xhtml10"; alt="Valid XHTML 1.0!"/></a>
+ <a href="http://validator.w3.org/check?uri=referer";><img
style="border:0;width:88px;height:31px"
src="http://www.w3.org/Icons/valid-xhtml10"; alt="Valid XHTML 1.0!"/></a>
</div>
<br />
<div id="footer" align="center">
Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoSurvey.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoSurvey.xml?rev=1742197&r1=1742196&r2=1742197&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/data/DemoSurvey.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoSurvey.xml Tue May 3
21:03:11 2016
@@ -53,7 +53,7 @@ under the License.
<SurveyQuestion surveyQuestionId="1034" surveyQuestionCategoryId="1001"
surveyQuestionTypeId="OPTION" question="How would you rate this store for
on-line functionality?"/>
<SurveyQuestion surveyQuestionId="1035" surveyQuestionCategoryId="1001"
surveyQuestionTypeId="URL" question="What is your favorite on-line store?
(Enter Valid URL)"/>
<SurveyQuestion surveyQuestionId="1036" surveyQuestionCategoryId="1001"
surveyQuestionTypeId="TEXTAREA" question="Comments:"/>
- <SurveyQuestion surveyQuestionId="1037" surveyQuestionCategoryId="1001"
surveyQuestionTypeId="SEPERATOR_TEXT" question="<img
src="https://localhost:8443/images/ofbiz_logo.gif">"/>
+ <SurveyQuestion surveyQuestionId="1037" surveyQuestionCategoryId="1001"
surveyQuestionTypeId="SEPERATOR_TEXT" question="<img
src="http://localhost:8080/images/ofbiz_logo.gif">"/>
<SurveyQuestion surveyQuestionId="1038" surveyQuestionCategoryId="1001"
surveyQuestionTypeId="SEPERATOR_LINE"/>
<SurveyQuestion surveyQuestionId="1042" surveyQuestionCategoryId="1001"
surveyQuestionTypeId="CONTENT" question="Do you have a picture you would like
to attach?"/>
Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoTestSurveyData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoTestSurveyData.xml?rev=1742197&r1=1742196&r2=1742197&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/data/DemoTestSurveyData.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoTestSurveyData.xml Tue May 3
21:03:11 2016
@@ -100,9 +100,9 @@ under the License.
<SurveyQuestion surveyQuestionId="1603" surveyQuestionCategoryId="1601"
surveyQuestionTypeId="BOOLEAN" description="" question="Does the EDIT link
redirects to the page https://localhost:8443/ecommerce/control/editProfile"/>
<SurveyQuestion surveyQuestionId="1604" surveyQuestionCategoryId="1601"
surveyQuestionTypeId="BOOLEAN" description="" question="Does the Billing and
shipping address of user displayed correctly?"/>
<SurveyQuestion surveyQuestionId="1605" surveyQuestionCategoryId="1601"
surveyQuestionTypeId="BOOLEAN" description="" question="Does the Manage Address
link redirects user to manage addresses page
https://localhost:8443/ecommerce/control/manageAddress?"/>
- <SurveyQuestion surveyQuestionId="1606" surveyQuestionCategoryId="1601"
surveyQuestionTypeId="BOOLEAN" description="" question="Does Quick add takes to
the page https://localhost:8443/ecommerce/control/quickadd"/>
+ <SurveyQuestion surveyQuestionId="1606" surveyQuestionCategoryId="1601"
surveyQuestionTypeId="BOOLEAN" description="" question="Does Quick add takes to
the page http://localhost:8080/ecommerce/control/quickadd"/>
<SurveyQuestion surveyQuestionId="1607" surveyQuestionCategoryId="1601"
surveyQuestionTypeId="BOOLEAN" description="" question="Does the 'Order
History' redirects to order detail page.
https://localhost:8443/ecommerce/control/orderhistory"/>
- <SurveyQuestion surveyQuestionId="1608" surveyQuestionCategoryId="1601"
surveyQuestionTypeId="BOOLEAN" description="" question="Does Shopping List link
redirects to page https://localhost:8443/ecommerce/control/editShoppingList"/>
+ <SurveyQuestion surveyQuestionId="1608" surveyQuestionCategoryId="1601"
surveyQuestionTypeId="BOOLEAN" description="" question="Does Shopping List link
redirects to page http://localhost:8080/ecommerce/control/editShoppingList"/>
<SurveyQuestion surveyQuestionId="1609" surveyQuestionCategoryId="1601"
surveyQuestionTypeId="BOOLEAN" description="" question="Does List quotes link
redirects to page https://localhost:8443/ecommerce/control/ListQuotes"/>
<SurveyQuestion surveyQuestionId="1610" surveyQuestionCategoryId="1601"
surveyQuestionTypeId="BOOLEAN" description="" question="Does List Requests link
redirects to page https://localhost:8443/ecommerce/control/ListRequests"/>
<SurveyQuestion surveyQuestionId="1611" surveyQuestionCategoryId="1601"
surveyQuestionTypeId="BOOLEAN" description="" question="Does on changing the
email address the username changed ?"/>
@@ -128,7 +128,7 @@ under the License.
<SurveyQuestion surveyQuestionId="1801" surveyQuestionCategoryId="1801"
surveyQuestionTypeId="BOOLEAN" description="" question="Are breadcrumbs visible
on the page and on clicking them, Are they working proper and takes you to
clicked page ?"/>
<SurveyQuestion surveyQuestionId="1802" surveyQuestionCategoryId="1801"
surveyQuestionTypeId="BOOLEAN" description="" question="Is the mincart visible
and does it displays all the details it contains?"/>
<SurveyQuestion surveyQuestionId="1803" surveyQuestionCategoryId="1801"
surveyQuestionTypeId="BOOLEAN" description="" question="Does the page contains
the quantity and Add to cart option that on Clicking adds the Product to the
Shopping cart?"/>
- <SurveyQuestion surveyQuestionId="1804" surveyQuestionCategoryId="1801"
surveyQuestionTypeId="BOOLEAN" description="" question="Does it contains the
Search in Category options that takes to the Advance Search page
https://localhost:8443/ecommerce/control/advancedsearch"/>
+ <SurveyQuestion surveyQuestionId="1804" surveyQuestionCategoryId="1801"
surveyQuestionTypeId="BOOLEAN" description="" question="Does it contains the
Search in Category options that takes to the Advance Search page
http://localhost:8080/ecommerce/control/advancedsearch"/>
<SurveyQuestion surveyQuestionId="1805" surveyQuestionCategoryId="1801"
surveyQuestionTypeId="BOOLEAN" description="" question="Does the page display
the different product list with their names and images if available ?"/>
<SurveyQuestion surveyQuestionId="1806" surveyQuestionCategoryId="1801"
surveyQuestionTypeId="BOOLEAN" description="" question="Does on clicking onto
the product image this redirects you to that specified product detail page ?"/>
@@ -142,7 +142,7 @@ under the License.
<SurveyQuestion surveyQuestionId="1907" surveyQuestionCategoryId="1901"
surveyQuestionTypeId="BOOLEAN" description="" question="Are you able to add the
product into the cart without selecting any feature ?"/>
<SurveyQuestion surveyQuestionId="1908" surveyQuestionCategoryId="1901"
surveyQuestionTypeId="BOOLEAN" description="" question="Does it displays the
links Tell a friend that takes to the respective target page?"/>
<SurveyQuestion surveyQuestionId="1909" surveyQuestionCategoryId="1901"
surveyQuestionTypeId="BOOLEAN" description="" question="Does it displays the
message with link Login You Must Login To Add Selected Items To Shopping List
if the user is not logged in."/>
- <SurveyQuestion surveyQuestionId="1910" surveyQuestionCategoryId="1901"
surveyQuestionTypeId="BOOLEAN" description="" question="Does Review the Product
First link working and takes to the page
https://localhost:8443/ecommerce/control/reviewProduct?"/>
+ <SurveyQuestion surveyQuestionId="1910" surveyQuestionCategoryId="1901"
surveyQuestionTypeId="BOOLEAN" description="" question="Does Review the Product
First link working and takes to the page
http://localhost:8080/ecommerce/control/reviewProduct?"/>
<!--MINI CART PAGE-->
<SurveyQuestion surveyQuestionId="2001" surveyQuestionCategoryId="2001"
surveyQuestionTypeId="BOOLEAN" description="" question="Is the minicart
displayed on the all the pages except profile and checkout page ?"/>
@@ -153,12 +153,12 @@ under the License.
<SurveyQuestion surveyQuestionId="2006" surveyQuestionCategoryId="2001"
surveyQuestionTypeId="BOOLEAN" description="" question="Does on clicking to the
checkout link in case the user is registered,takes to
https://localhost:8443/ecommerce/control/checkoutoptions"/>
<SurveyQuestion surveyQuestionId="2007" surveyQuestionCategoryId="2001"
surveyQuestionTypeId="BOOLEAN" description="" question="Does on clicking to the
quickCheckout link in case the user is registered,takes to
https://localhost:8443/ecommerce/control/quickcheckout"/>
<SurveyQuestion surveyQuestionId="2008" surveyQuestionCategoryId="2001"
surveyQuestionTypeId="BOOLEAN" description="" question="Does on clicking to the
quickCheckout link in case the user is registered,takes to
https://localhost:8443/ecommerce/control/onePageCheckout"/>
- <SurveyQuestion surveyQuestionId="2009" surveyQuestionCategoryId="2001"
surveyQuestionTypeId="BOOLEAN" description="" question="Does on clicking
ViewCart link will redirect to the show cart page at this url
https://localhost:8443/ecommerce/control/view/showcart"/>
+ <SurveyQuestion surveyQuestionId="2009" surveyQuestionCategoryId="2001"
surveyQuestionTypeId="BOOLEAN" description="" question="Does on clicking
ViewCart link will redirect to the show cart page at this url
http://localhost:8080/ecommerce/control/view/showcart"/>
<SurveyQuestion surveyQuestionId="2010" surveyQuestionCategoryId="2001"
surveyQuestionTypeId="BOOLEAN" description="" question="Does the mini cart
displays the Quantity,Product and its price and total details correctly ?"/>
<SurveyQuestion surveyQuestionId="2011" surveyQuestionCategoryId="2001"
surveyQuestionTypeId="BOOLEAN" description="" question="Does the Format of
amount on mini cart have currency format like $00.00 ?"/>
<!--SHOW CART PAGE-->
- <SurveyQuestion surveyQuestionId="2101" surveyQuestionCategoryId="2101"
surveyQuestionTypeId="BOOLEAN" description="" question="Does the Cart link on
click takes to the https://localhost:8443/ecommerce/control/view/showcart?"/>
+ <SurveyQuestion surveyQuestionId="2101" surveyQuestionCategoryId="2101"
surveyQuestionTypeId="BOOLEAN" description="" question="Does the Cart link on
click takes to the http://localhost:8080/ecommerce/control/view/showcart?"/>
<SurveyQuestion surveyQuestionId="2102" surveyQuestionCategoryId="2101"
surveyQuestionTypeId="BOOLEAN" description="" question="Does it diplays the
panels Quick add,shopping cart,promotion coupon code,Special offers,you might
interested in,Promotion information on the ViewCart Page"/>
<SurveyQuestion surveyQuestionId="2103" surveyQuestionCategoryId="2101"
surveyQuestionTypeId="BOOLEAN" description="" question="Does the Cart displays
the all the cart details ?"/>
<SurveyQuestion surveyQuestionId="2104" surveyQuestionCategoryId="2101"
surveyQuestionTypeId="BOOLEAN" description="" question="Does the cart displays
the images of the products it has or not and does those product images on
clicking takes to the target page ?"/>
@@ -169,10 +169,10 @@ under the License.
<SurveyQuestion surveyQuestionId="2109" surveyQuestionCategoryId="2101"
surveyQuestionTypeId="BOOLEAN" description="" question="Does it shows the
message To save cart you must Login in case if not logged in?"/>
<SurveyQuestion surveyQuestionId="2110" surveyQuestionCategoryId="2101"
surveyQuestionTypeId="BOOLEAN" description="" question="Does it displays the
Update,Continue shopping and checkout link ?"/>
<SurveyQuestion surveyQuestionId="2111" surveyQuestionCategoryId="2101"
surveyQuestionTypeId="BOOLEAN" description="" question="Does it on clicking the
Continue shopping takes to last product detail page ?"/>
- <SurveyQuestion surveyQuestionId="2112" surveyQuestionCategoryId="2101"
surveyQuestionTypeId="BOOLEAN" description="" question="Does it on clicking the
Details link on Special offers panel takes to
https://localhost:8443/ecommerce/control/showPromotionDetails"/>
+ <SurveyQuestion surveyQuestionId="2112" surveyQuestionCategoryId="2101"
surveyQuestionTypeId="BOOLEAN" description="" question="Does it on clicking the
Details link on Special offers panel takes to
http://localhost:8080/ecommerce/control/showPromotionDetails"/>
<SurveyQuestion surveyQuestionId="2113" surveyQuestionCategoryId="2101"
surveyQuestionTypeId="BOOLEAN" description="" question="Does the shopping cart
display the links create request for Quote and create new Quote from cart?"/>
<SurveyQuestion surveyQuestionId="2114" surveyQuestionCategoryId="2101"
surveyQuestionTypeId="BOOLEAN" description="" question="Does You might
interested in link contain Add to cart link that adds the product to the
shopping cart"/>
- <SurveyQuestion surveyQuestionId="2115" surveyQuestionCategoryId="2101"
surveyQuestionTypeId="BOOLEAN" description="" question="Does You might
interested in link contain Product link that
https://localhost:8443/ecommerce/control/product"/>
+ <SurveyQuestion surveyQuestionId="2115" surveyQuestionCategoryId="2101"
surveyQuestionTypeId="BOOLEAN" description="" question="Does You might
interested in link contain Product link that
http://localhost:8080/ecommerce/control/product"/>
<SurveyQuestion surveyQuestionId="2116" surveyQuestionCategoryId="2101"
surveyQuestionTypeId="BOOLEAN" description="" question="Does Shopping cart
contains the Recalculate Cart,Empty Cart,Remove Selected and Checkout link on
the title Bar that takes to their respaective target page?"/>
<SurveyQuestion surveyQuestionId="2117" surveyQuestionCategoryId="2101"
surveyQuestionTypeId="BOOLEAN" description="" question="Does Quick Add panel
containing the Add to cart linnk adds the product to the shopping cart
successfully on entering the ProductId"/>
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=1742197&r1=1742196&r2=1742197&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
Tue May 3 21:03:11 2016
@@ -81,7 +81,7 @@ under the License.
<description>Verify a user is logged in.</description>
<security https="true" auth="false"/>
<event type="java" path="org.ofbiz.securityext.login.LoginEvents"
invoke="storeCheckLogin"/>
- <response name="success" type="view-last" value="main"/>
+ <response name="success" type="view-last"/>
<response name="error" type="view" value="login"/>
</request-map>
<request-map uri="login">
@@ -733,7 +733,7 @@ under the License.
<event type="java" path="org.ofbiz.order.shoppingcart.CheckOutEvents"
invoke="createOrder"/>
<response name="sales_order" type="request" value="checkBlacklist"/>
<response name="work_order" type="request" value="checkBlacklist"/>
- <response name="error" type="view" value="quickAnonOrderReview"/>
+ <response name="error" type="view" value="checkoutreview"/>
</request-map>
<request-map uri="processpayment">
<security https="true" direct-request="false"/>
Modified:
ofbiz/trunk/specialpurpose/googlecheckout/config/googleCheckout.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/config/googleCheckout.properties?rev=1742197&r1=1742196&r2=1742197&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlecheckout/config/googleCheckout.properties
(original)
+++ ofbiz/trunk/specialpurpose/googlecheckout/config/googleCheckout.properties
Tue May 3 21:03:11 2016
@@ -34,9 +34,9 @@ merchantId = 634321449957567
#your merchantKey - sandbox will be different than live
merchantKey = DAnyTJLnPzhhK_CuCaQOCg
## URL to edit cart
-editCartUrl = https://localhost:8443/ecommerce/control/view/showcart
+editCartUrl = http://localhost:8080/ecommerce/control/view/showcart
## continue shopping url after payment
-continueShoppingUrl =
https://localhost:8443/ecommerce/control/returnBackFromGoogle
+continueShoppingUrl =
http://localhost:8080/ecommerce/control/returnBackFromGoogle
####Integration Parameters####
##location of template
![https://localhost:8443/images/ofbiz_logo.gif">"/](https://localhost:8443/images/ofbiz_logo.gif">"/){kind=link}
![http://localhost:8080/images/ofbiz_logo.gif">"/](http://localhost:8080/images/ofbiz_logo.gif">"/){kind=link}