svn commit: r1353081 [1/4] - in /ofbiz/branches/jackrabbit20120501: ./ applications/accounting/ applications/accounting/data/ applications/accounting/src/org/ofbiz/accounting/payment/ applications/accounting/webapp/accounting/payment/ applications/acco...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1353081 [1/4] - in /ofbiz/branches/jackrabbit20120501: ./ applications/accounting/ applications/accounting/data/ applications/accounting/src/org/ofbiz/accounting/payment/ applications/accounting/webapp/accounting/payment/ applications/acco...

sascharodekamp
Author: sascharodekamp
Date: Sat Jun 23 07:04:16 2012
New Revision: 1353081

URL: http://svn.apache.org/viewvc?rev=1353081&view=rev
Log:
Merge trunk into branch to keep the branch up to date

Added:
    ofbiz/branches/jackrabbit20120501/applications/accounting/data/AccountingSecurityGroupDemoData.xml
      - copied unchanged from r1353077, ofbiz/trunk/applications/accounting/data/AccountingSecurityGroupDemoData.xml
    ofbiz/branches/jackrabbit20120501/applications/accounting/data/AccountingSecurityPermissionSeedData.xml
      - copied unchanged from r1353077, ofbiz/trunk/applications/accounting/data/AccountingSecurityPermissionSeedData.xml
    ofbiz/branches/jackrabbit20120501/applications/commonext/data/CommonExtSecurityGroupDemoData.xml
      - copied unchanged from r1353077, ofbiz/trunk/applications/commonext/data/CommonExtSecurityGroupDemoData.xml
    ofbiz/branches/jackrabbit20120501/applications/commonext/data/CommonExtSecurityPermissionSeedData.xml
      - copied unchanged from r1353077, ofbiz/trunk/applications/commonext/data/CommonExtSecurityPermissionSeedData.xml
    ofbiz/branches/jackrabbit20120501/applications/commonext/data/OfbizSetupSecurityGroupDemoData.xml
      - copied unchanged from r1353077, ofbiz/trunk/applications/commonext/data/OfbizSetupSecurityGroupDemoData.xml
    ofbiz/branches/jackrabbit20120501/applications/commonext/data/OfbizSetupSecurityPermissionSeedData.xml
      - copied unchanged from r1353077, ofbiz/trunk/applications/commonext/data/OfbizSetupSecurityPermissionSeedData.xml
    ofbiz/branches/jackrabbit20120501/applications/content/data/ContentSecurityGroupDemoData.xml
      - copied unchanged from r1353077, ofbiz/trunk/applications/content/data/ContentSecurityGroupDemoData.xml
    ofbiz/branches/jackrabbit20120501/applications/content/data/ContentSecurityPermissionSeedData.xml
      - copied unchanged from r1353077, ofbiz/trunk/applications/content/data/ContentSecurityPermissionSeedData.xml
    ofbiz/branches/jackrabbit20120501/applications/humanres/data/HumanResSecurityGroupDemoData.xml
      - copied unchanged from r1353077, ofbiz/trunk/applications/humanres/data/HumanResSecurityGroupDemoData.xml
    ofbiz/branches/jackrabbit20120501/applications/humanres/data/HumanResSecurityPermissionSeedData.xml
      - copied unchanged from r1353077, ofbiz/trunk/applications/humanres/data/HumanResSecurityPermissionSeedData.xml
    ofbiz/branches/jackrabbit20120501/applications/manufacturing/data/ManufacturingSecurityGroupDemoData.xml
      - copied unchanged from r1353077, ofbiz/trunk/applications/manufacturing/data/ManufacturingSecurityGroupDemoData.xml
    ofbiz/branches/jackrabbit20120501/applications/manufacturing/data/ManufacturingSecurityPermissionSeedData.xml
      - copied unchanged from r1353077, ofbiz/trunk/applications/manufacturing/data/ManufacturingSecurityPermissionSeedData.xml
    ofbiz/branches/jackrabbit20120501/applications/marketing/data/MarketingSecurityGroupDemoData.xml
      - copied unchanged from r1353077, ofbiz/trunk/applications/marketing/data/MarketingSecurityGroupDemoData.xml
    ofbiz/branches/jackrabbit20120501/applications/marketing/data/MarketingSecurityPermissionSeedData.xml
      - copied unchanged from r1353077, ofbiz/trunk/applications/marketing/data/MarketingSecurityPermissionSeedData.xml
    ofbiz/branches/jackrabbit20120501/applications/order/data/OrderSecurityGroupDemoData.xml
      - copied unchanged from r1353077, ofbiz/trunk/applications/order/data/OrderSecurityGroupDemoData.xml
    ofbiz/branches/jackrabbit20120501/applications/order/data/OrderSecurityPermissionSeedData.xml
      - copied unchanged from r1353077, ofbiz/trunk/applications/order/data/OrderSecurityPermissionSeedData.xml
    ofbiz/branches/jackrabbit20120501/applications/party/data/PartySecurityGroupDemoData.xml
      - copied unchanged from r1353077, ofbiz/trunk/applications/party/data/PartySecurityGroupDemoData.xml
    ofbiz/branches/jackrabbit20120501/applications/party/data/PartySecurityPermissionSeedData.xml
      - copied unchanged from r1353077, ofbiz/trunk/applications/party/data/PartySecurityPermissionSeedData.xml
    ofbiz/branches/jackrabbit20120501/applications/product/data/FacilitySecurityGroupDemoData.xml
      - copied unchanged from r1353077, ofbiz/trunk/applications/product/data/FacilitySecurityGroupDemoData.xml
    ofbiz/branches/jackrabbit20120501/applications/product/data/FacilitySecurityPermissionSeedData.xml
      - copied unchanged from r1353077, ofbiz/trunk/applications/product/data/FacilitySecurityPermissionSeedData.xml
    ofbiz/branches/jackrabbit20120501/applications/product/data/ProductSecurityGroupDemoData.xml
      - copied unchanged from r1353077, ofbiz/trunk/applications/product/data/ProductSecurityGroupDemoData.xml
    ofbiz/branches/jackrabbit20120501/applications/product/data/ProductSecurityPermissionSeedData.xml
      - copied unchanged from r1353077, ofbiz/trunk/applications/product/data/ProductSecurityPermissionSeedData.xml
    ofbiz/branches/jackrabbit20120501/applications/workeffort/data/WorkEffortSecurityGroupDemoData.xml
      - copied unchanged from r1353077, ofbiz/trunk/applications/workeffort/data/WorkEffortSecurityGroupDemoData.xml
    ofbiz/branches/jackrabbit20120501/applications/workeffort/data/WorkEffortSecurityPermissionSeedData.xml
      - copied unchanged from r1353077, ofbiz/trunk/applications/workeffort/data/WorkEffortSecurityPermissionSeedData.xml
    ofbiz/branches/jackrabbit20120501/framework/base/lib/j2eespecs/annotations-api-3.0.jar
      - copied unchanged from r1353077, ofbiz/trunk/framework/base/lib/j2eespecs/annotations-api-3.0.jar
    ofbiz/branches/jackrabbit20120501/framework/base/lib/j2eespecs/el-api-2.2.jar
      - copied unchanged from r1353077, ofbiz/trunk/framework/base/lib/j2eespecs/el-api-2.2.jar
    ofbiz/branches/jackrabbit20120501/framework/base/lib/j2eespecs/jsp-api-2.2.jar
      - copied unchanged from r1353077, ofbiz/trunk/framework/base/lib/j2eespecs/jsp-api-2.2.jar
    ofbiz/branches/jackrabbit20120501/framework/base/lib/j2eespecs/servlet-api-3.0.jar
      - copied unchanged from r1353077, ofbiz/trunk/framework/base/lib/j2eespecs/servlet-api-3.0.jar
    ofbiz/branches/jackrabbit20120501/framework/bi/data/BiSecurityGroupDemoData.xml
      - copied unchanged from r1353077, ofbiz/trunk/framework/bi/data/BiSecurityGroupDemoData.xml
    ofbiz/branches/jackrabbit20120501/framework/bi/data/BiSecurityPermissionSeedData.xml
      - copied unchanged from r1353077, ofbiz/trunk/framework/bi/data/BiSecurityPermissionSeedData.xml
    ofbiz/branches/jackrabbit20120501/framework/catalina/lib/tomcat-7.0.28.catalina-ha.jar
      - copied unchanged from r1353077, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.28.catalina-ha.jar
    ofbiz/branches/jackrabbit20120501/framework/catalina/lib/tomcat-7.0.28.catalina-tribes.jar
      - copied unchanged from r1353077, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.28.catalina-tribes.jar
    ofbiz/branches/jackrabbit20120501/framework/catalina/lib/tomcat-7.0.28.tomcat-embed-core.jar
      - copied unchanged from r1353077, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.28.tomcat-embed-core.jar
    ofbiz/branches/jackrabbit20120501/framework/catalina/lib/tomcat-7.0.28.tomcat-embed-jasper.jar
      - copied unchanged from r1353077, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.28.tomcat-embed-jasper.jar
    ofbiz/branches/jackrabbit20120501/framework/catalina/lib/tomcat-7.0.28.tomcat-embed-logging-log4j.jar
      - copied unchanged from r1353077, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.28.tomcat-embed-logging-log4j.jar
    ofbiz/branches/jackrabbit20120501/framework/common/data/CommonSecurityGroupDemoData.xml
      - copied unchanged from r1353077, ofbiz/trunk/framework/common/data/CommonSecurityGroupDemoData.xml
    ofbiz/branches/jackrabbit20120501/framework/common/data/CommonSecurityPermissionSeedData.xml
      - copied unchanged from r1353077, ofbiz/trunk/framework/common/data/CommonSecurityPermissionSeedData.xml
    ofbiz/branches/jackrabbit20120501/framework/entityext/data/EntityExtSecurityGroupDemoData.xml
      - copied unchanged from r1353077, ofbiz/trunk/framework/entityext/data/EntityExtSecurityGroupDemoData.xml
    ofbiz/branches/jackrabbit20120501/framework/entityext/data/EntityExtSecurityPermissionSeedData.xml
      - copied unchanged from r1353077, ofbiz/trunk/framework/entityext/data/EntityExtSecurityPermissionSeedData.xml
    ofbiz/branches/jackrabbit20120501/framework/images/webapp/images/jquery/jquery-1.7.2.js
      - copied unchanged from r1353077, ofbiz/trunk/framework/images/webapp/images/jquery/jquery-1.7.2.js
    ofbiz/branches/jackrabbit20120501/framework/images/webapp/images/jquery/jquery-1.7.2.min.js
      - copied unchanged from r1353077, ofbiz/trunk/framework/images/webapp/images/jquery/jquery-1.7.2.min.js
    ofbiz/branches/jackrabbit20120501/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-1.0.0.js
      - copied unchanged from r1353077, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-1.0.0.js
    ofbiz/branches/jackrabbit20120501/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-gl.js
      - copied unchanged from r1353077, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-gl.js
    ofbiz/branches/jackrabbit20120501/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ko.js
      - copied unchanged from r1353077, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ko.js
    ofbiz/branches/jackrabbit20120501/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-no.js
      - copied unchanged from r1353077, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-no.js
    ofbiz/branches/jackrabbit20120501/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-sv.js
      - copied unchanged from r1353077, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-sv.js
    ofbiz/branches/jackrabbit20120501/framework/security/data/SecurityGroupDemoData.xml
      - copied unchanged from r1353077, ofbiz/trunk/framework/security/data/SecurityGroupDemoData.xml
    ofbiz/branches/jackrabbit20120501/framework/security/data/SecurityPermissionSeedData.xml
      - copied unchanged from r1353077, ofbiz/trunk/framework/security/data/SecurityPermissionSeedData.xml
    ofbiz/branches/jackrabbit20120501/framework/service/data/ServiceSecurityGroupDemoData.xml
      - copied unchanged from r1353077, ofbiz/trunk/framework/service/data/ServiceSecurityGroupDemoData.xml
    ofbiz/branches/jackrabbit20120501/framework/service/data/ServiceSecurityPermissionSeedData.xml
      - copied unchanged from r1353077, ofbiz/trunk/framework/service/data/ServiceSecurityPermissionSeedData.xml
    ofbiz/branches/jackrabbit20120501/framework/webtools/data/WebtoolsSecurityGroupDemoData.xml
      - copied unchanged from r1353077, ofbiz/trunk/framework/webtools/data/WebtoolsSecurityGroupDemoData.xml
    ofbiz/branches/jackrabbit20120501/framework/webtools/data/WebtoolsSecurityPermissionSeedData.xml
      - copied unchanged from r1353077, ofbiz/trunk/framework/webtools/data/WebtoolsSecurityPermissionSeedData.xml
    ofbiz/branches/jackrabbit20120501/framework/webtools/webapp/webtools/WEB-INF/actions/service/JobDetails.groovy
      - copied unchanged from r1353077, ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/JobDetails.groovy
    ofbiz/branches/jackrabbit20120501/specialpurpose/assetmaint/data/AssetMaintSecurityGroupDemoData.xml
      - copied unchanged from r1353077, ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSecurityGroupDemoData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/assetmaint/data/AssetMaintSecurityPermissionSeedData.xml
      - copied unchanged from r1353077, ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSecurityPermissionSeedData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/ebay/data/EbaySecurityGroupDemoData.xml
      - copied unchanged from r1353077, ofbiz/trunk/specialpurpose/ebay/data/EbaySecurityGroupDemoData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/ebay/data/EbaySecurityPermissionSeedData.xml
      - copied unchanged from r1353077, ofbiz/trunk/specialpurpose/ebay/data/EbaySecurityPermissionSeedData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/ebaystore/data/EbayStoreSecurityGroupDemoData.xml
      - copied unchanged from r1353077, ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreSecurityGroupDemoData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/ebaystore/data/EbayStoreSecurityPermissionSeedData.xml
      - copied unchanged from r1353077, ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreSecurityPermissionSeedData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/example/data/ExampleSecurityGroupDemoData.xml
      - copied unchanged from r1353077, ofbiz/trunk/specialpurpose/example/data/ExampleSecurityGroupDemoData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/example/data/ExampleSecurityPermissionSeedData.xml
      - copied unchanged from r1353077, ofbiz/trunk/specialpurpose/example/data/ExampleSecurityPermissionSeedData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/googlebase/data/GoogleBaseSecurityGroupDemoData.xml
      - copied unchanged from r1353077, ofbiz/trunk/specialpurpose/googlebase/data/GoogleBaseSecurityGroupDemoData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/googlebase/data/GoogleBaseSecurityPermissionSeedData.xml
      - copied unchanged from r1353077, ofbiz/trunk/specialpurpose/googlebase/data/GoogleBaseSecurityPermissionSeedData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityGroupDemoData.xml
      - copied unchanged from r1353077, ofbiz/trunk/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityGroupDemoData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityPermissionSeedData.xml
      - copied unchanged from r1353077, ofbiz/trunk/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityPermissionSeedData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/hhfacility/data/HhFacilitySecurityGroupDemoData.xml
      - copied unchanged from r1353077, ofbiz/trunk/specialpurpose/hhfacility/data/HhFacilitySecurityGroupDemoData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/hhfacility/data/HhFacilitySecurityPermissionSeedData.xml
      - copied unchanged from r1353077, ofbiz/trunk/specialpurpose/hhfacility/data/HhFacilitySecurityPermissionSeedData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/myportal/data/MyPortalSecurityGroupDemoData.xml
      - copied unchanged from r1353077, ofbiz/trunk/specialpurpose/myportal/data/MyPortalSecurityGroupDemoData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/myportal/data/MyPortalSecurityPermissionSeedData.xml
      - copied unchanged from r1353077, ofbiz/trunk/specialpurpose/myportal/data/MyPortalSecurityPermissionSeedData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/oagis/data/OagisSecurityGroupDemoData.xml
      - copied unchanged from r1353077, ofbiz/trunk/specialpurpose/oagis/data/OagisSecurityGroupDemoData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/oagis/data/OagisSecurityPermissionSeedData.xml
      - copied unchanged from r1353077, ofbiz/trunk/specialpurpose/oagis/data/OagisSecurityPermissionSeedData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/projectmgr/data/ProjectMgrSecurityGroupDemoData.xml
      - copied unchanged from r1353077, ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrSecurityGroupDemoData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/projectmgr/data/ProjectMgrSecurityPermissionSeedData.xml
      - copied unchanged from r1353077, ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrSecurityPermissionSeedData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/scrum/data/scrumSecurityGroupDemoData.xml
      - copied unchanged from r1353077, ofbiz/trunk/specialpurpose/scrum/data/scrumSecurityGroupDemoData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/scrum/data/scrumSecurityPermissionSeedData.xml
      - copied unchanged from r1353077, ofbiz/trunk/specialpurpose/scrum/data/scrumSecurityPermissionSeedData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/webpos/data/WebPosSecurityGroupDemoData.xml
      - copied unchanged from r1353077, ofbiz/trunk/specialpurpose/webpos/data/WebPosSecurityGroupDemoData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/webpos/data/WebPosSecurityPermissionSeedData.xml
      - copied unchanged from r1353077, ofbiz/trunk/specialpurpose/webpos/data/WebPosSecurityPermissionSeedData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/workflow/data/WorkFlowSecurityGroupDemoData.xml
      - copied unchanged from r1353077, ofbiz/trunk/specialpurpose/workflow/data/WorkFlowSecurityGroupDemoData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/workflow/data/WorkFlowSecurityPermissionSeedData.xml
      - copied unchanged from r1353077, ofbiz/trunk/specialpurpose/workflow/data/WorkFlowSecurityPermissionSeedData.xml
Removed:
    ofbiz/branches/jackrabbit20120501/applications/accounting/data/AccountingSecurityData.xml
    ofbiz/branches/jackrabbit20120501/applications/commonext/data/CommonExtSecurityData.xml
    ofbiz/branches/jackrabbit20120501/applications/commonext/data/OfbizSetupSecurityData.xml
    ofbiz/branches/jackrabbit20120501/applications/content/data/ContentSecurityData.xml
    ofbiz/branches/jackrabbit20120501/applications/humanres/data/HumanResSecurityData.xml
    ofbiz/branches/jackrabbit20120501/applications/manufacturing/data/ManufacturingSecurityData.xml
    ofbiz/branches/jackrabbit20120501/applications/marketing/data/MarketingSecurityData.xml
    ofbiz/branches/jackrabbit20120501/applications/order/data/OrderSecurityData.xml
    ofbiz/branches/jackrabbit20120501/applications/party/data/PartySecurityData.xml
    ofbiz/branches/jackrabbit20120501/applications/product/data/FacilitySecurityData.xml
    ofbiz/branches/jackrabbit20120501/applications/product/data/ProductSecurityData.xml
    ofbiz/branches/jackrabbit20120501/applications/workeffort/data/WorkEffortSecurityData.xml
    ofbiz/branches/jackrabbit20120501/framework/base/lib/j2eespecs/tomcat-7.0.27.annotations-api.jar
    ofbiz/branches/jackrabbit20120501/framework/base/lib/j2eespecs/tomcat-7.0.27.el-api.jar
    ofbiz/branches/jackrabbit20120501/framework/base/lib/j2eespecs/tomcat-7.0.27.jsp-api.jar
    ofbiz/branches/jackrabbit20120501/framework/base/lib/j2eespecs/tomcat-7.0.27.servlet-api.jar
    ofbiz/branches/jackrabbit20120501/framework/bi/data/BiSecurityData.xml
    ofbiz/branches/jackrabbit20120501/framework/catalina/lib/tomcat-7.0.27.catalina-ha.jar
    ofbiz/branches/jackrabbit20120501/framework/catalina/lib/tomcat-7.0.27.catalina-tribes.jar
    ofbiz/branches/jackrabbit20120501/framework/catalina/lib/tomcat-7.0.27.tomcat-embed-core.jar
    ofbiz/branches/jackrabbit20120501/framework/catalina/lib/tomcat-7.0.27.tomcat-embed-jasper.jar
    ofbiz/branches/jackrabbit20120501/framework/catalina/lib/tomcat-7.0.27.tomcat-embed-logging-log4j.jar
    ofbiz/branches/jackrabbit20120501/framework/common/data/CommonSecurityData.xml
    ofbiz/branches/jackrabbit20120501/framework/entityext/data/EntityExtSecurityData.xml
    ofbiz/branches/jackrabbit20120501/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.6.css
    ofbiz/branches/jackrabbit20120501/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.6.js
    ofbiz/branches/jackrabbit20120501/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.7.js
    ofbiz/branches/jackrabbit20120501/framework/security/data/SecurityDemoData.xml
    ofbiz/branches/jackrabbit20120501/framework/security/data/SecuritySeedData.xml
    ofbiz/branches/jackrabbit20120501/framework/webtools/data/WebtoolsSecurityData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/assetmaint/data/AssetMaintSecurityData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/ebay/data/EbaySecurityData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/ebaystore/data/EbayStoreSecurityData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/example/data/ExampleSecurityData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/googlebase/data/GoogleBaseSecurityData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/hhfacility/data/HhFacilitySecurityData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/myportal/data/MyPortalSecurityData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/oagis/data/OagisSecurityData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/projectmgr/data/ProjectMgrSecurityData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/scrum/data/scrumSecurityData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/webpos/data/WebPosSecurityData.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/workflow/data/WorkFlowSecurityData.xml
