Author: erwan
Date: Mon Jul 2 20:11:49 2012
New Revision: 1356450
URL: http://svn.apache.org/viewvc?rev=1356450&view=rev
Log:
keeping branch up-to-date, merging from 1347754 to 1351865, selected wrong rev
number at last merge
Added:
ofbiz/branches/20120329_portletWidget/framework/base/lib/j2eespecs/annotations-api-3.0.jar
- copied unchanged from r1351865,
ofbiz/trunk/framework/base/lib/j2eespecs/annotations-api-3.0.jar
ofbiz/branches/20120329_portletWidget/framework/base/lib/j2eespecs/el-api-2.2.jar
- copied unchanged from r1351865,
ofbiz/trunk/framework/base/lib/j2eespecs/el-api-2.2.jar
ofbiz/branches/20120329_portletWidget/framework/base/lib/j2eespecs/jsp-api-2.2.jar
- copied unchanged from r1351865,
ofbiz/trunk/framework/base/lib/j2eespecs/jsp-api-2.2.jar
ofbiz/branches/20120329_portletWidget/framework/base/lib/j2eespecs/servlet-api-3.0.jar
- copied unchanged from r1351865,
ofbiz/trunk/framework/base/lib/j2eespecs/servlet-api-3.0.jar
ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.28.catalina-ha.jar
- copied unchanged from r1351865,
ofbiz/trunk/framework/catalina/lib/tomcat-7.0.28.catalina-ha.jar
ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.28.catalina-tribes.jar
- copied unchanged from r1351865,
ofbiz/trunk/framework/catalina/lib/tomcat-7.0.28.catalina-tribes.jar
ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.28.tomcat-embed-core.jar
- copied unchanged from r1351865,
ofbiz/trunk/framework/catalina/lib/tomcat-7.0.28.tomcat-embed-core.jar
ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.28.tomcat-embed-jasper.jar
- copied unchanged from r1351865,
ofbiz/trunk/framework/catalina/lib/tomcat-7.0.28.tomcat-embed-jasper.jar
ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.28.tomcat-embed-logging-log4j.jar
- copied unchanged from r1351865,
ofbiz/trunk/framework/catalina/lib/tomcat-7.0.28.tomcat-embed-logging-log4j.jar
ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/jquery-1.7.2.js
- copied unchanged from r1351865,
ofbiz/trunk/framework/images/webapp/images/jquery/jquery-1.7.2.js
ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/jquery-1.7.2.min.js
- copied unchanged from r1351865,
ofbiz/trunk/framework/images/webapp/images/jquery/jquery-1.7.2.min.js
ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-1.0.0.js
- copied unchanged from r1351865,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-1.0.0.js
ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-gl.js
- copied unchanged from r1351865,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-gl.js
ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ko.js
- copied unchanged from r1351865,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ko.js
ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-no.js
- copied unchanged from r1351865,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-no.js
ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-sv.js
- copied unchanged from r1351865,
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-sv.js
ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/data/MyPortalTypeData.xml
- copied unchanged from r1351865,
ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
Removed:
ofbiz/branches/20120329_portletWidget/framework/base/lib/j2eespecs/tomcat-7.0.27.annotations-api.jar
ofbiz/branches/20120329_portletWidget/framework/base/lib/j2eespecs/tomcat-7.0.27.el-api.jar
ofbiz/branches/20120329_portletWidget/framework/base/lib/j2eespecs/tomcat-7.0.27.jsp-api.jar
ofbiz/branches/20120329_portletWidget/framework/base/lib/j2eespecs/tomcat-7.0.27.servlet-api.jar
ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.27.catalina-ha.jar
ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.27.catalina-tribes.jar
ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.27.tomcat-embed-core.jar
ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.27.tomcat-embed-jasper.jar
ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.27.tomcat-embed-logging-log4j.jar
ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.6.css
ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.6.js
ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.7.js
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/ContextAccessor.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToField.java
ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/screen/ScreenTextViewHandler.java
ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/screen/ScreenWidgetViewHandler.java
ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/screen/ScreenXmlViewHandler.java
ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/data/MyPortalPageDemoData.xml
Modified:
ofbiz/branches/20120329_portletWidget/ (props changed)
ofbiz/branches/20120329_portletWidget/.classpath
ofbiz/branches/20120329_portletWidget/LICENSE
ofbiz/branches/20120329_portletWidget/applications/accounting/config/AccountingUiLabels.xml
ofbiz/branches/20120329_portletWidget/applications/accounting/ofbiz-component.xml
ofbiz/branches/20120329_portletWidget/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml
ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/WEB-INF/controller.xml
ofbiz/branches/20120329_portletWidget/applications/commonext/ofbiz-component.xml
ofbiz/branches/20120329_portletWidget/applications/content/ofbiz-component.xml
ofbiz/branches/20120329_portletWidget/applications/content/servicedef/services.xml
ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/ContentManagementServices.java
ofbiz/branches/20120329_portletWidget/applications/content/widget/content/ContentForms.xml
ofbiz/branches/20120329_portletWidget/applications/content/widget/content/DataResourceForms.xml
ofbiz/branches/20120329_portletWidget/applications/humanres/ofbiz-component.xml
ofbiz/branches/20120329_portletWidget/applications/manufacturing/ofbiz-component.xml
ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java
ofbiz/branches/20120329_portletWidget/applications/marketing/ofbiz-component.xml
ofbiz/branches/20120329_portletWidget/applications/order/ofbiz-component.xml
ofbiz/branches/20120329_portletWidget/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
(props changed)
ofbiz/branches/20120329_portletWidget/applications/order/src/org/ofbiz/order/order/OrderServices.java
ofbiz/branches/20120329_portletWidget/applications/party/ofbiz-component.xml
ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
(props changed)
ofbiz/branches/20120329_portletWidget/applications/product/config/ProductEntityLabels.xml
ofbiz/branches/20120329_portletWidget/applications/product/config/ProductUiLabels.xml
ofbiz/branches/20120329_portletWidget/applications/product/ofbiz-component.xml
ofbiz/branches/20120329_portletWidget/applications/product/script/org/ofbiz/product/test/InventoryTests.xml
(props changed)
ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/promo/PromoServices.java
ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/WEB-INF/controller.xml
ofbiz/branches/20120329_portletWidget/applications/workeffort/ofbiz-component.xml
ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java
ofbiz/branches/20120329_portletWidget/framework/bi/ofbiz-component.xml
ofbiz/branches/20120329_portletWidget/framework/common/ofbiz-component.xml
ofbiz/branches/20120329_portletWidget/framework/common/webcommon/WEB-INF/common-controller.xml
ofbiz/branches/20120329_portletWidget/framework/common/webcommon/includes/flotCharts/Bars.ftl
ofbiz/branches/20120329_portletWidget/framework/common/webcommon/includes/flotCharts/Pie.ftl
ofbiz/branches/20120329_portletWidget/framework/common/webcommon/includes/lookup.ftl
ofbiz/branches/20120329_portletWidget/framework/common/widget/CommonScreens.xml
ofbiz/branches/20120329_portletWidget/framework/common/widget/HelpScreens.xml
(props changed)
ofbiz/branches/20120329_portletWidget/framework/common/widget/LookupForms.xml
ofbiz/branches/20120329_portletWidget/framework/common/widget/LookupScreens.xml
ofbiz/branches/20120329_portletWidget/framework/entity/config/entityengine.xml
ofbiz/branches/20120329_portletWidget/framework/entityext/ofbiz-component.xml
ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-he.js
ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ru.js
ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-sk.js
ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-tr.js
ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-zh-CN.js
ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-zh-TW.js
ofbiz/branches/20120329_portletWidget/framework/minilang/dtd/simple-methods-v2.xsd
ofbiz/branches/20120329_portletWidget/framework/minilang/src/META-INF/services/org.ofbiz.minilang.method.MethodOperation$Factory
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/MethodContext.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/MethodOperation.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/callops/CallBsh.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/callops/CallClassMethod.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/callops/CallObjectMethod.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/callops/CallScript.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/callops/CallServiceAsynch.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMethod.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/callops/Return.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/callops/SetServiceFields.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareCondition.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareFieldCondition.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/conditional/EmptyCondition.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/conditional/HasPermissionCondition.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/conditional/MasterIf.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/conditional/RegexpCondition.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/conditional/ValidateMethodCondition.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearCacheLine.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearEntityCaches.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/CloneValue.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityAnd.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityData.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityOne.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByAnd.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByDate.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelated.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelatedOne.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeNextSeqId.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeValue.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/OrderValueList.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/RefreshValue.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveByAnd.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveList.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveRelated.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveValue.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/SequencedIdToEnv.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetCurrentUserLogin.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetNonpkFields.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetPkFields.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreList.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreValue.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionBegin.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionCommit.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionRollback.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/envops/AddError.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/envops/Assert.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/envops/Break.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/envops/CheckErrors.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/envops/CheckId.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/envops/ClearField.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/envops/Continue.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/envops/CreateObject.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToList.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/envops/FirstFromList.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/envops/IterateMap.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/envops/ListToList.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/envops/Loop.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/envops/MapToMap.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/envops/Now.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/envops/OrderMapList.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/envops/SetCalendar.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/envops/StringAppend.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToList.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/envops/ToString.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/envops/While.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/eventops/FieldToRequest.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/eventops/FieldToSession.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestParametersToList.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestToField.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/eventops/SessionToField.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/eventops/WebappPropertyToField.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckPermission.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfInstanceOf.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfNotEmpty.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/otherops/Calculate.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/otherops/Log.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/otherops/PropertyToField.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/otherops/Trace.java
ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/serviceops/FieldToResult.java
ofbiz/branches/20120329_portletWidget/framework/resources/templates/ofbiz-component.xml
ofbiz/branches/20120329_portletWidget/framework/security/config/SecurityEntityLabels.xml
ofbiz/branches/20120329_portletWidget/framework/security/data/PasswordSecurityData.xml
(props changed)
ofbiz/branches/20120329_portletWidget/framework/security/ofbiz-component.xml
ofbiz/branches/20120329_portletWidget/framework/service/ofbiz-component.xml
ofbiz/branches/20120329_portletWidget/framework/webapp/dtd/site-conf.xsd
ofbiz/branches/20120329_portletWidget/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java
ofbiz/branches/20120329_portletWidget/framework/webtools/ofbiz-component.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/ofbiz-component.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/ebay/ofbiz-component.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/lib/
(props changed)
ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/ofbiz-component.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/ofbiz-component.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/CommonScreens.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/example/ofbiz-component.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/example/webapp/example/flot/flotPie.ftl
ofbiz/branches/20120329_portletWidget/specialpurpose/googlebase/ofbiz-component.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/ofbiz-component.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/ofbiz-component.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
(props changed)
ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
(props changed)
ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
(props changed)
ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl
ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/ofbiz-component.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/oagis/ofbiz-component.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/ofbizwebsite/template/HtmlHead.ftl
ofbiz/branches/20120329_portletWidget/specialpurpose/pos/ofbiz-component.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/ofbiz-component.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/ofbiz-component.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/ofbiz-component.xml
ofbiz/branches/20120329_portletWidget/themes/bizznesstime/webapp/bizznesstime/css/style.css
ofbiz/branches/20120329_portletWidget/themes/bluelight/webapp/bluelight/style.css
ofbiz/branches/20120329_portletWidget/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css
ofbiz/branches/20120329_portletWidget/themes/flatgrey/webapp/flatgrey/javascript.css
ofbiz/branches/20120329_portletWidget/themes/multiflex/webapp/multiflex/style.css
ofbiz/branches/20120329_portletWidget/themes/tomahawk/webapp/tomahawk/css/style.css
ofbiz/branches/20120329_portletWidget/tools/mergefromtrunk.bat (props
changed)
ofbiz/branches/20120329_portletWidget/tools/mergefromtrunk.sh (props
changed)
Propchange: ofbiz/branches/20120329_portletWidget/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1347755-1351865
Modified: ofbiz/branches/20120329_portletWidget/.classpath
URL:
http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/.classpath?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/.classpath (original)
+++ ofbiz/branches/20120329_portletWidget/.classpath Mon Jul 2 20:11:49 2012
@@ -39,7 +39,6 @@
<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/jcl-over-slf4j-1.6.4.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"/>
@@ -54,7 +53,6 @@
<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/slf4j-simple-1.6.4.jar"/>
<classpathentry kind="lib" path="framework/base/lib/Tidy.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"/>
@@ -93,10 +91,10 @@
<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/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"/>
@@ -112,11 +110,11 @@
<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/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"/>
Modified: ofbiz/branches/20120329_portletWidget/LICENSE
URL:
http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/LICENSE?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/LICENSE (original)
+++ ofbiz/branches/20120329_portletWidget/LICENSE Mon Jul 2 20:11:49 2012
@@ -64,10 +64,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
@@ -75,11 +75,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
