Commit Graph
36 Commits
Author SHA1 Message Date
Shi Jinghai 59ffe3250d 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
2017-06-08 07:19:38 +00:00
Deepak Dixit c1f0182890 Improved: Replace fields with "id-ne", "id-long-ne" and "id-vlong-ne"
with "id", "id-long" and "id-vlong" respectively which are primary keys for plugin components.
(OFBIZ-9351)
Thanks Aditya Sharma for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1796380 13f79535-47bb-0310-9956-ffa450edef68
2017-05-27 11:32:18 +00:00
Taher A. Alkhateeb 436c99ca6d Implemented: renamed the directory specialpurpose to plugins
(OFBIZ-7972)

In another step towards completing the plugin system for OFBiz, we renamed
the /specialpurpose directory to /plugins and changed all occurences of the
word "specialpurpose" to "plugins" in all files found in the system

Reference discussion: http://markmail.org/message/hpyuxkmftiyn44w2


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/plugins@1778271 13f79535-47bb-0310-9956-ffa450edef68
2017-01-11 10:48:47 +00:00
Michael Brohl 1efeab2413 Improved: refactor javadocs in OFBiz to be standards compliant
(OFBIZ-9144)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1774922 13f79535-47bb-0310-9956-ffa450edef68
2016-12-18 18:12:21 +00:00
Divesh Dutta bef0bc4eb3 Improvement: Generic value is null or not should be checked using native checks. Utility method isEmpty or isNotEmpty is not needed to check if generic value is null or not because generic values can never be empty. They can be null or not nulls. So made changes accordingly all over the places.
(OFBIZ-8471)

Thanks: Ratnesh Upadhyay for reporting the improvement and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1768192 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 11:27:46 +00:00
Arun Patidar 8bb8f78872 Improved: Removed semicolon from all Groovy files of all components.
(OFBIZ-8652)

Thanks: Rohit Koushal, Jacques Le Roux and Rishi Solanki for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1767764 13f79535-47bb-0310-9956-ffa450edef68
2016-11-02 19:09:13 +00:00
Michael Brohl fff7f224b4 Improved: Passport : Remove unused imports from groovy files for code optimization.
(OFBIZ-8034)

Thanks: Ankit Joshi for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1761278 13f79535-47bb-0310-9956-ffa450edef68
2016-09-17 20:50:48 +00:00
Jacques Le Roux 354e809e29 A modified patch from Pierre Smits for "Remove legal statement from existing readme files" https://issues.apache.org/jira/browse/OFBIZ-8085
After commit, please rename readme files of components
manufacturing
assetmaint
birt
ecommerce
lucene
myportal
passport
projectmgr
scrum
solr

jleroux: Due to content I guess Pierre meant to add the .md suffix
I have also removed the useless ASL2 header of example/lib/README file

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1758702 13f79535-47bb-0310-9956-ffa450edef68
2016-09-01 05:11:45 +00:00
Jacques Le Roux 856de5ec8e A modified patch from Pierre Smits for "Remove legal statement from existing readme files" https://issues.apache.org/jira/browse/OFBIZ-8085
Legal statements are not required in readme files, as per consensus in dev mail thread with title 'Shorter ASL2 header in short files'. The mail thread started here: http://ofbiz.markmail.org/message/pc5bzrsiupef7xjt

jleroux: 
I modified 
  the accounting/lib/README file
  the example/lib/README file
Formatted the Birt README file



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1758700 13f79535-47bb-0310-9956-ffa450edef68
2016-09-01 04:53:40 +00:00
Jacques Le Roux 9179f9c8ba Fixes "Remove warnings regarding missing component lib folders" - https://issues.apache.org/jira/browse/OFBIZ-7776 - by cleaning/clearing the references to non existent/empty dirs.
Notes: 
* Also removes empty framework/base/lib/scripting and useless applications\content\lib\uno\README (miss doc in wiki)
* When jpim-0.1.jar will be (hopefully) replaced we can drop lib ref in framework/base/ofbiz-component.xml
* I wonder if we should let the geronimo component alone with only 2 classes, could we not put that in entity or entityext?
 
    



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1755306 13f79535-47bb-0310-9956-ffa450edef68
2016-08-05 12:27:21 +00:00
Deepak Dixit 8f3141cd46 (OFBIZ-6274) Renamed OFBiz artefacts from org.ofbiz.* to org.apache.ofbiz.*.Thanks to Taher for working on it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1752920 13f79535-47bb-0310-9956-ffa450edef68
2016-07-16 10:30:49 +00:00
Taher A. Alkhateeb 2963cd7188 Migrate ALL java files from /src to /src/main/java - OFBIZ-7790
This is the first of two steps in the above mentioned JIRA. This
first step changes the java source directory for every component
from /src to /src/main/java. The next step will be adding unit
tests to every component in /src/test/java