Modified:
    ofbiz/branches/jackrabbit20120501/   (props changed)
    ofbiz/branches/jackrabbit20120501/.classpath
    ofbiz/branches/jackrabbit20120501/LICENSE
    ofbiz/branches/jackrabbit20120501/applications/accounting/data/DemoPaymentsInvoices.xml
    ofbiz/branches/jackrabbit20120501/applications/accounting/ofbiz-component.xml
    ofbiz/branches/jackrabbit20120501/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
    ofbiz/branches/jackrabbit20120501/applications/accounting/webapp/accounting/payment/manualTx.ftl
    ofbiz/branches/jackrabbit20120501/applications/accounting/widget/AccountingMenus.xml
    ofbiz/branches/jackrabbit20120501/applications/commonext/ofbiz-component.xml
    ofbiz/branches/jackrabbit20120501/applications/content/ofbiz-component.xml
    ofbiz/branches/jackrabbit20120501/applications/humanres/data/HumanResTypeData.xml
    ofbiz/branches/jackrabbit20120501/applications/humanres/ofbiz-component.xml
    ofbiz/branches/jackrabbit20120501/applications/manufacturing/ofbiz-component.xml
    ofbiz/branches/jackrabbit20120501/applications/marketing/ofbiz-component.xml
    ofbiz/branches/jackrabbit20120501/applications/order/ofbiz-component.xml
    ofbiz/branches/jackrabbit20120501/applications/party/ofbiz-component.xml
    ofbiz/branches/jackrabbit20120501/applications/product/ofbiz-component.xml
    ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/WEB-INF/controller.xml
    ofbiz/branches/jackrabbit20120501/applications/workeffort/ofbiz-component.xml
    ofbiz/branches/jackrabbit20120501/build.xml
    ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/util/ScriptUtil.java
    ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java
    ofbiz/branches/jackrabbit20120501/framework/bi/ofbiz-component.xml
    ofbiz/branches/jackrabbit20120501/framework/common/ofbiz-component.xml
    ofbiz/branches/jackrabbit20120501/framework/common/webcommon/WEB-INF/actions/includes/GetLocaleList.groovy
    ofbiz/branches/jackrabbit20120501/framework/common/webcommon/includes/flotCharts/Bars.ftl
    ofbiz/branches/jackrabbit20120501/framework/common/webcommon/includes/flotCharts/Pie.ftl
    ofbiz/branches/jackrabbit20120501/framework/common/webcommon/includes/lookup.ftl
    ofbiz/branches/jackrabbit20120501/framework/common/widget/CommonScreens.xml
    ofbiz/branches/jackrabbit20120501/framework/common/widget/LookupForms.xml
    ofbiz/branches/jackrabbit20120501/framework/entity/config/entityengine.xml
    ofbiz/branches/jackrabbit20120501/framework/entityext/ofbiz-component.xml
    ofbiz/branches/jackrabbit20120501/framework/images/webapp/images/fieldlookup.js
    ofbiz/branches/jackrabbit20120501/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-he.js
    ofbiz/branches/jackrabbit20120501/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ru.js
    ofbiz/branches/jackrabbit20120501/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-sk.js
    ofbiz/branches/jackrabbit20120501/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-tr.js
    ofbiz/branches/jackrabbit20120501/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-zh-CN.js
    ofbiz/branches/jackrabbit20120501/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-zh-TW.js
    ofbiz/branches/jackrabbit20120501/framework/resources/templates/AdminUserLoginData.xml
    ofbiz/branches/jackrabbit20120501/framework/resources/templates/ofbiz-component.xml
    ofbiz/branches/jackrabbit20120501/framework/security/config/SecurityEntityLabels.xml
    ofbiz/branches/jackrabbit20120501/framework/security/ofbiz-component.xml
    ofbiz/branches/jackrabbit20120501/framework/service/data/ServiceSeedData.xml
    ofbiz/branches/jackrabbit20120501/framework/service/ofbiz-component.xml
    ofbiz/branches/jackrabbit20120501/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java
    ofbiz/branches/jackrabbit20120501/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java
    ofbiz/branches/jackrabbit20120501/framework/webtools/config/WebtoolsUiLabels.xml
    ofbiz/branches/jackrabbit20120501/framework/webtools/ofbiz-component.xml
    ofbiz/branches/jackrabbit20120501/framework/webtools/webapp/webtools/WEB-INF/actions/cache/FindUtilCache.groovy
    ofbiz/branches/jackrabbit20120501/framework/webtools/webapp/webtools/WEB-INF/controller.xml
    ofbiz/branches/jackrabbit20120501/framework/webtools/widget/CacheForms.xml
    ofbiz/branches/jackrabbit20120501/framework/webtools/widget/CacheScreens.xml
    ofbiz/branches/jackrabbit20120501/framework/webtools/widget/ServiceForms.xml
    ofbiz/branches/jackrabbit20120501/framework/webtools/widget/ServiceScreens.xml
    ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/form/FormFactory.java
    ofbiz/branches/jackrabbit20120501/framework/widget/templates/htmlFormMacroLibrary.ftl
    ofbiz/branches/jackrabbit20120501/specialpurpose/assetmaint/ofbiz-component.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/ebay/ofbiz-component.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/ebaystore/ofbiz-component.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/ofbiz-component.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/widget/CommonScreens.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/example/ofbiz-component.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/example/webapp/example/flot/flotPie.ftl
    ofbiz/branches/jackrabbit20120501/specialpurpose/googlebase/ofbiz-component.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/googlecheckout/ofbiz-component.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/hhfacility/ofbiz-component.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl
    ofbiz/branches/jackrabbit20120501/specialpurpose/myportal/ofbiz-component.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/oagis/ofbiz-component.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/ofbizwebsite/template/HtmlHead.ftl
    ofbiz/branches/jackrabbit20120501/specialpurpose/pos/ofbiz-component.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/projectmgr/ofbiz-component.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/scrum/ofbiz-component.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/webpos/ofbiz-component.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/workflow/ofbiz-component.xml
    ofbiz/branches/jackrabbit20120501/themes/bizznesstime/webapp/bizznesstime/css/style.css
    ofbiz/branches/jackrabbit20120501/themes/bluelight/webapp/bluelight/style.css
    ofbiz/branches/jackrabbit20120501/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css
    ofbiz/branches/jackrabbit20120501/themes/flatgrey/webapp/flatgrey/javascript.css
    ofbiz/branches/jackrabbit20120501/themes/multiflex/webapp/multiflex/style.css
    ofbiz/branches/jackrabbit20120501/themes/tomahawk/webapp/tomahawk/css/style.css

Propchange: ofbiz/branches/jackrabbit20120501/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1351078-1353077

Modified: ofbiz/branches/jackrabbit20120501/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/.classpath?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/.classpath (original)
+++ ofbiz/branches/jackrabbit20120501/.classpath Sat Jun 23 07:04:16 2012
@@ -1,224 +1,215 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
- <classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="applications/content/lib/fontbox-1.4.0.jar"/>
- <classpathentry kind="lib" path="applications/content/lib/jempbox-1.4.0.jar"/>
- <classpathentry kind="lib" path="applications/content/lib/lucene-core-3.5.0.jar"/>
- <classpathentry kind="lib" path="applications/content/lib/pdfbox-1.4.0.jar"/>
- <classpathentry kind="lib" path="applications/content/lib/dom4j-1.6.1.jar"/>
- <classpathentry kind="lib" path="applications/content/lib/poi-3.8-20120326.jar"/>
- <classpathentry kind="lib" path="applications/content/lib/poi-ooxml-3.8-20120326.jar"/>
- <classpathentry kind="lib" path="applications/content/lib/poi-ooxml-schemas-3.8-20120326.jar"/>
- <classpathentry kind="lib" path="applications/content/lib/poi-scratchpad-3.8-20120326.jar"/>
- <classpathentry kind="lib" path="applications/content/lib/tika-core-1.0.jar"/>
- <classpathentry kind="lib" path="applications/content/lib/tika-parsers-1.0.jar"/>
- <classpathentry kind="lib" path="applications/product/lib/watermarker-0.0.4.jar"/>
- <classpathentry kind="lib" path="applications/product/lib/dozer-4.2.1.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/ant-1.8.4.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/ant-junit-1.8.4.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/ant-launcher-1.8.4.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/ant/ant-apache-bsf-1.8.4.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/ant/ant-nodeps-1.8.1.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/antisamy-bin.1.2.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/avalon-framework-4.2.0.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/avalon-util-exception-1.0.0.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/barcode4j-fop-ext-complete-2.0.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/batik-all-1.7.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/clhm-release-1.0-lru.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/hamcrest-all-1.2.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/fop-1.0.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/freemarker-2.3.19-null-wildcards.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/httpclient-4.1.1.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/httpclient-cache-4.1.1.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/httpcore-4.1.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/httpmime-4.1.1.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/httpunit-1.7.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/ical4j-1.0-rc2.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/icu4j-49_1.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/ivy-2.2.0.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/javolution-5.4.3.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/jcip-annotations-1.0.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/jdbm-1.0-SNAPSHOT.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/jdom-1.1.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/jpim-0.1.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/juel-2.2.1.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/junit-dep-4.10.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/log4j-1.2.16.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/mail-1.4.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/mx4j-3.0.1.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/mx4j-remote-3.0.1.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/nekohtml-1.9.7.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/owasp-esapi-full-java-1.4.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/resolver-2.9.1.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/serializer-2.9.1.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/slf4j-api-1.6.4.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/xercesImpl-2.9.1.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/ws-commons-java5-1.0.1.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/ws-commons-util-1.0.2.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/xml-apis-2.9.1.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/xml-apis-ext-1.3.04.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/xmlgraphics-commons-1.4.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/xmlrpc-client-3.1.2.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/xmlrpc-common-3.1.2.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/xmlrpc-server-3.1.2.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/xstream-1.3.1.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/xpp3_min-1.1.4c.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-beanutils-1.7.0.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-cli-1.0.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-codec-1.4.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-collections-3.2.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-compress-1.4.1.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-digester-1.8.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-discovery-0.4.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-el-1.0.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-fileupload-1.2.2.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-io-1.4.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-lang-2.4.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-logging-1.1.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-modeler-2.0.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-net-1.4.1.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-pool-1.3.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-primitives-1.0.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-validator-1.3.1.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-activation_1.0.2_spec-1.0.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-j2ee-connector_1.5_spec-1.0.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jaxr_1.0_spec-1.0.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jaxrpc_1.1_spec-1.0.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jms_1.1_spec-1.0.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jta_1.1_spec-1.1.1.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-qname_1.1_spec-1.0.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-saaj_1.1_spec-1.0.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-7.0.27.annotations-api.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-7.0.27.el-api.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-7.0.27.jsp-api.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-7.0.27.servlet-api.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/scripting/antlr-2.7.6.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/scripting/asm-3.2.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/scripting/asm-analysis-3.2.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/scripting/asm-tree-3.2.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/scripting/asm-util-3.2.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/scripting/bsf-2.4.0.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/scripting/bsh-2.0b4.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/scripting/groovy-all-1.8.6.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/scripting/jakarta-oro-2.0.8.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/scripting/jython-nooro.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/scripting/jansi-1.2.1.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/scripting/jline-0.9.94.jar"/>
- <classpathentry kind="lib" path="framework/birt/lib/org.eclipse.birt.runtime_3.7.2.v20120214-1408.jar"/>
- <classpathentry kind="lib" path="framework/birt/lib/viewservlets.jar"/>
- <classpathentry kind="lib" path="framework/catalina/lib/ecj-3.7.2.jar"/>
- <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.catalina-ha.jar"/>
- <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.catalina-tribes.jar"/>
- <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.tomcat-embed-core.jar"/>
- <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.tomcat-embed-jasper.jar"/>
- <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.27.tomcat-embed-logging-log4j.jar"/>
- <classpathentry kind="lib" path="framework/entity/lib/commons-dbcp-1.4.jar"/>
- <classpathentry kind="lib" path="framework/entity/lib/ofbiz-minerva.jar"/>
- <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-connector-2.1.1.jar"/>
- <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-transaction-2.1.1.jar"/>
- <classpathentry kind="lib" path="framework/jetty/lib/com.sun.el-2.2.0.v201108011116.jar"/>
- <classpathentry kind="lib" path="framework/jetty/lib/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar"/>
- <classpathentry kind="lib" path="framework/jetty/lib/jetty-ajp-8.1.2.v20120308.jar"/>
- <classpathentry kind="lib" path="framework/jetty/lib/jetty-continuation-8.1.2.v20120308.jar"/>
- <classpathentry kind="lib" path="framework/jetty/lib/jetty-http-8.1.2.v20120308.jar"/>
- <classpathentry kind="lib" path="framework/jetty/lib/jetty-io-8.1.2.v20120308.jar"/>
- <classpathentry kind="lib" path="framework/jetty/lib/jetty-security-8.1.2.v20120308.jar"/>
- <classpathentry kind="lib" path="framework/jetty/lib/jetty-server-8.1.2.v20120308.jar"/>
- <classpathentry kind="lib" path="framework/jetty/lib/jetty-servlet-8.1.2.v20120308.jar"/>
- <classpathentry kind="lib" path="framework/jetty/lib/jetty-util-8.1.2.v20120308.jar"/>
- <classpathentry kind="lib" path="framework/jetty/lib/jetty-webapp-8.1.2.v20120308.jar"/>
- <classpathentry kind="lib" path="framework/jetty/lib/jetty-xml-8.1.2.v20120308.jar"/>
- <classpathentry kind="lib" path="framework/jetty/lib/org.apache.jasper.glassfish-2.2.2.v201112011158.jar"/>
- <classpathentry kind="lib" path="framework/jetty/lib/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar"/>
- <classpathentry kind="lib" path="framework/jetty/lib/org.eclipse.jdt.core-3.7.1.jar"/>
- <classpathentry kind="lib" path="framework/service/lib/axis-1.4.jar"/>
- <classpathentry kind="lib" path="framework/service/lib/axis-ant-1.4.jar"/>
- <classpathentry kind="lib" path="framework/service/lib/wsdl4j-1.6.2.jar"/>
- <classpathentry kind="lib" path="framework/service/lib/axiom-api-1.2.9.jar"/>
- <classpathentry kind="lib" path="framework/service/lib/axiom-impl-1.2.9.jar"/>
- <classpathentry kind="lib" path="framework/service/lib/axis2-kernel-1.5.2.jar"/>
- <classpathentry kind="lib" path="framework/service/lib/axis2-transport-http-1.5.2.jar"/>
- <classpathentry kind="lib" path="framework/service/lib/axis2-transport-local-1.5.2.jar"/>
- <classpathentry kind="lib" path="framework/service/lib/commons-httpclient-3.1.jar"/>
- <classpathentry kind="lib" path="framework/service/lib/neethi-2.0.4.jar"/>
- <classpathentry kind="lib" path="framework/service/lib/XmlSchema-1.4.3.jar"/>
- <classpathentry kind="lib" path="framework/testtools/lib/selenium-java-client-driver.jar"/>
- <classpathentry kind="lib" path="framework/testtools/lib/org.springframework.test-3.1.0.M2.jar"/>
- <classpathentry kind="lib" path="framework/testtools/lib/org.springframework.web-3.1.0.M2.jar"/>
- <classpathentry kind="lib" path="framework/testtools/lib/org.springframework.core-3.1.0.M2.jar"/>
- <classpathentry kind="lib" path="framework/webapp/lib/DataVision-1.0.0.jar"/>
- <classpathentry kind="lib" path="framework/webapp/lib/ezmorph-0.9.1.jar"/>
- <classpathentry kind="lib" path="framework/webapp/lib/iText-2.1.7.jar"/>
- <classpathentry kind="lib" path="framework/webapp/lib/json-lib-2.2.3-jdk15.jar"/>
- <classpathentry kind="lib" path="framework/webapp/lib/rome-0.9.jar"/>
- <classpathentry kind="lib" path="framework/webapp/lib/velocity-1.6.1.jar"/>
- <classpathentry kind="lib" path="specialpurpose/googlecheckout/lib/checkout-sdk-0.8.8.jar"/>
- <classpathentry kind="lib" path="specialpurpose/ldap/lib/cas-server-core-3.3.jar"/>
- <classpathentry kind="lib" path="specialpurpose/pos/lib/XuiCoreSwing-v3.2rc2b.jar"/>
- <classpathentry kind="lib" path="specialpurpose/pos/lib/XuiOptional-v3.2rc2b.jar"/>
- <classpathentry kind="lib" path="specialpurpose/pos/lib/jcl.jar"/>
- <classpathentry kind="lib" path="specialpurpose/pos/lib/jpos18-controls.jar"/>
- <classpathentry kind="lib" path="specialpurpose/pos/lib/looks-2.0.2.jar"/>
- <classpathentry kind="lib" path="specialpurpose/ebaystore/lib/attributes.jar"/>
- <classpathentry kind="lib" path="specialpurpose/ebaystore/lib/ebaycalls.jar"/>
- <classpathentry kind="lib" path="specialpurpose/ebaystore/lib/ebaysdkcore.jar"/>
- <classpathentry kind="lib" path="specialpurpose/ebaystore/lib/helper.jar"/>
- <classpathentry excluding="org/ofbiz/accounting/thirdparty/cybersource/**|org/ofbiz/accounting/thirdparty/verisign/**|org/ofbiz/accounting/thirdparty/worldpay/**|org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java|org/ofbiz/accounting/thirdparty/orbital/**|org/ofbiz/accounting/thirdparty/securepay/**|org/ofbiz/accounting/thirdparty/ideal/**" kind="src" path="applications/accounting/src"/>
- <classpathentry kind="src" path="framework/jcr/src"/>
- <classpathentry excluding="org/ofbiz/content/openoffice/|org/ofbiz/content/report/" kind="src" path="applications/content/src"/>
- <classpathentry kind="src" path="applications/manufacturing/src"/>
- <classpathentry kind="src" path="applications/marketing/src"/>
- <classpathentry excluding="org/ofbiz/order/thirdparty/taxware/**" kind="src" path="applications/order/src"/>
- <classpathentry kind="src" path="applications/party/src"/>
- <classpathentry excluding="ShipmentScaleApplet.java" kind="src" path="applications/product/src"/>
- <classpathentry excluding="org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java" kind="src" path="applications/securityext/src"/>
- <classpathentry kind="src" path="applications/humanres/src"/>
- <classpathentry kind="src" path="applications/workeffort/src"/>
- <classpathentry kind="src" path="framework/appserver/src"/>
- <classpathentry kind="src" path="framework/base/build/gen-src/javacc"/>
- <classpathentry excluding="org/ofbiz/base/config/CoberturaInstrumenter.java" kind="src" path="framework/base/src"/>
- <classpathentry kind="src" path="framework/bi/src"/>
- <classpathentry kind="src" path="framework/birt/src"/>
- <classpathentry kind="src" path="framework/catalina/src"/>
- <classpathentry kind="src" path="framework/common/src"/>
- <classpathentry kind="src" path="framework/datafile/src"/>
- <classpathentry excluding="org/ofbiz/entity/connection/XaPoolConnectionFactory.java" kind="src" path="framework/entity/src"/>
- <classpathentry kind="src" path="framework/entityext/src"/>
- <classpathentry kind="src" path="framework/geronimo/src"/>
- <classpathentry kind="src" path="framework/jetty/src"/>
- <classpathentry kind="src" path="framework/minilang/src"/>
- <classpathentry kind="src" path="framework/security/src"/>
- <classpathentry kind="src" path="framework/service/src"/>
- <classpathentry kind="src" path="framework/sql/src"/>
- <classpathentry kind="src" path="framework/sql/build/gen-src/javacc"/>
- <classpathentry kind="src" path="framework/start/src"/>
- <classpathentry excluding="org/ofbiz/testtools/seleniumxml/**" kind="src" path="framework/testtools/src"/>
- <classpathentry excluding="org/ofbiz/webapp/ftl/FreeMarkerViewRenderer.java|org/ofbiz/webapp/ftl/JpCacheIncludeTransform.java|org/ofbiz/webapp/view/FopPdfViewHandler.java|org/ofbiz/webapp/view/GenericViewRenderer.java|org/ofbiz/webapp/view/JPublishViewHandler.java|org/ofbiz/webapp/view/JPublishWrapper.java|org/ofbiz/webapp/view/JasperReportsPdfViewHandler.java|org/ofbiz/webapp/view/JasperReportsXmlViewHandler.java|org/ofbiz/webapp/view/JasperReportsJXlsViewHandler.java|org/ofbiz/webapp/view/JasperReportsPoiXlsViewHandler.java" kind="src" path="framework/webapp/src"/>
- <classpathentry kind="src" path="framework/webtools/src"/>
- <classpathentry kind="src" path="framework/widget/src"/>
- <classpathentry kind="src" path="specialpurpose/assetmaint/src"/>
- <classpathentry kind="src" path="specialpurpose/ebay/src"/>
- <classpathentry kind="src" path="specialpurpose/ebaystore/src"/>
- <classpathentry kind="src" path="specialpurpose/ecommerce/src"/>
- <classpathentry kind="src" path="specialpurpose/example/src"/>
- <classpathentry kind="src" path="specialpurpose/googlebase/src"/>
- <classpathentry kind="src" path="specialpurpose/googlecheckout/src"/>
- <classpathentry kind="src" path="specialpurpose/hhfacility/src"/>
- <classpathentry kind="src" path="specialpurpose/ldap/src"/>
- <classpathentry kind="src" path="specialpurpose/oagis/src"/>
- <classpathentry kind="src" path="specialpurpose/pos/src"/>
- <classpathentry kind="src" path="specialpurpose/projectmgr/src"/>
- <classpathentry kind="src" path="specialpurpose/webpos/src"/>
- <classpathentry kind="src" path="specialpurpose/workflow/src"/>
- <classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
- <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-api-2.3.3.jar"/>
- <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-core-2.3.3.jar"/>
- <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-jca-2.3.3.jar"/>
- <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-jcr-commons-2.3.3.jar"/>
- <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-ocm-2.0.jar"/>
- <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-spi-2.3.3.jar"/>
- <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-spi-commons-2.3.3.jar"/>
- <classpathentry kind="lib" path="framework/jcr/lib/jcr-2.0.jar"/>
- <classpathentry kind="output" path="bin"/>
+    <classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
+    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+    <classpathentry kind="lib" path="applications/content/lib/fontbox-1.4.0.jar"/>
+    <classpathentry kind="lib" path="applications/content/lib/jempbox-1.4.0.jar"/>
+    <classpathentry kind="lib" path="applications/content/lib/lucene-core-3.5.0.jar"/>
+    <classpathentry kind="lib" path="applications/content/lib/pdfbox-1.4.0.jar"/>
+    <classpathentry kind="lib" path="applications/content/lib/dom4j-1.6.1.jar"/>
+    <classpathentry kind="lib" path="applications/content/lib/poi-3.8-20120326.jar"/>
+    <classpathentry kind="lib" path="applications/content/lib/poi-ooxml-3.8-20120326.jar"/>
+    <classpathentry kind="lib" path="applications/content/lib/poi-ooxml-schemas-3.8-20120326.jar"/>
+    <classpathentry kind="lib" path="applications/content/lib/poi-scratchpad-3.8-20120326.jar"/>
+    <classpathentry kind="lib" path="applications/content/lib/tika-core-1.0.jar"/>
+    <classpathentry kind="lib" path="applications/content/lib/tika-parsers-1.0.jar"/>
+    <classpathentry kind="lib" path="applications/product/lib/watermarker-0.0.4.jar"/>
+    <classpathentry kind="lib" path="applications/product/lib/dozer-4.2.1.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/ant-1.8.4.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/ant-junit-1.8.4.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/ant-launcher-1.8.4.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/ant/ant-apache-bsf-1.8.4.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/ant/ant-nodeps-1.8.1.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/antisamy-bin.1.2.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/avalon-framework-4.2.0.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/avalon-util-exception-1.0.0.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/barcode4j-fop-ext-complete-2.0.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/batik-all-1.7.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/clhm-release-1.0-lru.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/hamcrest-all-1.2.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/fop-1.0.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/freemarker-2.3.19-null-wildcards.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/httpclient-4.1.1.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/httpclient-cache-4.1.1.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/httpcore-4.1.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/httpmime-4.1.1.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/httpunit-1.7.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/ical4j-1.0-rc2.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/icu4j-49_1.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/ivy-2.2.0.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/javolution-5.4.3.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/jcip-annotations-1.0.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/jdbm-1.0-SNAPSHOT.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/jdom-1.1.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/jpim-0.1.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/juel-2.2.1.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/junit-dep-4.10.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/log4j-1.2.16.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/mail-1.4.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/mx4j-3.0.1.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/mx4j-remote-3.0.1.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/nekohtml-1.9.7.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/owasp-esapi-full-java-1.4.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/resolver-2.9.1.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/serializer-2.9.1.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/slf4j-api-1.6.4.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/xercesImpl-2.9.1.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/ws-commons-java5-1.0.1.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/ws-commons-util-1.0.2.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/xml-apis-2.9.1.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/xml-apis-ext-1.3.04.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/xmlgraphics-commons-1.4.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/xmlrpc-client-3.1.2.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/xmlrpc-common-3.1.2.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/xmlrpc-server-3.1.2.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/xstream-1.3.1.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/xpp3_min-1.1.4c.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/commons/commons-beanutils-1.7.0.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/commons/commons-cli-1.0.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/commons/commons-codec-1.4.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/commons/commons-collections-3.2.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/commons/commons-compress-1.4.1.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/commons/commons-digester-1.8.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/commons/commons-discovery-0.4.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/commons/commons-el-1.0.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/commons/commons-fileupload-1.2.2.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/commons/commons-io-1.4.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/commons/commons-lang-2.4.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/commons/commons-logging-1.1.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/commons/commons-modeler-2.0.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/commons/commons-net-1.4.1.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/commons/commons-pool-1.3.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/commons/commons-primitives-1.0.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/commons/commons-validator-1.3.1.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-activation_1.0.2_spec-1.0.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-j2ee-connector_1.5_spec-1.0.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jaxr_1.0_spec-1.0.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jaxrpc_1.1_spec-1.0.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jms_1.1_spec-1.0.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jta_1.1_spec-1.1.1.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-qname_1.1_spec-1.0.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-saaj_1.1_spec-1.0.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/annotations-api-3.0.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/el-api-2.2.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/jsp-api-2.2.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/servlet-api-3.0.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/scripting/antlr-2.7.6.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/scripting/asm-3.2.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/scripting/asm-analysis-3.2.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/scripting/asm-tree-3.2.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/scripting/asm-util-3.2.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/scripting/bsf-2.4.0.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/scripting/bsh-2.0b4.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/scripting/groovy-all-1.8.6.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/scripting/jakarta-oro-2.0.8.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/scripting/jython-nooro.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/scripting/jansi-1.2.1.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/scripting/jline-0.9.94.jar"/>
+    <classpathentry kind="lib" path="framework/birt/lib/org.eclipse.birt.runtime_3.7.2.v20120214-1408.jar"/>
+    <classpathentry kind="lib" path="framework/birt/lib/viewservlets.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/ecj-3.7.2.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.28.catalina-ha.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.28.catalina-tribes.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.28.tomcat-embed-core.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.28.tomcat-embed-jasper.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.28.tomcat-embed-logging-log4j.jar"/>
+    <classpathentry kind="lib" path="framework/entity/lib/commons-dbcp-1.4.jar"/>
+    <classpathentry kind="lib" path="framework/entity/lib/ofbiz-minerva.jar"/>
+    <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-connector-2.1.1.jar"/>
+    <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-transaction-2.1.1.jar"/>
+    <classpathentry kind="lib" path="framework/jetty/lib/com.sun.el-2.2.0.v201108011116.jar"/>
+    <classpathentry kind="lib" path="framework/jetty/lib/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar"/>
+    <classpathentry kind="lib" path="framework/jetty/lib/jetty-ajp-8.1.2.v20120308.jar"/>
+    <classpathentry kind="lib" path="framework/jetty/lib/jetty-continuation-8.1.2.v20120308.jar"/>
+    <classpathentry kind="lib" path="framework/jetty/lib/jetty-http-8.1.2.v20120308.jar"/>
+    <classpathentry kind="lib" path="framework/jetty/lib/jetty-io-8.1.2.v20120308.jar"/>
+    <classpathentry kind="lib" path="framework/jetty/lib/jetty-security-8.1.2.v20120308.jar"/>
+    <classpathentry kind="lib" path="framework/jetty/lib/jetty-server-8.1.2.v20120308.jar"/>
+    <classpathentry kind="lib" path="framework/jetty/lib/jetty-servlet-8.1.2.v20120308.jar"/>
+    <classpathentry kind="lib" path="framework/jetty/lib/jetty-util-8.1.2.v20120308.jar"/>
+    <classpathentry kind="lib" path="framework/jetty/lib/jetty-webapp-8.1.2.v20120308.jar"/>
+    <classpathentry kind="lib" path="framework/jetty/lib/jetty-xml-8.1.2.v20120308.jar"/>
+    <classpathentry kind="lib" path="framework/jetty/lib/org.apache.jasper.glassfish-2.2.2.v201112011158.jar"/>
+    <classpathentry kind="lib" path="framework/jetty/lib/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar"/>
+    <classpathentry kind="lib" path="framework/jetty/lib/org.eclipse.jdt.core-3.7.1.jar"/>
+    <classpathentry kind="lib" path="framework/service/lib/axis-1.4.jar"/>
+    <classpathentry kind="lib" path="framework/service/lib/axis-ant-1.4.jar"/>
+    <classpathentry kind="lib" path="framework/service/lib/wsdl4j-1.6.2.jar"/>
+    <classpathentry kind="lib" path="framework/service/lib/axiom-api-1.2.9.jar"/>
+    <classpathentry kind="lib" path="framework/service/lib/axiom-impl-1.2.9.jar"/>
+    <classpathentry kind="lib" path="framework/service/lib/axis2-kernel-1.5.2.jar"/>
+    <classpathentry kind="lib" path="framework/service/lib/axis2-transport-http-1.5.2.jar"/>
+    <classpathentry kind="lib" path="framework/service/lib/axis2-transport-local-1.5.2.jar"/>
+    <classpathentry kind="lib" path="framework/service/lib/commons-httpclient-3.1.jar"/>
+    <classpathentry kind="lib" path="framework/service/lib/neethi-2.0.4.jar"/>
+    <classpathentry kind="lib" path="framework/service/lib/XmlSchema-1.4.3.jar"/>
+    <classpathentry kind="lib" path="framework/testtools/lib/selenium-java-client-driver.jar"/>
+    <classpathentry kind="lib" path="framework/testtools/lib/org.springframework.test-3.1.0.M2.jar"/>
+    <classpathentry kind="lib" path="framework/testtools/lib/org.springframework.web-3.1.0.M2.jar"/>
+    <classpathentry kind="lib" path="framework/testtools/lib/org.springframework.core-3.1.0.M2.jar"/>
+    <classpathentry kind="lib" path="framework/webapp/lib/DataVision-1.0.0.jar"/>
+    <classpathentry kind="lib" path="framework/webapp/lib/ezmorph-0.9.1.jar"/>
+    <classpathentry kind="lib" path="framework/webapp/lib/iText-2.1.7.jar"/>
+    <classpathentry kind="lib" path="framework/webapp/lib/json-lib-2.2.3-jdk15.jar"/>
+    <classpathentry kind="lib" path="framework/webapp/lib/rome-0.9.jar"/>
+    <classpathentry kind="lib" path="framework/webapp/lib/velocity-1.6.1.jar"/>
+    <classpathentry kind="lib" path="specialpurpose/googlecheckout/lib/checkout-sdk-0.8.8.jar"/>
+    <classpathentry kind="lib" path="specialpurpose/ldap/lib/cas-server-core-3.3.jar"/>
+    <classpathentry kind="lib" path="specialpurpose/pos/lib/XuiCoreSwing-v3.2rc2b.jar"/>
+    <classpathentry kind="lib" path="specialpurpose/pos/lib/XuiOptional-v3.2rc2b.jar"/>
+    <classpathentry kind="lib" path="specialpurpose/pos/lib/jcl.jar"/>
+    <classpathentry kind="lib" path="specialpurpose/pos/lib/jpos18-controls.jar"/>
+    <classpathentry kind="lib" path="specialpurpose/pos/lib/looks-2.0.2.jar"/>    
+    <classpathentry kind="lib" path="specialpurpose/ebaystore/lib/attributes.jar"/>
+    <classpathentry kind="lib" path="specialpurpose/ebaystore/lib/ebaycalls.jar"/>
+    <classpathentry kind="lib" path="specialpurpose/ebaystore/lib/ebaysdkcore.jar"/>
+    <classpathentry kind="lib" path="specialpurpose/ebaystore/lib/helper.jar"/>
+    <classpathentry excluding="org/ofbiz/accounting/thirdparty/cybersource/**|org/ofbiz/accounting/thirdparty/verisign/**|org/ofbiz/accounting/thirdparty/worldpay/**|org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java|org/ofbiz/accounting/thirdparty/orbital/**|org/ofbiz/accounting/thirdparty/securepay/**|org/ofbiz/accounting/thirdparty/ideal/**" kind="src" path="applications/accounting/src"/>
+    <classpathentry excluding="org/ofbiz/content/openoffice/|org/ofbiz/content/report/" kind="src" path="applications/content/src"/>
+    <classpathentry kind="src" path="applications/manufacturing/src"/>
+    <classpathentry kind="src" path="applications/marketing/src"/>
+    <classpathentry excluding="org/ofbiz/order/thirdparty/taxware/**" kind="src" path="applications/order/src"/>
+    <classpathentry kind="src" path="applications/party/src"/>
+    <classpathentry excluding="ShipmentScaleApplet.java" kind="src" path="applications/product/src"/>
+    <classpathentry excluding="org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java" kind="src" path="applications/securityext/src"/>
+    <classpathentry kind="src" path="applications/humanres/src"/>
+    <classpathentry kind="src" path="applications/workeffort/src"/>
+    <classpathentry kind="src" path="framework/appserver/src"/>
+    <classpathentry kind="src" path="framework/base/build/gen-src/javacc"/>
+    <classpathentry excluding="org/ofbiz/base/config/CoberturaInstrumenter.java" kind="src" path="framework/base/src"/>
+    <classpathentry kind="src" path="framework/bi/src"/>
+    <classpathentry kind="src" path="framework/birt/src"/>
+    <classpathentry kind="src" path="framework/catalina/src"/>
+    <classpathentry kind="src" path="framework/common/src"/>
+    <classpathentry kind="src" path="framework/datafile/src"/>
+    <classpathentry excluding="org/ofbiz/entity/connection/XaPoolConnectionFactory.java" kind="src" path="framework/entity/src"/>
+    <classpathentry kind="src" path="framework/entityext/src"/>
+    <classpathentry kind="src" path="framework/geronimo/src"/>
+    <classpathentry kind="src" path="framework/jetty/src"/>
+    <classpathentry kind="src" path="framework/minilang/src"/>
+    <classpathentry kind="src" path="framework/security/src"/>
+    <classpathentry kind="src" path="framework/service/src"/>
+    <classpathentry kind="src" path="framework/sql/src"/>
+    <classpathentry kind="src" path="framework/sql/build/gen-src/javacc"/>
+    <classpathentry kind="src" path="framework/start/src"/>
+    <classpathentry excluding="org/ofbiz/testtools/seleniumxml/**" kind="src" path="framework/testtools/src"/>
+    <classpathentry excluding="org/ofbiz/webapp/ftl/FreeMarkerViewRenderer.java|org/ofbiz/webapp/ftl/JpCacheIncludeTransform.java|org/ofbiz/webapp/view/FopPdfViewHandler.java|org/ofbiz/webapp/view/GenericViewRenderer.java|org/ofbiz/webapp/view/JPublishViewHandler.java|org/ofbiz/webapp/view/JPublishWrapper.java|org/ofbiz/webapp/view/JasperReportsPdfViewHandler.java|org/ofbiz/webapp/view/JasperReportsXmlViewHandler.java|org/ofbiz/webapp/view/JasperReportsJXlsViewHandler.java|org/ofbiz/webapp/view/JasperReportsPoiXlsViewHandler.java" kind="src" path="framework/webapp/src"/>
+    <classpathentry kind="src" path="framework/webtools/src"/>
+    <classpathentry kind="src" path="framework/widget/src"/>
+    <classpathentry kind="src" path="specialpurpose/assetmaint/src"/>
+    <classpathentry kind="src" path="specialpurpose/ebay/src"/>
+    <classpathentry kind="src" path="specialpurpose/ebaystore/src"/>
+    <classpathentry kind="src" path="specialpurpose/ecommerce/src"/>
+    <classpathentry kind="src" path="specialpurpose/example/src"/>
+    <classpathentry kind="src" path="specialpurpose/googlebase/src"/>
+    <classpathentry kind="src" path="specialpurpose/googlecheckout/src"/>
+    <classpathentry kind="src" path="specialpurpose/hhfacility/src"/>
+    <classpathentry kind="src" path="specialpurpose/ldap/src"/>
+    <classpathentry kind="src" path="specialpurpose/oagis/src"/>
+    <classpathentry kind="src" path="specialpurpose/pos/src"/>
+    <classpathentry kind="src" path="specialpurpose/projectmgr/src"/>
+    <classpathentry kind="src" path="specialpurpose/webpos/src"/>
+    <classpathentry kind="src" path="specialpurpose/workflow/src"/>
+    <classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
+    <classpathentry kind="output" path="bin"/>
 </classpath>

