Clone
 

shi jinghai <shijh@apache.org> in ofbiz-plugins

Improved: OFBizPricatUtil class don't use a org.apache.ofbiz.pricat package (OFBIZ-10655)

I didn't realized OFBizPricatUtil under org.apache.poi package is a bug

for OFBiz project at the first sight of this issue. When I tried to think from

Jacques view as our project SQA, I understood this OFBizPricatUtil may be missed

during code style check, and this is a major problem :).

Now I moved the OFBizPricatUtil under org.apache.ofbiz.pricat.util package and

changed two other files accordingly.

I upgraded the implement to match the POI 3.7 used in the OFBiz plugins

trunk, and I also tested it with POI 4.0.0 and it worked fine.

Thanks: Jacques for pointing out this issue

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1848009 13f79535-47bb-0310-9956-ffa450edef68

Removed: Add a new plugin for the redis (OFBIZ-9829)

Thanks Michael and Taher's comments.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1812395 13f79535-47bb-0310-9956-ffa450edef68

    • -103
    • +0
    /redis/groovyScripts/RedisServices.groovy
Implemented: Add a new plugin for the redis (OFBIZ-9829)

Thanks Haipeng for this wonderful contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1811826 13f79535-47bb-0310-9956-ffa450edef68

    • -0
    • +27
    /redis/config/redis.json
    • -0
    • +21
    /redis/config/redis.properties
    • -0
    • +103
    /redis/groovyScripts/RedisServices.groovy
    • -0
    • +29
    /redis/ofbiz-component.xml
    • -0
    • +45
    /redis/servicedef/services.xml
    • -0
    • +68
    /redis/src/main/java/org/apache/ofbiz/redis/RedisClient.java
Fixed: Screen broken on click ThirdPartyLogin, OAuth2GitHub, GitHubUser, OAuth2LinkedIn and LinkedInUser entities. (OFBIZ-9390)

Thanks Renuka Srishti for the report and patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1798029 13f79535-47bb-0310-9956-ffa450edef68

    • -10
    • +5
    /passport/entitydef/entitymodel.xml
Improved: Update Apache Solr/Lucene to release 6.2.1 OFBIZ-8316

Removed several comments of this issue in ProductDocument.java.

Thanks: Jacques for the comments and reviews.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1794801 13f79535-47bb-0310-9956-ffa450edef68

Fixed: Update Apache Solr/Lucene to release 6.2.1 OFBIZ-8316

Updated Solr from 6.2.1 to 6.5.1 and the point fields generated by Lucene are ok now for Solr component.

The 'original UI' link is commented in admin.html and the relative files under solr/webapp/solr/tpl are all removed.

Thanks: Cao Pengan for the patch and Jacques, Michael for the comments and reviews.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1794771 13f79535-47bb-0310-9956-ffa450edef68

    • -8
    • +8
    /solr/home/solrdefault/conf/schema.xml
    • -0
    • +17
    /solr/webapp/solr/css/angular/collections.css
    • -6
    • +0
    /solr/webapp/solr/css/angular/dashboard.css
    • -3
    • +6
    /solr/webapp/solr/css/angular/plugins.css
    • -0
    • +23
    /solr/webapp/solr/css/angular/schema.css
    • -3
    • +6
    /solr/webapp/solr/css/styles/plugins.css
  1. … 26 more files in changeset.
Fixed: Update Apache Solr/Lucene to release 6.2.1 OFBIZ-8316

Updated Lucene from 6.2.1 to 6.5.1 and the point fields generated by Lucene are ok now for Solr component.

Thanks: Cao Pengan for the patch and Jacques, Michael for the comments and reviews.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1794770 13f79535-47bb-0310-9956-ffa450edef68

Improved: Add a PriCat component under specialpurpose (OFBIZ-9123)

Moved pricat/webapp/pricat/ftl to pricat/template/pricat, pricat/webapp/pricatdemo/ftl to pricat/template/pricatdemo, and changed paths in files accordingly.

Thanks Jacques, Pierre and Michael for the code review and suggestion on this improvement.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1788744 13f79535-47bb-0310-9956-ffa450edef68

    • -0
    • +109
    /pricat/template/pricat/ExcelImportHistoryReport.ftl
    • -0
    • +529
    /pricat/template/pricat/pricatreport.ftl
    • -0
    • +510
    /pricat/template/pricat/report.ftl
    • -0
    • +31
    /pricat/template/pricat/viewExcelImportHistory.ftl
    • -0
    • +39
    /pricat/template/pricat/viewExcelImportLog.ftl
    • -0
    • +52
    /pricat/template/pricatdemo/SamplePricat.ftl
    • -0
    • +21
    /pricat/template/pricatdemo/countdownreport.ftl
    • -0
    • +21
    /pricat/template/pricatdemo/countupreport.ftl
    • -0
    • +33
    /pricat/template/pricatdemo/main.ftl
    • -0
    • +21
    /pricat/template/pricatdemo/parsePricatExcel.ftl
    • -529
    • +0
    /pricat/webapp/pricat/ftl/pricatreport.ftl
    • -510
    • +0
    /pricat/webapp/pricat/ftl/report.ftl
  1. … 9 more files in changeset.