Thank you to Deepak Dixit for tips on how to use the SVN commands
to make the appropriate file moving.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1752838 13f79535-47bb-0310-9956-ffa450edef68
2016-07-15 14:17:14 +00:00
Taher A. Alkhateeb 25ffc93eb5 Another major patch for OFBIZ-7534 replacing Ant with Gradle
This is the first patch that takes OFBiz to the point of no return
in terms of switching from Ant to Gradle build system. Specifically
this patch applies the following items:

- Delete all old Ant and Maven build scripts
- Delete 169 Jar libraries and replace them with remote ones in the
  gradle build script
- update the gradle build scripts for the dependencies and other minor
  changes needed for the script work correctly

All tests pass with the command ./gradlew cleanAll loadDefault testIntegration

Again, thank you for everyone who contributed valueble time and effort in this
process.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1752033 13f79535-47bb-0310-9956-ffa450edef68
2016-07-09 18:10:19 +00:00
Arun Patidar 3460bdf9db Applied patch from ticket - OFBIZ-7339 - Replace EntityUtilProperties getPropertyValue method with correct method calls. Thanks Rahul Singh Kushwah and Rishi Solanki for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1749882 13f79535-47bb-0310-9956-ffa450edef68
2016-06-23 13:10:51 +00:00
Jacques Le Roux 4deae05a38 Fixes a "typo" in last commit for "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061
We used targetNamespace (should only be used in schema) instead of xsi:schemaLocation



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1749634 13f79535-47bb-0310-9956-ffa450edef68
2016-06-22 05:58:26 +00:00
Jacques Le Roux a98ac13d9d Completes and finish "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061
This is the 2nd step: puts back the original names, so it will be transparent for remaining references in xml catalogs, Java code, etc.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1749489 13f79535-47bb-0310-9956-ffa450edef68
2016-06-21 11:37:47 +00:00
Jacques Le Roux b20816bfa8 Completes and finish "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061 by replacing xsd files references in xml files by -ns.xsd files and removing the concerned xsd files
This is a 1st step, in a 2nd I will put back the original names, so it will be transparent for remaining reference in xml catalogs, Java code, etc.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1749488 13f79535-47bb-0310-9956-ffa450edef68
2016-06-21 11:14:16 +00:00
Deepak Dixit eb523b9805 (OFBIZ-7245) Renamed groovy file in upper camel case as per best practices
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1747850 13f79535-47bb-0310-9956-ffa450edef68
2016-06-11 06:12:27 +00:00
Deepak Dixit efd3dec8b3 (OFBIZ-7242) Relocate .groovy files in the specialpurpose/passport component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1747794 13f79535-47bb-0310-9956-ffa450edef68
2016-06-10 19:56:19 +00:00
Deepak Dixit 2c25412d8e (OFBIZ-7021) Renamed remaining specialpurpose component ftl file name from lower camel case to upper camel case pattern.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1745115 13f79535-47bb-0310-9956-ffa450edef68
2016-05-23 06:59:04 +00:00
Deepak Dixit d6ff385aba (OFBIZ-6838) relocate .ftl files in the specialpurpose/passport component.
Thanks Pierre for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1740579 13f79535-47bb-0310-9956-ffa450edef68
2016-04-22 18:36:22 +00:00
Shi Jinghai 99d00a4ec0 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
2016-04-10 05:59:25 +00:00
Shi Jinghai 4882df4738 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
2016-03-15 06:06:33 +00:00
Jacques Le Roux b5f3979856 "Upgrade Axis2 to 1.7.0" - https://issues.apache.org/jira/browse/OFBIZ-6916 - Actually this upgrades Axis2 to 1.7.1
Replacing Axis2 1.6.3 by 1.7.1 version is easy as long as you don't try to replace the commons-httpclient-3.1 lib. The only noticeable change is this warning shown in log
    |http-bio-8443-exec-1 |AxisConfigBuilder             |W| Unable to instantiate deployer org.apache.axis2.deployment.ServiceDeployer; see debug logs for more details|
It has no effects on the SOAP test services, both works.

But the main goal of this issue is a security update because commons-httpclient-3.1 lib is deprecated, no longer maintained and vulnerable and must be replaced.

This commit also concerns OFBIZ-6755 but to not mix things OFBIZ-6755 will be completed later. So to not block this issue, the commons-httpclient-3.1 lib is moved from framework/service/lib to specialpurpose/passport/lib/ where it's still required.

