svn commit: r1153560 [1/15] - in /ofbiz/branches/jackrabbit2010
Locked
svn commit: r1153560 [1/15] - in /ofbiz/branches/jackrabbit2010
 
|
Author: sascharodekamp
Date: Wed Aug 3 16:12:58 2011 New Revision: 1153560 URL: http://svn.apache.org/viewvc?rev=1153560&view=rev Log: Update the Jackrabbit branch with the current trunk version to keep the branch up to date Added: ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/ContentUrlFilter.java - copied unchanged from r1153542, ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentUrlFilter.java ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/webapp/ftl/OfbizContentAltUrlTransforms.java - copied unchanged from r1153542, ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/OfbizContentAltUrlTransforms.java ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/GetGeoLocation.groovy - copied unchanged from r1153542, ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GetGeoLocation.groovy ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/party/editGeoLocation.ftl - copied unchanged from r1153542, ofbiz/trunk/applications/party/webapp/partymgr/party/editGeoLocation.ftl ofbiz/branches/jackrabbit20100709/framework/base/lib/ical4j-1.0-rc2.jar - copied unchanged from r1153542, ofbiz/trunk/framework/base/lib/ical4j-1.0-rc2.jar ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/UrlServletHelper.java - copied unchanged from r1153542, ofbiz/trunk/framework/common/src/org/ofbiz/common/UrlServletHelper.java ofbiz/branches/jackrabbit20100709/rc.ofbiz.for.ubuntu - copied unchanged from r1153542, ofbiz/trunk/rc.ofbiz.for.ubuntu ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoContentAltUrl.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/ecommerce/data/DemoContentAltUrl.xml ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ajaxbreadcrumbs.groovy - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ajaxbreadcrumbs.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/blog/blogContentAltLink.ftl - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/blogContentAltLink.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategories.ftl - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategories.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/ajaxbreadcrumbs.ftl - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/ajaxbreadcrumbs.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/content/content_topic.ftl - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/content_topic.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/ (props changed) - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/README.txt - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/README.txt ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/build.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/build.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/config/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/config/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/config/revision.properties - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/config/revision.properties ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/config/scrumUiLabels.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/config/scrumUiLabels.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/data/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/data/helpdata/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/DEMO-CONTENT.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/helpdata/DEMO-CONTENT.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_ROOT.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/helpdata/HELP_ROOT.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/helpdata/HELP_SCRUM.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_AddProdBacklog.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/helpdata/HELP_SCRUM_AddProdBacklog.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_AddProduct.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/helpdata/HELP_SCRUM_AddProduct.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_AddSprint.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/helpdata/HELP_SCRUM_AddSprint.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_AddSprintBacklog.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/helpdata/HELP_SCRUM_AddSprintBacklog.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_CreateScrumProject.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/helpdata/HELP_SCRUM_CreateScrumProject.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_DailyScrumMeetingMinute.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/helpdata/HELP_SCRUM_DailyScrumMeetingMinute.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditBacklogItemContent.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditBacklogItemContent.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditProdBacklog.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditProdBacklog.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditProductContents.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditProductContents.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditProjectContents.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditProjectContents.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditSprint.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditSprint.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditSprintBacklog.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditSprintBacklog.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_FindResource.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/helpdata/HELP_SCRUM_FindResource.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_FindTimeSheet.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/helpdata/HELP_SCRUM_FindTimeSheet.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_ListProductBacklogCategories.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/helpdata/HELP_SCRUM_ListProductBacklogCategories.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_MyWork.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/helpdata/HELP_SCRUM_MyWork.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_NewProductEmail.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/helpdata/HELP_SCRUM_NewProductEmail.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_OpenTest.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/helpdata/HELP_SCRUM_OpenTest.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_ProductBacklogEmails.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/helpdata/HELP_SCRUM_ProductBacklogEmails.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_ProductEmails.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/helpdata/HELP_SCRUM_ProductEmails.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_ProductView.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/helpdata/HELP_SCRUM_ProductView.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_Project.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/helpdata/HELP_SCRUM_Project.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_SprintList.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/helpdata/HELP_SCRUM_SprintList.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_SprintMember.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/helpdata/HELP_SCRUM_SprintMember.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_TaskView.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/helpdata/HELP_SCRUM_TaskView.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_ViewProdBacklogItem.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/helpdata/HELP_SCRUM_ViewProdBacklogItem.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_ViewProduct.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/helpdata/HELP_SCRUM_ViewProduct.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_ViewSprint.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/helpdata/HELP_SCRUM_ViewSprint.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_defaultTasks.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/helpdata/HELP_SCRUM_defaultTasks.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/hookscripts/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/data/hookscripts/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/hookscripts/commit.py - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/hookscripts/commit.py ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/hookscripts/post-commit - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/hookscripts/post-commit ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/hookscripts/pre-commit - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/hookscripts/pre-commit ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/scrumDemoData.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/scrumDemoData.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/scrumHelpData.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/scrumHelpData.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/scrumSecurityData.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/scrumSecurityData.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/scrumTypeData.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/data/scrumTypeData.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/documents/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/documents/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/documents/Scrum.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/documents/Scrum.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/dtd/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/dtd/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/entitydef/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/entitydef/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/entitydef/entitymodel.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/entitydef/entitymodel.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/lib/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/lib/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/ofbiz-component.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/ofbiz-component.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/ofbizScrumDataModel.odp - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/ofbizScrumDataModel.odp ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/patches/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/patches/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/script/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/script/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/script/org/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/script/org/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/script/org/ofbiz/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/script/org/ofbiz/scrum/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumPermissionServices.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumPermissionServices.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumServices.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumServices.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/script/org/ofbiz/scrum/test/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/test/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/script/org/ofbiz/scrum/test/DailyMeetingMinuteTests.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/test/DailyMeetingMinuteTests.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/script/org/ofbiz/scrum/test/MyWorkTests.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/test/MyWorkTests.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/script/org/ofbiz/scrum/test/ProductBacklogTest.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/test/ProductBacklogTest.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/script/org/ofbiz/scrum/test/ProductTest.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/test/ProductTest.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/script/org/ofbiz/scrum/test/QATests.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/test/QATests.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/script/org/ofbiz/scrum/test/ScrumProjectTests.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/test/ScrumProjectTests.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/script/org/ofbiz/scrum/test/ScrumTests.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/test/ScrumTests.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/script/org/ofbiz/scrum/test/SprintBacklogTests.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/test/SprintBacklogTests.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/script/org/ofbiz/scrum/test/SprintTests.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/test/SprintTests.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/script/org/ofbiz/scrum/test/TaskTests.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/test/TaskTests.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/script/org/ofbiz/scrum/test/TimesheetTests.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/test/TimesheetTests.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/servicedef/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/servicedef/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/servicedef/permissionServices.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/servicedef/permissionServices.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/servicedef/secas.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/servicedef/secas.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/servicedef/services.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/servicedef/services.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/src/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/src/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/src/org/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/src/org/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/src/org/ofbiz/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/src/org/ofbiz/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/src/org/ofbiz/scrum/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/src/org/ofbiz/scrum/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumEvents.java - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumEvents.java ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/templates/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/templates/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/templates/AcceptedBacklogNotification.ftl - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/templates/AcceptedBacklogNotification.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/templates/ActiveSprintNotification.ftl - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/templates/ActiveSprintNotification.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/templates/CancelledBacklogNotification.ftl - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/templates/CancelledBacklogNotification.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/templates/ClosedSprintNotification.ftl - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/templates/ClosedSprintNotification.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/templates/CompletedBacklogNotification.ftl - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/templates/CompletedBacklogNotification.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/templates/ReviewedBacklogNotification.ftl - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/templates/ReviewedBacklogNotification.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/testdef/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/testdef/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/testdef/scrumTests.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/testdef/scrumTests.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/demotest/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/demotest/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/demotest/WEB-INF/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/demotest/WEB-INF/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/demotest/WEB-INF/actions/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/demotest/WEB-INF/actions/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/demotest/WEB-INF/controller.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/demotest/WEB-INF/controller.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/demotest/actions/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/demotest/actions/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/demotest/error/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/demotest/error/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/demotest/error/error.jsp - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/demotest/error/error.jsp ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/demotest/index.jsp - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/demotest/index.jsp ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/AddProductBacklogItem.groovy - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/AddProductBacklogItem.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/AddResourceTaskParty.groovy - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/AddResourceTaskParty.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/BacklogNotifications.groovy - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/BacklogNotifications.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditDailyHourReport.groovy - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditDailyHourReport.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditWeekTimesheet.groovy - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditWeekTimesheet.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindBacklogItem.groovy - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindBacklogItem.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindProductBacklogItem.groovy - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindProductBacklogItem.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindTaskList.groovy - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindTaskList.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListCurrentProducts.groovy - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListCurrentProducts.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListCurrentSprints.groovy - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListCurrentSprints.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListRevision.groovy - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListRevision.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumResource.groovy - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumResource.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumRolesPersonAndCompany.groovy - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumRolesPersonAndCompany.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListTimeSheets.groovy - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListTimeSheets.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListUnplanBacklog.groovy - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListUnplanBacklog.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ProductBilling.groovy - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ProductBilling.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ProductEmail.groovy - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ProductEmail.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/QuickAddBacklog.groovy - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/QuickAddBacklog.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/SprintBacklogListItems.groovy - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/SprintBacklogListItems.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/SprintBacklogOptions.groovy - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/SprintBacklogOptions.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/TaskList.groovy - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/TaskList.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/controller.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/controller.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/web.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/web.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/error/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/error/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/error/error.jsp - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/error/error.jsp ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/includes/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/includes/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/includes/backlogByStatusChart.ftl - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/includes/backlogByStatusChart.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/includes/backlogByTypeChart.ftl - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/includes/backlogByTypeChart.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/includes/burndown.ftl - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/includes/burndown.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/includes/demotest.ftl - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/includes/demotest.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/includes/pieChart.ftl - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/includes/pieChart.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/includes/projectAndSprintChart.ftl - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/includes/projectAndSprintChart.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/includes/projectByStatusChart.ftl - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/includes/projectByStatusChart.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/includes/revision.ftl - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/includes/revision.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/includes/taskByStatusChart.ftl - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/includes/taskByStatusChart.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/includes/taskByTypeChart.ftl - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/includes/taskByTypeChart.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/index.jsp - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/index.jsp ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/reports/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/reports/BacklogByStatusChart.rptdesign - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogByStatusChart.rptdesign ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/reports/BacklogByTypeChart.rptdesign - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogByTypeChart.rptdesign ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/reports/BacklogChart.rptdesign - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogChart.rptdesign ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/reports/ProjectAndSprintChart.rptdesign - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/ProjectAndSprintChart.rptdesign ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/reports/ProjectByStatusChart.rptdesign - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/ProjectByStatusChart.rptdesign ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/reports/TaskByStatusChart.rptdesign - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/TaskByStatusChart.rptdesign ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/reports/TaskByTypeChart.rptdesign - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/TaskByTypeChart.rptdesign ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/widget/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/CommonScreens.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/widget/CommonScreens.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/CommunicationEventForms.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/widget/CommunicationEventForms.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/EmailTemplates.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/widget/EmailTemplates.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/FieldLookupForms.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/widget/FieldLookupForms.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/LookupScreens.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/widget/LookupScreens.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/MyWorkForms.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/widget/MyWorkForms.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/MyWorkScreens.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/widget/MyWorkScreens.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/OpenTestForms.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/widget/OpenTestForms.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/OpenTestScreens.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/widget/OpenTestScreens.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/ProjectForms.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/widget/ProjectForms.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/ResourceForms.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/widget/ResourceForms.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/ResourceScreens.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/widget/ResourceScreens.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/TaskForms.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/widget/TaskForms.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/TaskScreens.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/widget/TaskScreens.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/TimeSheetForms.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/widget/TimeSheetForms.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/TimeSheetScreens.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/widget/TimeSheetScreens.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/demotest/ - copied from r1153542, ofbiz/trunk/specialpurpose/scrum/widget/demotest/ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/demotest/DemotestScreen.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/widget/demotest/DemotestScreen.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/scrumForms.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/widget/scrumForms.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/scrumMenus.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/widget/scrumMenus.xml ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/scrumScreens.xml - copied unchanged from r1153542, ofbiz/trunk/specialpurpose/scrum/widget/scrumScreens.xml Removed: ofbiz/branches/jackrabbit20100709/framework/base/lib/ical4j-1.0.jar Modified: ofbiz/branches/jackrabbit20100709/ (props changed) ofbiz/branches/jackrabbit20100709/.classpath ofbiz/branches/jackrabbit20100709/.gitignore ofbiz/branches/jackrabbit20100709/LICENSE ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingUiLabels.xml ofbiz/branches/jackrabbit20100709/applications/accounting/data/AccountingTypeData.xml ofbiz/branches/jackrabbit20100709/applications/accounting/entitydef/entitymodel.xml ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodEvents.xml ofbiz/branches/jackrabbit20100709/applications/accounting/servicedef/services_cost.xml ofbiz/branches/jackrabbit20100709/applications/accounting/servicedef/services_invoice.xml ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/WEB-INF/controller.xml ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/WEB-INF/web.xml ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/ap/WEB-INF/controller.xml ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/ap/WEB-INF/web.xml ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/ap/invoices/CommissionRun.ftl ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/ar/WEB-INF/web.xml ofbiz/branches/jackrabbit20100709/applications/accounting/widget/InvoiceForms.xml ofbiz/branches/jackrabbit20100709/applications/commonext/webapp/WEB-INF/controller.xml ofbiz/branches/jackrabbit20100709/applications/content/config/ContentErrorUiLabels.xml ofbiz/branches/jackrabbit20100709/applications/content/config/ContentUiLabels.xml ofbiz/branches/jackrabbit20100709/applications/content/config/freemarkerTransforms.properties ofbiz/branches/jackrabbit20100709/applications/content/data/ContentTypeData.xml ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/content/ContentServices.xml ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/data/DataServices.xml ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml ofbiz/branches/jackrabbit20100709/applications/content/servicedef/secas.xml ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services.xml ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services_content.xml ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services_website.xml ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/ContentEvents.java ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java ofbiz/branches/jackrabbit20100709/applications/content/template/mime-type/flash-flv.ftl ofbiz/branches/jackrabbit20100709/applications/content/template/mime-type/image.ftl ofbiz/branches/jackrabbit20100709/applications/content/template/mime-type/quicktime.ftl ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/WEB-INF/controller.xml ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/content/DisplayContentNav.ftl ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/website/WebSiteForms.xml ofbiz/branches/jackrabbit20100709/applications/content/widget/CommonScreens.xml ofbiz/branches/jackrabbit20100709/applications/content/widget/WebSiteScreens.xml ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentMenus.xml ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentScreens.xml ofbiz/branches/jackrabbit20100709/applications/content/widget/forum/ForumForms.xml ofbiz/branches/jackrabbit20100709/applications/humanres/entitydef/entitymodel.xml ofbiz/branches/jackrabbit20100709/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java ofbiz/branches/jackrabbit20100709/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml ofbiz/branches/jackrabbit20100709/applications/marketing/servicedef/services.xml ofbiz/branches/jackrabbit20100709/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java ofbiz/branches/jackrabbit20100709/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java ofbiz/branches/jackrabbit20100709/applications/marketing/widget/ContactListForms.xml ofbiz/branches/jackrabbit20100709/applications/marketing/widget/ContactListMenus.xml ofbiz/branches/jackrabbit20100709/applications/order/config/OrderEntityLabels.xml ofbiz/branches/jackrabbit20100709/applications/order/config/OrderErrorUiLabels.xml ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml ofbiz/branches/jackrabbit20100709/applications/order/config/order.properties ofbiz/branches/jackrabbit20100709/applications/order/data/OrderScheduledServices.xml ofbiz/branches/jackrabbit20100709/applications/order/data/OrderTypeData.xml ofbiz/branches/jackrabbit20100709/applications/order/entitydef/entitymodel_view.xml ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed) ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml ofbiz/branches/jackrabbit20100709/applications/order/servicedef/secas.xml ofbiz/branches/jackrabbit20100709/applications/order/servicedef/services_quote.xml ofbiz/branches/jackrabbit20100709/applications/order/servicedef/services_request.xml ofbiz/branches/jackrabbit20100709/applications/order/servicedef/services_shoppinglist.xml ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderServices.java ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/CartEventListener.java ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/task/OrderTaskList.groovy ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/web.xml ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderitems.ftl ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl ofbiz/branches/jackrabbit20100709/applications/party/config/PartyEntityLabels.xml ofbiz/branches/jackrabbit20100709/applications/party/data/PartyTypeData.xml ofbiz/branches/jackrabbit20100709/applications/party/entitydef/entitymodel.xml ofbiz/branches/jackrabbit20100709/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml ofbiz/branches/jackrabbit20100709/applications/party/servicedef/services.xml ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/party/PartyServices.java ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed) ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/controller.xml ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/web.xml ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/party/editShoppingList.ftl ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/party/findparty.ftl ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/CommunicationEventForms.xml ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyForms.xml ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyScreens.xml ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml ofbiz/branches/jackrabbit20100709/applications/product/data/ProductTypeData.xml ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel.xml ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/category/CategoryServices.xml ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/cost/CostServices.xml ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed) ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml ofbiz/branches/jackrabbit20100709/applications/product/servicedef/services.xml ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/CatalogUrlFilter.java ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/CategoryServices.java ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/config/ProductConfigItemContentWrapper.java ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/product/ProductSearchSession.java ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/product/ProductWorker.java ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryContentContent.groovy ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/controller.xml ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/web.xml ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/category/CategoryTree.ftl ofbiz/branches/jackrabbit20100709/applications/product/webapp/facility/WEB-INF/actions/facility/FindInventoryItemsByLabels.groovy ofbiz/branches/jackrabbit20100709/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy ofbiz/branches/jackrabbit20100709/applications/product/webapp/facility/WEB-INF/web.xml ofbiz/branches/jackrabbit20100709/applications/product/webapp/facility/facility/PicklistManage.ftl ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CatalogMenus.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CatalogScreens.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CategoryForms.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CategoryScreens.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CommonScreens.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ConfigScreens.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/FeatureScreens.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductScreens.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/PromoScreens.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/StoreScreens.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/SubscriptionForms.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/SubscriptionScreens.xml ofbiz/branches/jackrabbit20100709/applications/product/widget/facility/FacilityTrees.xml ofbiz/branches/jackrabbit20100709/applications/workeffort/config/WorkEffortUiLabels.xml ofbiz/branches/jackrabbit20100709/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml ofbiz/branches/jackrabbit20100709/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml ofbiz/branches/jackrabbit20100709/applications/workeffort/servicedef/services.xml ofbiz/branches/jackrabbit20100709/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java ofbiz/branches/jackrabbit20100709/build.xml ofbiz/branches/jackrabbit20100709/framework/base/config/log4j.xml ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/concurrent/ExecutionPool.java ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/concurrent/TTLObject.java ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/concurrent/test/DependencyPoolTests.java ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/concurrent/test/TTLObjectTest.java ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/Debug.java ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/HttpClient.java ofbiz/branches/jackrabbit20100709/framework/build.xml ofbiz/branches/jackrabbit20100709/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java ofbiz/branches/jackrabbit20100709/framework/common/config/CommonUiLabels.xml ofbiz/branches/jackrabbit20100709/framework/common/config/general.properties ofbiz/branches/jackrabbit20100709/framework/common/data/GeoData.xml ofbiz/branches/jackrabbit20100709/framework/common/entitydef/entitymodel.xml ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/CommonWorkers.java ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/login/LoginServices.java ofbiz/branches/jackrabbit20100709/framework/common/webcommon/WEB-INF/actions/includes/FindAutocompleteOptions.groovy ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/countries.ftl ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/htmlTemplate.ftl ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml ofbiz/branches/jackrabbit20100709/framework/common/widget/HelpScreens.xml (props changed) ofbiz/branches/jackrabbit20100709/framework/entity/dtd/entity-config.xsd ofbiz/branches/jackrabbit20100709/framework/entity/dtd/entitymodel.xsd ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/Delegator.java ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/GenericDelegator.java ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/condition/EntityConditionSubSelect.java ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/condition/EntityFieldValue.java ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/condition/OrderByList.java ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/config/DatasourceInfo.java ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/datasource/GenericHelper.java ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/datasource/GenericHelperDAO.java ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/datasource/MemoryHelper.java ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/jdbc/SqlJdbcUtil.java ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/model/DynamicViewEntity.java ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/model/ModelField.java ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/sql/EntityPlanner.java ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/sql/EntitySelectPlan.java ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/util/SequenceUtil.java ofbiz/branches/jackrabbit20100709/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaRule.java ofbiz/branches/jackrabbit20100709/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaUtil.java ofbiz/branches/jackrabbit20100709/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java ofbiz/branches/jackrabbit20100709/framework/minilang/src/org/ofbiz/minilang/method/entityops/OrderValueList.java ofbiz/branches/jackrabbit20100709/framework/security/data/PasswordSecurityData.xml (props changed) ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/DispatchContext.java ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/GenericDispatcher.java ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/ServiceDispatcher.java ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/eca/ServiceEcaRule.java ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/eca/ServiceEcaUtil.java ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java ofbiz/branches/jackrabbit20100709/framework/sql/src/org/ofbiz/sql/SelectGroup.java ofbiz/branches/jackrabbit20100709/framework/start/src/org/ofbiz/base/start/Classpath.java ofbiz/branches/jackrabbit20100709/framework/start/src/org/ofbiz/base/start/Config.java ofbiz/branches/jackrabbit20100709/framework/start/src/org/ofbiz/base/start/Start.java ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizContentTransform.java ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/website/WebSiteWorker.java ofbiz/branches/jackrabbit20100709/framework/widget/config/widget.properties ofbiz/branches/jackrabbit20100709/framework/widget/dtd/widget-tree.xsd ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java ofbiz/branches/jackrabbit20100709/framework/widget/templates/csvFormMacroLibrary.ftl ofbiz/branches/jackrabbit20100709/framework/widget/templates/foFormMacroLibrary.ftl ofbiz/branches/jackrabbit20100709/framework/widget/templates/htmlFormMacroLibrary.ftl ofbiz/branches/jackrabbit20100709/framework/widget/templates/htmlTreeMacroLibrary.ftl ofbiz/branches/jackrabbit20100709/framework/widget/templates/textFormMacroLibrary.ftl ofbiz/branches/jackrabbit20100709/framework/widget/templates/xmlFormMacroLibrary.ftl ofbiz/branches/jackrabbit20100709/macros.xml ofbiz/branches/jackrabbit20100709/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml ofbiz/branches/jackrabbit20100709/specialpurpose/build.xml ofbiz/branches/jackrabbit20100709/specialpurpose/component-load.xml ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/lib/ (props changed) ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/config/EcommerceUiLabels.xml ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoConfigurator.xml ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoFinAccount.xml ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoPopularCategoriesData.xml ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoProduct.xml ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoPurchasing.xml ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/ofbiz-component.xml ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/templates/email/ContactListSubscribeEmail.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeEmail.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeVerifyEmail.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CartScreens.xml ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CatalogScreens.xml ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CommonScreens.xml ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/ContentForms.xml ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/EmailContactListScreens.xml ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/blog/BlogScreens.xml ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed) ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed) ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed) ofbiz/branches/jackrabbit20100709/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java ofbiz/branches/jackrabbit20100709/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java ofbiz/branches/jackrabbit20100709/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java ofbiz/branches/jackrabbit20100709/specialpurpose/ofbizwebsite/data/OfbizData_FR.xml ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/entitydef/entitymodel.xml ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/widget/CommonScreens.xml ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/widget/forms/ProjectForms.xml ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/widget/forms/TaskForms.xml ofbiz/branches/jackrabbit20100709/specialpurpose/shark/src/org/ofbiz/shark/expression/BaseEntityCondExprBldr.java Propchange: ofbiz/branches/jackrabbit20100709/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Aug 3 16:12:58 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4:951708-952957 /ofbiz/branches/jquery:952958-1044489 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:962442-1128853 +/ofbiz/trunk:962442-1153542 Modified: ofbiz/branches/jackrabbit20100709/.classpath URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/.classpath?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/.classpath (original) +++ ofbiz/branches/jackrabbit20100709/.classpath Wed Aug 3 16:12:58 2011 @@ -34,7 +34,7 @@ <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.jar"/> - <classpathentry kind="lib" path="framework/base/lib/ical4j-1.0.jar"/> + <classpathentry kind="lib" path="framework/base/lib/ical4j-1.0-rc2.jar"/> <classpathentry kind="lib" path="framework/base/lib/icu4j-4_4.jar"/> <classpathentry kind="lib" path="framework/base/lib/ivy-2.2.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/jakarta-regexp-1.5.jar"/> Modified: ofbiz/branches/jackrabbit20100709/.gitignore URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/.gitignore?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/.gitignore (original) +++ ofbiz/branches/jackrabbit20100709/.gitignore Wed Aug 3 16:12:58 2011 @@ -1,6 +1,7 @@ tools/build applications/accounting/build/ applications/content/build/ +applications/content/index/ applications/humanres/build/ applications/manufacturing/build/ applications/marketing/build/ @@ -63,7 +64,7 @@ runtime/logs/*.log* runtime/logs/*.html* runtime/logs/test-results/* runtime/data/derby/* -runtime/data/jackrabbit/* +runtime/data/utilcache.* runtime/catalina/work/* runtime/tempfiles/* debian/EncryptPassword.class Modified: ofbiz/branches/jackrabbit20100709/LICENSE URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/LICENSE?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/LICENSE (original) +++ ofbiz/branches/jackrabbit20100709/LICENSE Wed Aug 3 16:12:58 2011 @@ -499,7 +499,7 @@ ofbiz/trunk/framework/base/lib/antisamy- ofbiz/trunk/framework/base/lib/freemarker-2.3.10.jar ofbiz/trunk/framework/base/lib/hamcrest-all-1.2.jar ofbiz/trunk/framework/base/lib/httpunit.jar -ofbiz/trunk/framework/base/lib/ical4j-1.0.jar +ofbiz/trunk/framework/base/lib/ical4j-1.0-rc2.jar ofbiz/trunk/lib/build/javacc/javacc.jar (5.0) ofbiz/trunk/framework/base/lib/javolution-5.4.3.jar ofbiz/trunk/framework/base/lib/junitperf.jar Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingUiLabels.xml?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingUiLabels.xml Wed Aug 3 16:12:58 2011 @@ -2959,6 +2959,10 @@ <value xml:lang="it">Non è possibile creare la carta di credito (fallimento durante la generazione id)</value> <value xml:lang="pt">Não foi possÃvel criar o cartão de crédito (Falha ao gerar ID)</value> </property> + <property key="AccountingCreditCardCreatedSuccessfully"> + <value xml:lang="en">Credit Card successfully created.</value> + <value xml:lang="it">Carta di credito creato con succcesso.</value> + </property> <property key="AccountingCreditCardCreateWriteFailure"> <value xml:lang="de">Es konnte keine Kreditkarte angelegt werden (Schreibfehler) : </value> <value xml:lang="en">Could not create credit card (write failure) : </value> @@ -3012,8 +3016,9 @@ <value xml:lang="zh_TW">æ²æ建ç«ä¿¡ç¨å¡ãä¿¡ç¨å¡æ²ééæª¢æ ¸, èªè失æã</value> </property> <property key="AccountingCreditCardNumberInvalid"> + <!-- FIXME: other languages(en is correct) --> <value xml:lang="de">${cardNumber} ist keine ${cardType}-Kreditkartennummer.</value> - <value xml:lang="en">${cardNumber} is not a valid ${cardType} credit card number. (It appears to be a ${validCardType}) credit card number)</value> + <value xml:lang="en">That is not a valid ${cardType} credit card number. (It appears to be a ${validCardType}) credit card number)</value> <value xml:lang="it">La carta di credito numero ${cardNumber} non è una ${cardType}. (Sembra che sia una ${validCardType})</value> <value xml:lang="pt">${cardNumber} não é válido ${cardType} número de cartão de crédito. (Parece ser um ${validCardType}) o número do cartão de crédito)</value> </property> @@ -3047,6 +3052,10 @@ <value xml:lang="it">Non è possibile leggere la carta di credito (fallimento in lettura) : </value> <value xml:lang="pt">Não foi possÃvel obter o cartão de crédito para atualizar (erro de leitura):</value> </property> + <property key="AccountingCreditCardUpdatedSuccessfully"> + <value xml:lang="en">Credit Card Info successfully updated.</value> + <value xml:lang="it">Informazioni sulla carta di credito aggiornati con succcesso.</value> + </property> <property key="AccountingCreditCardUpdateWithPaymentMethodId"> <value xml:lang="en">ERROR: Could not find credit card to update with payment method id </value> <value xml:lang="it">Non è possibile trovare la carta di credito da aggiornare con il metodo di pagamento </value> @@ -3483,6 +3492,10 @@ <value xml:lang="zh">çµåèµé转账账æ·</value> <value xml:lang="zh_TW">é»åè³éè½è³¬è³¬æ¶</value> </property> + <property key="AccountingEFTAccountCreatedSuccessfully"> + <value xml:lang="en">EFT Account successfully created.</value> + <value xml:lang="it">Conto EFT creato con successo.</value> + </property> <property key="AccountingEFTAccountInformation"> <value xml:lang="de">Bankkonto Information</value> <value xml:lang="en">EFT Account Information</value> @@ -3505,6 +3518,10 @@ <value xml:lang="pt">ID de método Pagamento de Conta EFT está faltando</value> <value xml:lang="zh_TW">æ²æEFT帳æ¶æ¯ä»æ¹å¼ID</value> </property> + <property key="AccountingEFTAccountUpdatedSuccessfully"> + <value xml:lang="en">EFT Account Info successfully updated.</value> + <value xml:lang="it">Informazioni sul conto EFT aggiornate con successo.</value> + </property> <property key="AccountingEFTNotBelongToYou"> <value xml:lang="de">Die angegebene Bankverbindung gehört nicht zu Ihnen. Daher dürfen Sie die Infomationen dieser Bankverbindung weder einsehen noch bearbeiten.</value> <value xml:lang="en">The EFT Account specified does not belong to you, you may not view or edit it</value> @@ -9074,6 +9091,10 @@ <value xml:lang="zh">æ¯ä»æ¹æ³æå®è´¦æ·ç±»å</value> <value xml:lang="zh_TW">æ¯ä»æ¹æ³æå®è³¬æ¶é¡å</value> </property> + <property key="AccountingPaymentMethodDeletedSuccessfully"> + <value xml:lang="en">Payment Method successfully deleted.</value> + <value xml:lang="it">Metodo pagamento cancellato con successo.</value> + </property> <property key="AccountingPaymentMethodId"> <value xml:lang="de">Zahlungsmethode</value> <value xml:lang="en">Payment Method Id</value> Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/data/AccountingTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/data/AccountingTypeData.xml?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/data/AccountingTypeData.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/data/AccountingTypeData.xml Wed Aug 3 16:12:58 2011 @@ -996,10 +996,6 @@ under the License. <WorkEffort workEffortId="_NA_"/> <EmplPositionType emplPositionTypeId="_NA_"/> - <WebSite webSiteId="ACCOUNTING" siteName="Accounting Manager" visualThemeSetId="BACKOFFICE"/> - <WebSite webSiteId="ACCOUNTING_P" siteName="Account Payable Manager" visualThemeSetId="BACKOFFICE"/> - <WebSite webSiteId="ACCOUNTING_R" siteName="Account Receivable Manager" visualThemeSetId="BACKOFFICE"/> - <!-- Points of Title Transfer --> <EnumerationType description="Points of Title Transfer" enumTypeId="PTSOFTTFR" hasTable="N" parentTypeId=""/> <Enumeration description="Desination" enumCode="DEST" enumId="POTT_DEST" sequenceId="01" enumTypeId="PTSOFTTFR"/> Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/entitydef/entitymodel.xml?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/entitydef/entitymodel.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/entitydef/entitymodel.xml Wed Aug 3 16:12:58 2011 @@ -1568,7 +1568,7 @@ under the License. </view-link> </view-entity> - <view-entity entity-name="InvoiceAndType" package-name="org.ofbiz.accounting.invoice" title="Invoice and InvoiceType to be able to list invoices by invoiceParentType ie sales/purchase invoices"> + <view-entity entity-name="InvoiceAndType" package-name="org.ofbiz.accounting.invoice" title="Invoice and InvoiceType to be able to list invoices by invoiceParentType i.e. sales/purchase invoices"> <member-entity entity-alias="INV" entity-name="Invoice"/> <member-entity entity-alias="IVT" entity-name="InvoiceType"/> <alias-all entity-alias="INV"/> Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml Wed Aug 3 16:12:58 2011 @@ -332,6 +332,8 @@ under the License. <if-compare-field field="lookedUpValue" to-field="savedValue" operator="not-equals" type="Object"> <store-value value-field="lookedUpValue"/> </if-compare-field> + <field-to-result field="lookedUpValue.invoiceItemSeqId" result-name="invoiceItemSeqId"/> + <field-to-result field="lookedUpValue.invoiceId" result-name="invoiceId"/> </simple-method> <simple-method method-name="removeInvoiceItem" short-description="Remove an existing Invoice Item"> <call-simple-method method-name="InvoiceStatusInProgress"/> Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodEvents.xml?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodEvents.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodEvents.xml Wed Aug 3 16:12:58 2011 @@ -26,7 +26,8 @@ under the License. processor-name="deletePaymentMethod" in-map-name="parameters" out-map-name="context"/> <check-errors/> <call-service service-name="deletePaymentMethod" in-map-name="context"> - <default-message>Payment Method successfully deleted.</default-message></call-service> + <default-message resource="AccountingUiLabels" property="AccountingPaymentMethodDeletedSuccessfully"/> + </call-service> </simple-method> <!-- CreditCard events --> @@ -35,7 +36,7 @@ under the License. processor-name="createCreditCard" in-map-name="parameters" out-map-name="context"/> <check-errors/> <call-service service-name="createCreditCard" in-map-name="context"> - <default-message>Credit Card successfully created.</default-message> + <default-message resource="AccountingUiLabels" property="AccountingCreditCardCreatedSuccessfully"/> <result-to-request result-name="paymentMethodId"/> </call-service> <if-compare field="parameters.contactMechId" operator="equals" value="_NEW_"> @@ -55,7 +56,7 @@ under the License. processor-name="createCreditCard" in-map-name="parameters" out-map-name="context"/> <check-errors/> <call-service service-name="updateCreditCard" in-map-name="context"> - <default-message>Credit Card Info successfully updated.</default-message> + <default-message resource="AccountingUiLabels" property="AccountingCreditCardUpdatedSuccessfully"/> <result-to-request result-name="paymentMethodId" request-name="paymentMethodId"/> </call-service> <if-compare field="parameters.contactMechId" operator="equals" value="_NEW_"> @@ -74,7 +75,7 @@ under the License. processor-name="createEftAccount" in-map-name="parameters" out-map-name="context"/> <check-errors/> <call-service service-name="createEftAccount" in-map-name="context"> - <default-message>EFT Account successfully created.</default-message> + <default-message resource="AccountingUiLabels" property="AccountingEFTAccountCreatedSuccessfully"/> <result-to-request result-name="paymentMethodId"/></call-service> </simple-method> <simple-method method-name="updateEftAccount" short-description="Update EFT Account"> @@ -85,7 +86,7 @@ under the License. processor-name="createEftAccount" in-map-name="parameters" out-map-name="context"/> <check-errors/> <call-service service-name="updateEftAccount" in-map-name="context"> - <default-message>EFT Account Info successfully updated.</default-message> + <default-message resource="AccountingUiLabels" property="AccountingEFTAccountUpdatedSuccessfully"/> <result-to-request result-name="paymentMethodId" request-name="paymentMethodId"/> </call-service> </simple-method> Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/servicedef/services_cost.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/servicedef/services_cost.xml?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/servicedef/services_cost.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/servicedef/services_cost.xml Wed Aug 3 16:12:58 2011 @@ -91,7 +91,7 @@ under the License. <description>Update a Product Average Cost record on receive inventory</description> <permission-service service-name="acctgCostPermissionCheck" main-action="UPDATE"/> <attribute name="facilityId" type="String" mode="IN" optional="false"/> - <attribute name="quantityAccepted" type="String" mode="IN" optional="false"/> + <attribute name="quantityAccepted" type="BigDecimal" mode="IN" optional="false"/> <attribute name="productId" type="String" mode="IN" optional="false"/> <attribute name="inventoryItemId" type="String" mode="IN" optional="false"/> </service> Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/servicedef/services_invoice.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/servicedef/services_invoice.xml?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/servicedef/services_invoice.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/servicedef/services_invoice.xml Wed Aug 3 16:12:58 2011 @@ -124,7 +124,7 @@ under the License. location="component://accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml" invoke="updateInvoiceItem"> <description>Update existing Invoice Item Record</description> <permission-service service-name="acctgInvoicePermissionCheck" main-action="UPDATE"/> - <auto-attributes mode="IN" include="pk" optional="false"/> + <auto-attributes mode="INOUT" include="pk" optional="false"/> <auto-attributes mode="IN" include="nonpk" optional="true"/> <override name="description" allow-html="safe"/> </service> Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java Wed Aug 3 16:12:58 2011 @@ -747,7 +747,10 @@ public class InvoiceServices { } // check for previous order payments - List<GenericValue> orderPaymentPrefs = delegator.findByAnd("OrderPaymentPreference", UtilMisc.toMap("orderId", orderId)); + List<EntityExpr> paymentPrefConds = UtilMisc.toList( + EntityCondition.makeCondition("orderId", EntityOperator.EQUALS, orderId), + EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "PAYMENT_CANCELLED")); + List<GenericValue> orderPaymentPrefs = delegator.findList("OrderPaymentPreference", EntityCondition.makeCondition(paymentPrefConds, EntityOperator.AND), null, null, null, false); List<GenericValue> currentPayments = FastList.newInstance(); for (GenericValue paymentPref : orderPaymentPrefs) { List<GenericValue> payments = paymentPref.getRelated("Payment"); @@ -755,6 +758,9 @@ public class InvoiceServices { } // apply these payments to the invoice if they have any remaining amount to apply for (GenericValue payment : currentPayments) { + if ("PMNT_VOID".equals(payment.getString("statusId")) || "PMNT_CANCELLED".equals(payment.getString("statusId"))) { + continue; + } BigDecimal notApplied = PaymentWorker.getPaymentNotApplied(payment); if (notApplied.signum() > 0) { Map<String, Object> appl = FastMap.newInstance(); Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java Wed Aug 3 16:12:58 2011 @@ -151,8 +151,7 @@ public class PaymentMethodServices { if (!UtilValidate.isCardMatch((String) context.get("cardType"), (String) context.get("cardNumber"))) { messages.add( UtilProperties.getMessage(resource, "AccountingCreditCardNumberInvalid", - UtilMisc.toMap("cardNumber", (String) context.get("cardNumber"), - "cardType", (String) context.get("cardType"), + UtilMisc.toMap("cardType", (String) context.get("cardType"), "validCardType", UtilValidate.getCardType((String) context.get("cardNumber"))), locale)); } @@ -301,14 +300,12 @@ public class PaymentMethodServices { if (updatedCardNumber.startsWith("*")) { // get the masked card number from the db String origCardNumber = creditCard.getString("cardNumber"); - Debug.log("CCInfo: " + creditCard.toString(), module); String origMaskedNumber = ""; int cardLength = origCardNumber.length() - 4; for (int i = 0; i < cardLength; i++) { origMaskedNumber = origMaskedNumber + "*"; } origMaskedNumber = origMaskedNumber + origCardNumber.substring(cardLength); - Debug.log(origMaskedNumber); // compare the two masked numbers if (updatedCardNumber.equals(origMaskedNumber)) { @@ -320,8 +317,7 @@ public class PaymentMethodServices { if (!UtilValidate.isCardMatch((String) context.get("cardType"), (String) context.get("cardNumber"))) { messages.add( UtilProperties.getMessage(resource, "AccountingCreditCardNumberInvalid", - UtilMisc.toMap("cardNumber", (String) context.get("cardNumber"), - "cardType", (String) context.get("cardType"), + UtilMisc.toMap("cardType", (String) context.get("cardType"), "validCardType", UtilValidate.getCardType((String) context.get("cardNumber"))), locale)); } @@ -590,7 +586,6 @@ public class PaymentMethodServices { if (cardNumber.startsWith("*")) { // get the masked card number from the db String origCardNumber = giftCard.getString("cardNumber"); - //Debug.log(origCardNumber); String origMaskedNumber = ""; int cardLength = origCardNumber.length() - 4; if (cardLength > 0) { Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/WEB-INF/controller.xml Wed Aug 3 16:12:58 2011 @@ -193,8 +193,8 @@ under the License. </request-map> <request-map uri="updateInvoiceItem"> <security https="true" auth="true"/> - <event type="service" invoke="updateInvoiceItem"/> - <response name="success" type="view" value="listInvoiceItems"/> + <event type="service-multi" invoke="updateInvoiceItem"/> + <response name="success" type="request-redirect" value="listInvoiceItems"/> <response name="error" type="view" value="listInvoiceItems"/> </request-map> <request-map uri="removeInvoiceItem"> @@ -2489,6 +2489,12 @@ under the License. <security https="true" auth="true"/> <response name="success" type="view" value="CommissionRun"/> </request-map> + + <request-map uri="processCommissionRun"> + <security https="true" auth="true"/> + <event type="service" invoke="createCommissionInvoices"/> + <response name="success" type="view" value="CommissionRun"/> + </request-map> <!--Add Tax Settings --> <request-map uri="addtax"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |