Commit Graph
143 Commits
Author SHA1 Message Date
Jacques Le Roux b8ca5543c9 Changes in all labels files: <value xml:lang="(.*)_(.*)"> to <value xml:lang="$1-$2">
Changes also listLocales.ftl to show dashes rather than underscores

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1650880 13f79535-47bb-0310-9956-ffa450edef68
2015-01-11 09:59:32 +00:00
Adrian Crum 91feff5f51 Updated the UI label files so they reference a schema.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649666 13f79535-47bb-0310-9956-ffa450edef68
2015-01-05 21:24:18 +00:00
Ashish Vijaywargiya 039f0608bc Applied framework related patch from jira issue - OFBIZ-5844 - Convert java files to EntityQuery.
Thanks Arun for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1646212 13f79535-47bb-0310-9956-ffa450edef68
2014-12-17 12:13:46 +00:00
Jacques Le Roux 4330fcd646 Following changes for "PortalPage entity definition wrong. ownerUserLoginId field must be id-vlong-ne" https://issues.apache.org/jira/browse/OFBIZ-5110
Fixes other cases as well

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1639863 13f79535-47bb-0310-9956-ffa450edef68
2014-11-15 12:14:37 +00:00
Scott Gray 96cd99914e Remove unnecessary imports
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1634027 13f79535-47bb-0310-9956-ffa450edef68
2014-10-24 08:28:47 +00:00
Jacques Le Roux 3b118d4842 An excerpt of a patch from Nick Ho for "Add/Revise Traditional Chinese (zh-TW) translations" https://issues.apache.org/jira/browse/OFBIZ-5764
added/revised zh-TW translations in the framework, applications and specialpurpose folders to have consistent, commonly-used meaningful terms in Traditional Chinese.

jleroux: from Nick Ho's patch I have extracted only the Chinese changes, w/o the proposed  dash to underscore changes
This contains notably this 14 "zh" (not "sh-TW") changes:
<value xml:lang="zh">人将由电子邮件接受一个临时密码。</value><!-- was 客户将通过电子邮件收到一个临时密码。 -->
<value xml:lang="zh">合计属于公司: </value>
<value xml:lang="zh"> 完整文本:${fullText}</value>
<value xml:lang="zh">供货商佣金百分比</value>
<value xml:lang="zh">文本大小</value>
<value xml:lang="zh">值</value>
<value xml:lang="zh">算子</value>
<value xml:lang="zh">不能转移已序列化的库存。</value>
<value xml:lang="zh">货运收据</value>
<value xml:lang="zh">获取标识为 ${productStoreShipMethId} 的产品店铺送货方法(ProductStoreShipmentMeth)时出错:${errorString}</value>
<value xml:lang="zh">中国人民币元</value>
<value xml:lang="zh">如果选择"specify other",下拉框旁边会出现文本框。参考form的drop-down元素的other-field-size属性说明</value>
<value xml:lang="zh">文本消息</value>
<value xml:lang="zh">能够收到和解析XML消息,但是BSR->NOUN(买卖关系->名词) ${bsrNoun} 和/或 BSR->VERB(买卖关系->动词) ${bsrVerb} 是空的</value>
I have no competency to judge these changes, but from previous Shi Jinghai's feedback I believe there are OK

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1625816 13f79535-47bb-0310-9956-ffa450edef68
2014-09-17 20:44:07 +00:00
Jacques Le Roux a61be3e0ff A patch from Shi Jinghai for "Add/Revise Traditional Chinese (zh-TW) translations in framework" https://issues.apache.org/jira/browse/OFBIZ-5737
I fixed the duplicated zh:
<value xml:lang="zh">分类页面</value>
<value xml:lang="zh">分類頁面</value>
to
<value xml:lang="zh">分类页面</value>
<value xml:lang="zh_TW">分類頁面</value>
in this patch.

Others are corrections on zh labels thank to Nick Ho's translation.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1623359 13f79535-47bb-0310-9956-ffa450edef68
2014-09-08 11:13:00 +00:00
Jacques Le Roux 425ce1c003 A patch from Nick Ho for "Add/Revise Traditional Chinese (zh-TW) translations in framework" https://issues.apache.org/jira/browse/OFBIZ-5737
more added/updated translations patch files for zh-TW locale

jleroux: 
I added the label
<value xml:lang="zh_TW">服務執行程式拋出一個異常</value>
by hand
Only 1 label was not added:
<value xml:lang="zh_TW">代號</value>
Because of the fuzziness and presence of several possibilities


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1621688 13f79535-47bb-0310-9956-ffa450edef68
2014-09-01 06:51:33 +00:00
Hans Bakker 2d5f2903a3 fixed null pointer exeption will viewing a content record in webtools
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1535291 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 07:03:52 +00:00
Hans Bakker 834c6ac2d8 revert of unwanted commit, sorry!
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1535287 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 06:42:34 +00:00
Hans Bakker 45011c0ed1 reorganizing of files
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1535286 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 06:39:36 +00:00
Adrian Crum 8615235194 Refactored SecurityFactory implementation - make OFBizSecurity an inner private class, plus some code cleanup.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1531602 13f79535-47bb-0310-9956-ffa450edef68
2013-10-12 22:24:13 +00:00
Adrian Crum 6c45957573 Oops, I forgot to remove a debug statement from my last commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1531578 13f79535-47bb-0310-9956-ffa450edef68
2013-10-12 18:58:59 +00:00
Adrian Crum 57816747d7 Refactored SecurityFactory implementation - use Java's ServiceLoader to discover Security implementations, instead of using configuration files.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1531577 13f79535-47bb-0310-9956-ffa450edef68
2013-10-12 18:54:59 +00:00
Adrian Crum 54d2cdba1a Removed unused META-INF folder from security component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1531576 13f79535-47bb-0310-9956-ffa450edef68
2013-10-12 18:52:39 +00:00
Adrian Crum 53be886210 Some work on the Security component:
1. Some code cleanup and optimization in OFBizSecurity.java. We can use the entity condition cache now that the cache has been fixed.

2. Added @Override annotations to methods that implement the interface.

3. Flagged some Security interface methods as deprecated because they are implementation-specific. If the idea is to have a pluggable Security implementation, then the interface should not reference the entity-engine-based implementation - because a replacement implementation might not use the entity engine.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1530471 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 00:50:22 +00:00
Jacopo Cappellato 2294582c2d Fixed typo in comment
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1517451 13f79535-47bb-0310-9956-ffa450edef68
2013-08-26 07:59:44 +00:00
Adam Heath 256a4af82b FEATURE: Allow for externalLoginKey parameter generation to be turned
off; the use for this feature will become apparent shortly.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1497891 13f79535-47bb-0310-9956-ffa450edef68
2013-06-28 19:08:24 +00:00
Adrian Crum 34704f3fdc Some work on the security component:
1. Fixed the XSD.
2. Fixed a bad config file.
3. Removed cached DOM code.
4. Simplified Security factory code.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1491345 13f79535-47bb-0310-9956-ffa450edef68
2013-06-10 05:53:54 +00:00
Jacques Le Roux b0d0ea3073 Fix a minor issue "Default UserLogin screen is throwing an exception when password is incorrect and its size more then 16 chars." reported by Sumit Pandit at https://issues.apache.org/jira/browse/OFBIZ-5001
I simply changed UserLoginHistory.passwordUsed field from short-varchar to long-varchar

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1470134 13f79535-47bb-0310-9956-ffa450edef68
2013-04-20 09:16:02 +00:00
Jacques Le Roux 54ece545d9 I missed to commit security.properties with r1465185. Thanks to Leon for warning
+ French labels


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1465347 13f79535-47bb-0310-9956-ffa450edef68
2013-04-07 09:08:21 +00:00
Jacques Le Roux 03a62ac947 A slightly modified patch from Sumit Pandit for "Additional Validation for Password : Make password pattern driven" https://issues.apache.org/jira/browse/OFBIZ-4958
Provides an additional validation for password  with following capability to the system:

Admin can enable/disable pattern based password capability of system. Configuration will reside in security.property file.
 To enable : security.login.password.pattern.enable=true
 To disable: security.login.password.pattern.enable=false