Normally, as explained at https://axis.apache.org/axis2/java/core/release-notes/1.7.0.html, Axis2 1.7.1 requires "HttpClient 4.2.x and should work with 4.3.x and 4.4.x, but is incompatible with 4.5.x". I did not replace commons-httpclient-3.1 by HttpClient 4.2.1, which is bundled with Axis2 1.7.1, because we have already HttpClient/Core 4.4.1 in base/lib and it works well as is (HttpClient/Core 4.4.1 is in the classpath).

To use HttpClient/Core 4.4.1 you need to change the axis2.xml files as specified in the 1.7.0 release note. But where to place this file in OFBiz is not obvious! 

I decided the best way was to use Axis2 ConfigurationContextFactory.createConfigurationContextFromFileSystem() method to let know Axis2 we want the new httpclient instead of the default one (I really don't understand why the Axis2 team still prefers commons-httpclient-3.1 as default). I had to pass both locations to avoid hardcoding the repository location in the axis2.xml file.

I have also decided the best place for the "Axis2 repository" (as they call it) was in framework/service/axis2. So following Axis2 convention http://wso2.com/library/tutorials/axis2-repository/ I put the axis2.xml file in framework/service/axis2/conf.
Note: the Axis2 repository could be used to put [Apache Rampart|https://axis.apache.org/axis2/java/rampart/] as a module to secure web services...

After this change, there are a number of warnings thrown by Axis2 but they are actually interesting as they provide guidance for future use of modules and such (notably Apache Rampart)
    |ttp-bio-8443-exec-10 |Utils                         |W| [JAXWS] - unable to load org.apache.axis2.jaxws.dispatchers.GenericProviderDispatcher
    |ttp-bio-8443-exec-10 |Utils                         |W| [JAXWS] - unable to load org.apache.axis2.jaxws.dispatchers.MustUnderstandValidationDispatcher
    |ttp-bio-8443-exec-10 |Utils                         |W| [JAXWS] - unable to load org.apache.axis2.jaxws.dispatchers.MustUnderstandChecker
    |ttp-bio-8443-exec-10 |Utils                         |W| [JAXWS] - unable to load org.apache.axis2.jaxws.dispatchers.GenericProviderDispatcher
    |ttp-bio-8443-exec-10 |Utils                         |W| [JAXWS] - unable to load org.apache.axis2.jaxws.dispatchers.MustUnderstandValidationDispatcher
    |ttp-bio-8443-exec-10 |AxisConfigBuilder             |W| Unable to instantiate deployer org.apache.axis2.deployment.ServiceDeployer; see debug logs for more details
    |ttp-bio-8443-exec-10 |AxisConfigBuilder             |W| Unable to instantiate deployer org.apache.axis2.jaxws.framework.JAXWSDeployer; see debug logs for more details


While at it I replaced StAXOMBuilder (deprecated) by OMXMLBuilderFactory

I will backport the changes in the supported releases branches but R12.04 which use a too old version of HttpClient/Core. Others all use versions older than 4.2.1. I'm aware I will have to handle several conflicts by hand, some are easy others "harder". We have the passport component only in R15.12, it will be easy to neglect in older releases. I expect more work with the LICENSE file and even more with the .classpath file. Since R15.12 we use tabs in it (Adrian rightly told us to use Eclipse internal tools to edit this file, though I noted it does not respect the alphabetical order) but older releases still use spaces (and this is often a pain now, but a bright future ahead ;))

Crossing fingers with this commit, I have other changes pending in this instance (notably for OFBIZ-6849) and it got quite complicated...



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1733956 13f79535-47bb-0310-9956-ffa450edef68
2016-03-07 18:48:14 +00:00
Jacques Le Roux c957c0c02d Reverts Revision: 1732631
This was a test for "Upgrade Axis2 to 1.7.0" - https://issues.apache.org/jira/browse/OFBIZ-6916 and failed: needs more work...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1732637 13f79535-47bb-0310-9956-ffa450edef68
2016-02-27 13:12:10 +00:00
Jacques Le Roux d79c047f3a This is a test for "Upgrade Axis2 to 1.7.0" - https://issues.apache.org/jira/browse/OFBIZ-6916
It's a security update. It also concerns OFBIZ-6755 but to not mix things it will be done later. So to not block this issue, the commons-httpclient-3.1 lib is moved from framework/service/lib to specialpurpose/passport/lib/ where it's still required (no code change in this commit, only libs update)

It's a test because I began this work on Windows and there the NTML Auth is expected https://axis.apache.org/axis2/java/core/docs/http-transport.html#preemptive_auth. So, on my machine, I get this error with testSOAPSimpleService and testSOAPService:

TestRunContainer              |W| [JUNIT (error)] - testSOAPSimpleService : org.ofbiz.service.GenericServiceException: Service [testSoapSimple] Failed (org/apache/commons/httpclient/NTCredentials)
Caused by: java.lang.NoClassDefFoundError: org/apache/commons/httpclient/NTCredentials
	at org.apache.axis2.transport.http.CommonsHTTPTransportSender.createHTTPSender(CommonsHTTPTransportSender.java:414) ~[axis2-transport-http-1.7.0.jar:1.7.0]


Since I don't want to introduce more complexity at this stage I hope the basic Auth will be used in BuildBot and the tests will all pass. Else I will revert and do more work...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1732631 13f79535-47bb-0310-9956-ffa450edef68
2016-02-27 12:28:08 +00:00
Deepak Dixit cab3b7739c (OFBIZ-5780) Fixed some compilation warning:
- Mark some SecurityFactory method as deprecated 
- Mark FoFormRender as deprecated
- Fixed deprecation warning for PassportUtil class.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1731377 13f79535-47bb-0310-9956-ffa450edef68
2016-02-20 11:46:08 +00:00
Jacques Le Roux 0a982250e6 Temporary fix for "UtilXml.LocalResolver.resolveEntity] could not find LOCAL DTD/Schema with publicId [null] and the file/resource is [web-app_3_0.xsd]" - https://issues.apache.org/jira/browse/OFBIZ-6807
As suggested by Deepak keeps only <<web-app version="3.0">> in web.xml files instead of whole xmlns and schemaLocation. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1726388 13f79535-47bb-0310-9956-ffa450edef68
2016-01-23 11:52:08 +00:00
Jacques Le Roux d7d83b655a Fixes "The passport component misses a web.xml file" https://issues.apache.org/jira/browse/OFBIZ-6809
While checking OFBIZ-6794 I found a remaining issue in log. Adding an empty web.xml to the passport webapp was sufficient.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1725006 13f79535-47bb-0310-9956-ffa450edef68
2016-01-16 17:14:52 +00:00
Jacques Le Roux 5649e758dc No functional change, completes r1713985: removes superfluous .properties extension from UtilProperties requests (and yes I checked UspsServicesTests ;))
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1714652 13f79535-47bb-0310-9956-ffa450edef68
2015-11-16 19:02:25 +00:00
Taher A. Alkhateeb 7030086874 another round of javolution removal in achieving OFBIZ-5169
Remove javolution reference from multiple java source files and a few
BIRT reports. I had to replace the FastList with a LinkedList in 
SolrProductSearch.getSideDeepCategories(..) because it uses the 
implementation methods getLast() and removeFirst()

REF https://issues.apache.org/jira/browse/OFBIZ-5169


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1710122 13f79535-47bb-0310-9956-ffa450edef68
2015-10-23 05:52:25 +00:00
Shi Jinghai 0995108dfc OFBIZ-6553 - ant load-extseed cause exception
1. I changed passport enditymodel.xml to remove the 3 warnings on ThirdPartyLogin during OFBiz start.
2. Remove classpath of lib/* from ofbiz-component.xml as the path doesn't exist in the component.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1689990 13f79535-47bb-0310-9956-ffa450edef68
2015-07-09 05:52:01 +00:00
Shi Jinghai d491b85d04 OFBIZ-6548. Change OAuth2GitHubSeedData.xml and OAuth2LinkedInSeedData.xml from seed to demo as the productStoreId 9000 is in a demo data.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1689781 13f79535-47bb-0310-9956-ffa450edef68
2015-07-08 02:31:59 +00:00
Jacques Le Roux 25ec69fd18 Removes duplicated label
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1689598 13f79535-47bb-0310-9956-ffa450edef68
2015-07-07 08:31:43 +00:00
Shi Jinghai 62767278d0 OFBIZ-6135 - Passport Component for OAuth2
1. Commented out the passport files include in ecomseo.
2. Add quick start steps in README.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1689400 13f79535-47bb-0310-9956-ffa450edef68
2015-07-06 13:51:44 +00:00
Shi Jinghai f2ff13fb59 OFBIZ-6135 - Passport Component for OAuth2
The oauth2 login icons will appear in /ecomseo/checkLogin page if the seed data files are properly configured and imported into database.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1688503 13f79535-47bb-0310-9956-ffa450edef68
2015-06-30 18:38:16 +00:00