Modified: ofbiz/branches/jackrabbit20120501/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/LICENSE?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/LICENSE (original)
+++ ofbiz/branches/jackrabbit20120501/LICENSE Sat Jun 23 07:04:16 2012
@@ -63,10 +63,10 @@ ofbiz/trunk/framework/base/lib/j2eespecs
 ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-jta_1.1_spec-1.1.1.jar
 ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-qname_1.1_spec-1.0.jar
 ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-saaj_1.1_spec-1.0.jar
-ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-7.0.27.annotations-api.jar
-ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-7.0.27.el-api.jar
-ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-7.0.27.jsp-api.jar
-ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-7.0.27.servlet-api.jar
+ofbiz/trunk/framework/base/lib/j2eespecs/annotations-api-3.0.jar
+ofbiz/trunk/framework/base/lib/j2eespecs/el-api-2.2.jar
+ofbiz/trunk/framework/base/lib/j2eespecs/jsp-api-2.2.jar
+ofbiz/trunk/framework/base/lib/j2eespecs/servlet-api-3.0.jar
 ofbiz/trunk/framework/base/lib/scripting/bsf-2.4.0.jar
 ofbiz/trunk/framework/base/lib/scripting/jakarta-oro-2.0.8.jar
 ofbiz/trunk/framework/base/lib/scripting/groovy-all-1.8.6.jar