Fixed: Update Apache Solr/Lucene to release 6.2.1 (OFBIZ-8316)

Change LongPoint and DoublePoint fields to String field to make solr work in trunk version, and I'll change them back when updating to new release of Solr.

Thanks: Jacques Le Roux for reporting the point fields problem.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/plugins@1780133 13f79535-47bb-0310-9956-ffa450edef68

Implemented: Update Apache Solr/Lucene to release 6.2.1 (OFBIZ-8316)

Upgraded Apache Solr/Lucene from 5.3.1 to 6.2.1.

Thanks: Michael Brohl and Cao PengAn for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1776930 13f79535-47bb-0310-9956-ffa450edef68

    • -0
    • +14
    /solr/webapp/solr/css/angular/cloud.css
    • -0
    • +353
    /solr/webapp/solr/css/angular/collections.css
    • -0
    • +44
    /solr/webapp/solr/css/angular/common.css
    • -0
    • +185
    /solr/webapp/solr/css/angular/dashboard.css
    • -1
    • +11
    /solr/webapp/solr/css/angular/index.css
    • -28
    • +35
    /solr/webapp/solr/css/angular/menu.css
    • -0
    • +704
    /solr/webapp/solr/css/angular/schema.css
    • -14
    • +14
    /solr/webapp/solr/css/angular/segments.css
  1. … 75 more files in changeset.
Fixed: Add a PriCat component under specialpurpose (OFBIZ-9123)

Removed the following duplicated labels in PricatUiLabels.xml:

ExcelTableNoRow

ExcelTableColumnNumberNotMatch

ExcelTableColumnNotMatch

ExcelParsingRow

Thanks: Jacques points out these bugs.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1773058 13f79535-47bb-0310-9956-ffa450edef68

Fixed: Add a PriCat component under specialpurpose (OFBIZ-9123)

1. EXCELIMPORT_USERLOGIN is 3 chars too long.

2. should use titles in the relations.

Thanks: Jacques points out these bugs.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1772689 13f79535-47bb-0310-9956-ffa450edef68

OFBIZ-9123 Add a PriCat component under specialpurpose

1. Add a readme.

2. Replace tabs with spaces.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1770979 13f79535-47bb-0310-9956-ffa450edef68

    • -27
    • +27
    /pricat/config/PricatUiLabels.xml
  1. … 15 more files in changeset.
OFBIZ-9123 Add a PriCat component under specialpurpose

There are 2 webapps under pricat component:

1. visit /pricatdemo/ to play 3 demos;

2. visit /pricat/ to view pricat import history.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1770622 13f79535-47bb-0310-9956-ffa450edef68

OFBIZ-9123 Add a PriCat component under specialpurpose

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1770621 13f79535-47bb-0310-9956-ffa450edef68

    • -0
    • +25
    /pricat/build.gradle
    • -0
    • +532
    /pricat/config/PricatUiLabels.xml
    • -0
    • +24
    /pricat/config/pricat.properties
    • -0
    • +34
    /pricat/data/PricatData.xml
    • -0
    • +48
    /pricat/entitydef/entitymodel.xml
    • -0
    • +24
    /pricat/groovyScripts/pricat/FindMyExcelImport.groovy
    • -0
    • +46
    /pricat/ofbiz-component.xml
  1. … 35 more files in changeset.
Implemented: To follow Jacopo's change (rev. 1760725) on ControlFilter, cleaned up the OFBizSolrContextFilter and setup a filter chain in web.xml.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1761214 13f79535-47bb-0310-9956-ffa450edef68

Fix for View screen in Apache Solr Integration Component is broken (OFBIZ-8225).

The duplicated login form is caused by not return after ContextFilter do the filter.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1760463 13f79535-47bb-0310-9956-ffa450edef68

Clean OFBizSolrContextFilter.java to follow ContextFilter.java's changes.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1759401 13f79535-47bb-0310-9956-ffa450edef68

OFBIZ-7026 Remove duplicated jars under solr component

Upgrade hadoop jars from 2.6.0 to 2.7.2 to avoid https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-1776.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1741942 13f79535-47bb-0310-9956-ffa450edef68

    • binary
    /solr/webapp/solr/WEB-INF/lib/hadoop-annotations-2.7.2.jar
    • binary
    /solr/webapp/solr/WEB-INF/lib/hadoop-auth-2.7.2.jar
    • binary
    /solr/webapp/solr/WEB-INF/lib/hadoop-common-2.7.2.jar
    • binary
    /solr/webapp/solr/WEB-INF/lib/hadoop-hdfs-2.7.2.jar