Admin is flexible to provide his pattern string by making pattern more/less restrictive as per system requirement. Configuration will reside in security.property file.
 Example: security.login.password.pattern=^.*(?=. {5,})(?=.[a-zA-Z])(?=.[!@#$%^&*]).*$

Admin can provide custom error message string which will display to end user if wrong password is entered. Configuration will reside in security.properity file.

jleroux: I quickly handled the error message localisation for the OOTB case. It's more complicated when the pattern gets complex...


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1418996 13f79535-47bb-0310-9956-ffa450edef68
2012-12-09 14:59:52 +00:00
Jacques Le Roux ecd2de6362 A patch from Naofumi Fukue "Japanese patch" https://issues.apache.org/jira/browse/OFBIZ-5061
Completed Japanese translation

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1412997 13f79535-47bb-0310-9956-ffa450edef68
2012-11-23 17:35:16 +00:00
Jacques Le Roux b46c7a2c06 A patch from Naofumi Fukue "Japanese patch" https://issues.apache.org/jira/browse/OFBIZ-5061
Got an issue merging GeoData_JP.xml with Subclipse, using Toirtoise solved it

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1403746 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 15:48:42 +00:00
Adrian Crum a17298a06e Removed unused "authz" security code - https://issues.apache.org/jira/browse/OFBIZ-4839.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1360283 13f79535-47bb-0310-9956-ffa450edef68
2012-07-11 16:34:26 +00:00
Hans Bakker 7e5c9958a5 manual payment is used: reverting r1352439
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1352441 13f79535-47bb-0310-9956-ffa450edef68
2012-06-21 08:03:11 +00:00
Hans Bakker 66d5f75d5e removed unused security permission: MANUAL_PAYMENT
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1352439 13f79535-47bb-0310-9956-ffa450edef68
2012-06-21 07:52:23 +00:00
Hans Bakker bd16dfb598 split up securitypermissions as seed data and securitygroups as demo data with a single exception: the creation of a super security group which has general access to the system and which is used with the 'ant create-admin-user-login' command.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1352431 13f79535-47bb-0310-9956-ffa450edef68
2012-06-21 07:21:49 +00:00
Hans Bakker 9607b08c5c Removed unused SHIPRATE_* security
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1351587 13f79535-47bb-0310-9956-ffa450edef68
2012-06-19 07:07:01 +00:00
Hans Bakker 14f4e5a292 reverted recent security file changes revisions: 1350847,1350843,1350840,1348534,1347908,1347213,1346264, need more investigation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1351206 13f79535-47bb-0310-9956-ffa450edef68
2012-06-18 04:36:20 +00:00
Hans Bakker a64d64b80a Some security data is really seed data, added informational messages to indicate security data is not loaded when selected seed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1350840 13f79535-47bb-0310-9956-ffa450edef68
2012-06-16 02:32:04 +00:00
Hans Bakker fff7f99081 introduced a new data-reader : 'security'
Security is now by default not loaded because not part of seed anymore this will make all component hidden and not accessible .
It is still loaded as part of the reader 'demo'

to load the security files:
./ant load-readers -Ddata-readers=security

Now it is possible to load only a selection of the security files in your hot-deploy component as follows:

<entity-resource type=data reader-name=seed loader=main location=../../framework/security/data/SecurityData.xml/>
<entity-resource type=data reader-name=seed loader=main location=../../framework/webtools/data/WebtoolsSecurityData.xml/>
<entity-resource type=data reader-name=seed loader=main location=../../applications/party/data/PartySecurityData.xml/>

This will enable only standard groups, the party and the webtools application.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1346255 13f79535-47bb-0310-9956-ffa450edef68
2012-06-05 06:37:06 +00:00
Jacopo Cappellato fcdf07a0e6 Improved code that manages the cache:
* protected some UtilCache objects (static fields) by making them private and final

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343815 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 16:18:02 +00:00
Adam Heath 9e5f405a4d DEPRECATION: framework: findByAnd variants replaced with findByAnd that takes a boolean useCache parameter.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1338403 13f79535-47bb-0310-9956-ffa450edef68
2012-05-14 20:59:54 +00:00
Adam Heath da8bf922fc FIX: Properly fix 1327736, which was reverted in 1327866. I have no
idea where those bad digest password values came from.  Really, I have
no clue.  Everything worked in testing.  I'm very confused.  I have
verified that I can log in now with the demo accounts.  Sorry about the
breakage.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1334173 13f79535-47bb-0310-9956-ffa450edef68
2012-05-04 20:42:57 +00:00
Jacopo Cappellato 3736c9856c Reverted rev. 1327736: with it it was impossible to log in with demo accounts.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327866 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 08:43:54 +00:00
Adam Heath 6ea609d022 FIX: Fix a bunch of hashed passwords that had the oldFunnyHex encoding.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327736 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 23:48:51 +00:00
Jacopo Cappellato 160982d9e7 Enhanced GroovyUtil to support the execution of data preparation methods defined in a Groovy script file (similarly to what is already supported by the ScriptUtil class for JSR223).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1326996 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 08:44:43 +00:00
Hans Bakker 0372daa663 OFBIZ-4638: make ofbiz run with openjdk7,6. Contribution of Chattree
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1299985 13f79535-47bb-0310-9956-ffa450edef68
2012-03-13 06:50:41 +00:00
Andrew Zeneski 11bcb7d52e reverted previous commit since it breaks SUN (oracle) JDK, ick.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1211088 13f79535-47bb-0310-9956-ffa450edef68
2011-12-06 20:25:52 +00:00
Andrew Zeneski 15228ae88b few minor changes to fix compiling with openjdk icetea6 1.7.9
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1211073 13f79535-47bb-0310-9956-ffa450edef68
2011-12-06 19:51:28 +00:00
Marco Risaliti 9178f9ec3f Removed some javadoc warning (wrong param/return) into security component no functional changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1127281 13f79535-47bb-0310-9956-ffa450edef68
2011-05-24 20:57:33 +00:00
Jacques Le Roux f72c067344 Closes <<Caching is used by org.ofbiz.webapp.control.ProtectViewWorker(line 68) for UserLoginAndProtectedView (since changeset r1075350), but the view has set never-cache="true">> reported by Jonas Hoef at https://issues.apache.org/jira/browse/OFBIZ-4243
I wondered if I should not remove the event from the common-controller since I guess this is rarely used. But, as the functionality is available OOTB, I preferred to keep it as is. So I simply remove the never-cache from  UserLoginAndProtectedView view-entity. Since it will almost always be empty, no memory issues and better performance are expected. If I remember well, at the moment I committed this, I checked: the performance impact was already not noticeable (most of the time only one check in the event).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1100197 13f79535-47bb-0310-9956-ffa450edef68
2011-05-06 13:07:18 +00:00
Marco Risaliti 1f3a3dc9db Add a @SuppressWarning("serial") in SecurityConfigurationException (OFBIZ-4102)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1069087 13f79535-47bb-0310-9956-ffa450edef68
2011-02-09 20:53:31 +00:00
Adrian Crum 39611c4c9f Moved some security related demo data from the applications/securityext folder to the framework/security folder. This change accommodates logging in as admin in a framework-only demo installation.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1050053 13f79535-47bb-0310-9956-ffa450edef68
2010-12-16 16:45:47 +00:00
Adam Heath 2f6217251a Set svn:eol-style properly on all java files. This needs to be done on other text files as well, but that would cause undo conflicts in the jquery branch(due to .js being heavily modified there). Also, some files were committed to the repository with DOS line endings; those are fixed as well.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1044202 13f79535-47bb-0310-9956-ffa450edef68
2010-12-10 02:40:02 +00:00
Jacques Le Roux 66c5dd10a0 A patch from Dukian "Add Traditional Chinese translation for applications, ecommerce, and ofbizsetup" (https://issues.apache.org/jira/browse/OFBIZ-4031) - OFBIZ-4031
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1039574 13f79535-47bb-0310-9956-ffa450edef68
2010-11-26 21:56:14 +00:00
Jacques Le Roux b8689d9e7a A patch from Sascha Rodekamp "Security Update for forgotten passwords " (https://issues.apache.org/jira/browse/OFBIZ-3842) - OFBIZ-3842
Improve the a random Password generation when the "require new password" function is called. In the current Trunk it's a kind of hard coded password that will be send to the user. After generating a new pass the "requireNewPassword" flag will be set to true (configurable).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1038209 13f79535-47bb-0310-9956-ffa450edef68
2010-11-23 17:13:53 +00:00
Jacques Le Roux 6193dd4e53 <author>None</author> is totally useless and we don't need an author OOTB
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949101 13f79535-47bb-0310-9956-ffa450edef68
2010-05-28 05:41:23 +00:00
Jacques Le Roux 63fd94e778 Not sure why, but my regexp S/R in the commit r948846 boke some formatting. I also removed some useless other stuff in this commit
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@948852 13f79535-47bb-0310-9956-ffa450edef68
2010-05-27 14:45:59 +00:00