@@ -74,11 +74,11 @@ ofbiz/trunk/framework/base/lib/scripting
 ofbiz/trunk/framework/base/lib/xmlrpc-client-3.1.2.jar
 ofbiz/trunk/framework/base/lib/xmlrpc-common-3.1.2.jar
 ofbiz/trunk/framework/base/lib/xmlrpc-server-3.1.2.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.27.catalina-ha.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.27.catalina-tribes.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.27.tomcat-embed-core.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.27.tomcat-embed-jasper.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.27.tomcat-embed-logging-log4j.jar
+ofbiz/framework/catalina/lib/tomcat-7.0.28.catalina-ha.jar
+ofbiz/framework/catalina/lib/tomcat-7.0.28.catalina-tribes.jar
+ofbiz/framework/catalina/lib/tomcat-7.0.28.tomcat-embed-core.jar
+ofbiz/framework/catalina/lib/tomcat-7.0.28.tomcat-embed-jasper.jar
+ofbiz/framework/catalina/lib/tomcat-7.0.28.tomcat-embed-logging-log4j.jar
 ofbiz/trunk/framework/entity/lib/commons-dbcp-1.4.jar
 ofbiz/trunk/framework/entity/lib/jdbc/derby-10.8.2.2.jar
 ofbiz/trunk/framework/entity/lib/jdbc/derbytools-10.8.2.2.jar