OFBIZ-7026 Remove duplicated jars under solr component

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1741386 13f79535-47bb-0310-9956-ffa450edef68

    • binary
    /solr/webapp/solr/WEB-INF/lib/joda-time-2.2.jar
OFBIZ-6755 Update the passport component to use httpclient/core-4.4.1 instead of commons-httpclient-3.1

1. Changed Applications to OAuth applications in README Github section.

2. Corrected the uri build to make the Github and LinkedIn OAuth login work.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1738407 13f79535-47bb-0310-9956-ffa450edef68

OFBIZ-6755 Update the passport component to use httpclient/core-4.4.1 instead of commons-httpclient-3.1

1. Remove commons-httpclient-3.1.jar from passport component.

2. Use httpclient 4.4.1 in base/lib instead.

3. Remove randomString methods, use RandomStringUtils.randomAlphanumeric instead.

4. Move getAllowAllHttpClient to UtilHttp.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1735021 13f79535-47bb-0310-9956-ffa450edef68

    • binary
    /passport/lib/commons-httpclient-3.1.jar
    • -34
    • +4
    /solr/src/org/ofbiz/solr/SolrUtil.java
OFBIZ-6715 Solr rebuild problem. Changes are: 1. Comment out solr eecas.xml as it's duplicated to ecas in eecas_product.xml. 2. Add default-value="solrdefault" to indexName of addToSolr service. 3. Replace some tabs with spaces.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1730790 13f79535-47bb-0310-9956-ffa450edef68

    • -31
    • +31
    /solr/home/solrdefault/conf/schema.xml
    • -26
    • +26
    /solr/src/org/ofbiz/solr/SolrUtil.java
Refs OFBIZ-6715 Solr rebuild problem

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1730320 13f79535-47bb-0310-9956-ffa450edef68

    • -32
    • +35
    /solr/home/solrdefault/conf/schema.xml
    • binary
    /solr/lib/runtime/httpmime-4.4.1.jar
    • -13
    • +24
    /solr/src/org/ofbiz/solr/SolrProductSearch.java
    • -8
    • +135
    /solr/src/org/ofbiz/solr/SolrUtil.java
    • binary
    /solr/webapp/solr/WEB-INF/lib/httpmime-4.4.1.jar
OFBIZ-6610 Upgrade Solr and Lucene librairies to version 5

1. Remove the specialpurpose/solr/home/solrdefault/runtime.

2. Remove src attribute in solr jars in .classpath.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1707047 13f79535-47bb-0310-9956-ffa450edef68

OFBIZ-6610 Upgrade Solr and Lucene librairies to version 5

Remove the specialpurpose/solr/home/solrdefault/runtime/indexes.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1707045 13f79535-47bb-0310-9956-ffa450edef68

OFBIZ-6610 Upgrade Solr and Lucene librairies to version 5

1. Upgrade the solr/lucene component to the latest 5.3.1.

2. Angular related js and html files are removed.

3. The jquery-1.7.2.min.js is removed as it's not used in solr.

4. Change specialpurpose/solr/conf to specialpurpose/solr/home.

5. Move specialpurpose/solr/solrdefault to specialpurpose/solr/home/solrdefault.

6. The files under specialpurpose/solr/home/solrdefault are all from solr-5.3.1 package/server/solr/configsets/sample_techproducts_configs/, the solrconfig.xml is configured: <dataDir>${solr.data.dir:runtime/indexes}</dataDir>

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1707042 13f79535-47bb-0310-9956-ffa450edef68

    • binary
    /lucene/lib/lucene-analyzers-common-4.9.0.jar
    • binary
    /lucene/lib/lucene-analyzers-common-5.3.1.jar
    • binary
    /lucene/lib/lucene-core-5.3.1.jar
    • binary
    /lucene/lib/lucene-queryparser-4.9.0.jar
    • binary
    /lucene/lib/lucene-queryparser-5.3.1.jar
    • -0
    • +1
    /solr/home/solrdefault/conf/_rest_managed.json
    • -0
    • +24
    /solr/home/solrdefault/conf/admin-extra.html
  1. … 296 more files in changeset.
OFBIZ-5042 Apache Solr Implementation.

Add permission check on /update, /update/json, /update/csv and /update/extract requests. These requests are defined in an index's solrconfig.xml.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1701495 13f79535-47bb-0310-9956-ffa450edef68

OFBIZ-6601 example component causes exceptions

1. Add specialpurpose/webapp/exampleext/error/error.jsp to display error page.

2. Move specialpurpose/example/widget/exampleext to specialpurpose/exampleext/widget/example.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1701441 13f79535-47bb-0310-9956-ffa450edef68

    • -0
    • +52
    /exampleext/webapp/exampleext/error/error.jsp
OFBIZ-6596 The Solr redirection does not work in trunk demo.

Removed https scheme check and demo-trunk-ofbiz.apache.org/solr/ can be displayed correctly now.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1701379 13f79535-47bb-0310-9956-ffa450edef68