Modified: ofbiz/branches/jackrabbit20120501/applications/accounting/data/DemoPaymentsInvoices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/accounting/data/DemoPaymentsInvoices.xml?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/accounting/data/DemoPaymentsInvoices.xml (original)
+++ ofbiz/branches/jackrabbit20120501/applications/accounting/data/DemoPaymentsInvoices.xml Sat Jun 23 07:04:16 2012
@@ -22,6 +22,7 @@ under the License.
     <Person partyId="AcctBuyer" firstName="Acct" lastName="Buyer"/>
     <PartyRole partyId="AcctBuyer" roleTypeId="BUYER"/>
     <UserLogin partyId="AcctBuyer" userLoginId="AcctBuyer"/>
+    <SecurityGroup groupId="ORDERPURCH"/><!-- is needed because accounting is before order -->
     <UserLoginSecurityGroup userLoginId="AcctBuyer" groupId="ORDERPURCH" fromDate="2001-05-13 00:00:00"/>
 
     <Party partyId="AcctBigSupplier" partyTypeId="PARTY_GROUP"/>

Modified: ofbiz/branches/jackrabbit20120501/applications/accounting/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/accounting/ofbiz-component.xml?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/accounting/ofbiz-component.xml (original)
+++ ofbiz/branches/jackrabbit20120501/applications/accounting/ofbiz-component.xml Sat Jun 23 07:04:16 2012
@@ -39,7 +39,8 @@ under the License.
     <entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingTypeData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingHelpData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/UsTaxAccountGroups.xml"/>
-    <entity-resource type="data" reader-name="security" loader="main" location="data/AccountingSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingSecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/AccountingSecurityGroupDemoData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingPortletData.xml"/>
     <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/PaymentGatewayConfData.xml"/>
     <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/AccountingScheduledServiceData.xml"/>

Modified: ofbiz/branches/jackrabbit20120501/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java (original)
+++ ofbiz/branches/jackrabbit20120501/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java Sat Jun 23 07:04:16 2012
@@ -2995,7 +2995,7 @@ public class PaymentGatewayServices {
         Security security = dctx.getSecurity();
 
         // security check
-        if (!security.hasEntityPermission("MANUAL", "_PAYMENT", userLogin)) {
+        if (!security.hasEntityPermission("MANUAL", "_PAYMENT", userLogin) && !security.hasEntityPermission("ACCOUNTING", "_ADMIN", userLogin)) {
             Debug.logWarning("**** Security [" + (new Date()).toString() + "]: " + userLogin.get("userLoginId") + " attempt to run manual payment transaction!", module);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                     "AccountingPaymentTransactionNotAuthorized", locale));
@@ -3130,7 +3130,7 @@ public class PaymentGatewayServices {
         Delegator delegator = dctx.getDelegator();
         Security security = dctx.getSecurity();
         // security check
-        if (!security.hasEntityPermission("MANUAL", "_PAYMENT", userLogin)) {
+        if (!security.hasEntityPermission("MANUAL", "_PAYMENT", userLogin) && !security.hasEntityPermission("ACCOUNTING", "_ADMIN", userLogin)) {
             Debug.logWarning("**** Security [" + (new Date()).toString() + "]: " + userLogin.get("userLoginId") + " attempt to run manual payment transaction!", module);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                     "AccountingPaymentTransactionNotAuthorized", locale));

Modified: ofbiz/branches/jackrabbit20120501/applications/accounting/webapp/accounting/payment/manualTx.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/accounting/webapp/accounting/payment/manualTx.ftl?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/accounting/webapp/accounting/payment/manualTx.ftl (original)
+++ ofbiz/branches/jackrabbit20120501/applications/accounting/webapp/accounting/payment/manualTx.ftl Sat Jun 23 07:04:16 2012
@@ -20,7 +20,7 @@ under the License.
 <h1>${uiLabelMap.AccountingManualTransaction}</h1>
 <br />
 
-<#if security.hasEntityPermission("MANUAL", "_PAYMENT", session)>
+<#if security.hasEntityPermission("MANUAL", "_PAYMENT", session) || security.hasEntityPermission("ACCOUNTING", "_ADMIN", session)>
   ${setRequestAttribute("validTx", "false")}
   <form name="manualTxForm" method="post" action="<@ofbizUrl>manualETx</@ofbizUrl>">
     <#if requestParameters.paymentMethodId?exists>

Modified: ofbiz/branches/jackrabbit20120501/applications/accounting/widget/AccountingMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/accounting/widget/AccountingMenus.xml?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/accounting/widget/AccountingMenus.xml (original)
+++ ofbiz/branches/jackrabbit20120501/applications/accounting/widget/AccountingMenus.xml Sat Jun 23 07:04:16 2012
@@ -27,13 +27,19 @@ under the License.
         <menu-item name="PaymentGroup" title="${uiLabelMap.AccountingPaymentGroup}"><link target="FindPaymentGroup"/></menu-item>
         <menu-item name="transaction" title="${uiLabelMap.AccountingTransactions}">
             <condition>
+                <or>
                 <if-has-permission permission="MANUAL" action="_PAYMENT"/>
+                <if-has-permission permission="ACCOUNTING" action="_ADMIN"/>
+                </or>
             </condition>
             <link target="FindGatewayResponses"/>
         </menu-item>
         <menu-item name="PaymentGatewayConfig" title="${uiLabelMap.AccountingPaymentGatewayConfig}">
             <condition>
-                <if-has-permission permission="PAYPROC" action="_ADMIN"/>
+                <or>
+                    <if-has-permission permission="PAYPROC" action="_ADMIN"/>
+                    <if-has-permission permission="ACCOUNTING" action="_ADMIN"/>
+                </or>
             </condition>
             <link target="FindPaymentGatewayConfig"/>
         </menu-item>

Modified: ofbiz/branches/jackrabbit20120501/applications/commonext/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/commonext/ofbiz-component.xml?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/commonext/ofbiz-component.xml (original)
+++ ofbiz/branches/jackrabbit20120501/applications/commonext/ofbiz-component.xml Sat Jun 23 07:04:16 2012
@@ -26,11 +26,13 @@ under the License.
     
     <entity-resource type="data" reader-name="seed" loader="main" location="data/EntityDiagramGroupData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtSeedData.xml"/>
-    <entity-resource type="data" reader-name="security" loader="main" location="data/CommonExtSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtSecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/CommonExtSecurityGroupDemoData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtHelpData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/SystemInfoPortletData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/SetupData.xml"/>
-    <entity-resource type="data" reader-name="security" loader="main" location="data/OfbizSetupSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/OfbizSetupSecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/OfbizSetupSecurityGroupDemoData.xml"/>
     
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
     

Modified: ofbiz/branches/jackrabbit20120501/applications/content/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/content/ofbiz-component.xml?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/content/ofbiz-component.xml (original)
+++ ofbiz/branches/jackrabbit20120501/applications/content/ofbiz-component.xml Sat Jun 23 07:04:16 2012
@@ -36,7 +36,8 @@ under the License.
     <entity-resource type="data" reader-name="seed" loader="main" location="data/DataCategoryData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/BlogSeedData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/TemplateData.xml"/>
-    <entity-resource type="data" reader-name="security" loader="main" location="data/ContentSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentSecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/ContentSecurityGroupDemoData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/MiscData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentHelpData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentHttpErrorData.xml"/>

Modified: ofbiz/branches/jackrabbit20120501/applications/humanres/data/HumanResTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/humanres/data/HumanResTypeData.xml?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/humanres/data/HumanResTypeData.xml (original)
+++ ofbiz/branches/jackrabbit20120501/applications/humanres/data/HumanResTypeData.xml Sat Jun 23 07:04:16 2012
@@ -123,26 +123,6 @@ under the License.
     <EmplPositionType emplPositionTypeId="BIZ_ANALYST" hasTable="N" description="Business Analyst"/>
     <EmplPositionType emplPositionTypeId="_NA_"/>
 
-     <!-- OFBiz Recruitment security -->
-    <SecurityGroup groupId="HUMANRES_ADMIN" description="This security group is for those who have full access to the human resource component."/>
-    <SecurityGroup groupId="HUMANRES_APPROVER" description="This security group is for those who will approve the internal job posting application."/>
-    <SecurityGroup groupId="HUMANRES_EMPLOYEE" description="This security group is for all the employees who want to apply for internal Job Posting."/>
-
-    <!-- Recruitment  permission -->
-    <SecurityPermission description="Approver can update the IJP approval status with this permission." permissionId="HUMANRES_APPROVE"/>
-    
-    <SecurityGroupPermission groupId="HUMANRES_ADMIN" permissionId="HUMANRES_ADMIN"/>
-    <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="HUMANRES_VIEW"/>
-    <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="HUMANRES_CREATE"/>
-    <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="PARTYMGR_VIEW"/>
-    <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="OFBTOOLS_VIEW"/>
-    <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="HUMANRES_UPDATE"/>
-    <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="HUMANRES_APPROVE"/>
-    <SecurityGroupPermission groupId="HUMANRES_EMPLOYEE" permissionId="HUMANRES_VIEW"/>
-    <SecurityGroupPermission groupId="HUMANRES_EMPLOYEE" permissionId="HUMANRES_CREATE"/>
-    <SecurityGroupPermission groupId="HUMANRES_EMPLOYEE" permissionId="PARTYMGR_VIEW"/>
-    <SecurityGroupPermission groupId="HUMANRES_EMPLOYEE" permissionId="OFBTOOLS_VIEW"/>
-    
     <JobInterviewType jobInterviewTypeId="JOB_INTERVW" description="It is a process in which an employee is evaluated by an employer for prospective employment in their company"/>
     <JobInterviewType jobInterviewTypeId="EXIT_INTERVW" description="It is conducted by an employer of a departing employee"/>
     <JobInterviewType jobInterviewTypeId="INFORMAL_INTERVW" description="It is a meeting in which a job seeker asks for advice rather than employment"/>

Modified: ofbiz/branches/jackrabbit20120501/applications/humanres/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/humanres/ofbiz-component.xml?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/humanres/ofbiz-component.xml (original)
+++ ofbiz/branches/jackrabbit20120501/applications/humanres/ofbiz-component.xml Sat Jun 23 07:04:16 2012
@@ -28,7 +28,8 @@ under the License.
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_old.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResTypeData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResHelpData.xml"/>
-    <entity-resource type="data" reader-name="security" loader="main" location="data/HumanResSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResSecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/HumanResSecurityGroupDemoData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResPortletData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/HumanResDemoData.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>

Modified: ofbiz/branches/jackrabbit20120501/applications/manufacturing/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/manufacturing/ofbiz-component.xml?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/manufacturing/ofbiz-component.xml (original)
+++ ofbiz/branches/jackrabbit20120501/applications/manufacturing/ofbiz-component.xml Sat Jun 23 07:04:16 2012
@@ -34,7 +34,8 @@ under the License.
     <!-- entity resources: model(s), eca(s) and group definitions -->
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingData.xml"/>
-    <entity-resource type="data" reader-name="security" loader="main" location="data/ManufacturingSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingSecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/ManufacturingSecurityGroupDemoData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingHelpData_EN.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingHelpData_NL.xml"/>
     <!--<entity-resource type="data" reader-name="seed-initial" loader="main" location="data/ManufacturingScheduledServices.xml"/>-->

Modified: ofbiz/branches/jackrabbit20120501/applications/marketing/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/marketing/ofbiz-component.xml?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/marketing/ofbiz-component.xml (original)
+++ ofbiz/branches/jackrabbit20120501/applications/marketing/ofbiz-component.xml Sat Jun 23 07:04:16 2012
@@ -27,7 +27,8 @@ under the License.
     <classpath type="dir" location="config"/>
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/MarketingTypeData.xml"/>
-    <entity-resource type="data" reader-name="security" loader="main" location="data/MarketingSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/MarketingSecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/MarketingSecurityGroupDemoData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/MarketingHelpData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/SfaPortletData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/sfaDemoData.xml"/>

Modified: ofbiz/branches/jackrabbit20120501/applications/order/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/order/ofbiz-component.xml?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/order/ofbiz-component.xml (original)
+++ ofbiz/branches/jackrabbit20120501/applications/order/ofbiz-component.xml Sat Jun 23 07:04:16 2012
@@ -34,7 +34,8 @@ under the License.
     <entity-resource type="data" reader-name="seed" loader="main" location="data/OrderTypeData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/OrderPortletData.xml"/>
     <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/OrderScheduledServices.xml"/>
-    <entity-resource type="data" reader-name="security" loader="main" location="data/OrderSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/OrderSecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/OrderSecurityGroupDemoData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/OrderHelpData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/OrderDemoUser.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/OrderDemoData.xml"/>