Author: erwan
Date: Tue Nov 13 21:47:18 2012
New Revision: 1408976
URL: http://svn.apache.org/viewvc?rev=1408976&view=rev
Log:
merging trunk to branch rev 1401851 to 1408954 and keep branch up-to-date
Added:
ofbiz/branches/20120329_portletWidget/applications/content/lib/fontbox-1.7.1.jar
- copied unchanged from r1408954,
ofbiz/trunk/applications/content/lib/fontbox-1.7.1.jar
ofbiz/branches/20120329_portletWidget/applications/content/lib/jempbox-1.7.1.jar
- copied unchanged from r1408954,
ofbiz/trunk/applications/content/lib/jempbox-1.7.1.jar
ofbiz/branches/20120329_portletWidget/applications/content/lib/lucene-analyzers-common-4.0.0.jar
- copied unchanged from r1408954,
ofbiz/trunk/applications/content/lib/lucene-analyzers-common-4.0.0.jar
ofbiz/branches/20120329_portletWidget/applications/content/lib/lucene-core-4.0.0.jar
- copied unchanged from r1408954,
ofbiz/trunk/applications/content/lib/lucene-core-4.0.0.jar
ofbiz/branches/20120329_portletWidget/applications/content/lib/lucene-queryparser-4.0.0.jar
- copied unchanged from r1408954,
ofbiz/trunk/applications/content/lib/lucene-queryparser-4.0.0.jar
ofbiz/branches/20120329_portletWidget/applications/content/lib/pdfbox-1.7.1.jar
- copied unchanged from r1408954,
ofbiz/trunk/applications/content/lib/pdfbox-1.7.1.jar
ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.32-catalina-ha.jar
- copied unchanged from r1408954,
ofbiz/trunk/framework/catalina/lib/tomcat-7.0.32-catalina-ha.jar
ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.32-catalina-tribes.jar
- copied unchanged from r1408954,
ofbiz/trunk/framework/catalina/lib/tomcat-7.0.32-catalina-tribes.jar
ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.32-tomcat-embed-core.jar
- copied unchanged from r1408954,
ofbiz/trunk/framework/catalina/lib/tomcat-7.0.32-tomcat-embed-core.jar
ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.32-tomcat-embed-jasper.jar
- copied unchanged from r1408954,
ofbiz/trunk/framework/catalina/lib/tomcat-7.0.32-tomcat-embed-jasper.jar
ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.32-tomcat-embed-logging-log4j.jar
- copied unchanged from r1408954,
ofbiz/trunk/framework/catalina/lib/tomcat-7.0.32-tomcat-embed-logging-log4j.jar
ofbiz/branches/20120329_portletWidget/framework/common/data/GeoData_JP.xml
- copied unchanged from r1408954,
ofbiz/trunk/framework/common/data/GeoData_JP.xml
ofbiz/branches/20120329_portletWidget/themes/flatgrey/build.xml
- copied unchanged from r1408954, ofbiz/trunk/themes/flatgrey/build.xml
ofbiz/branches/20120329_portletWidget/themes/flatgrey/webapp/flatgrey/images/ajax-loader.gif
- copied unchanged from r1408954,
ofbiz/trunk/themes/flatgrey/webapp/flatgrey/images/ajax-loader.gif
ofbiz/branches/20120329_portletWidget/themes/flatgrey/webapp/flatgrey/images/spinner.gif
- copied unchanged from r1408954,
ofbiz/trunk/themes/flatgrey/webapp/flatgrey/images/spinner.gif
Removed:
ofbiz/branches/20120329_portletWidget/applications/content/lib/fontbox-1.4.0.jar
ofbiz/branches/20120329_portletWidget/applications/content/lib/jempbox-1.4.0.jar
ofbiz/branches/20120329_portletWidget/applications/content/lib/lucene-core-3.6.1.jar
ofbiz/branches/20120329_portletWidget/applications/content/lib/pdfbox-1.4.0.jar
ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.30-catalina-ha.jar
ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.30-catalina-tribes.jar
ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.30-tomcat-embed-core.jar
ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.30-tomcat-embed-jasper.jar
ofbiz/branches/20120329_portletWidget/framework/catalina/lib/tomcat-7.0.30-tomcat-embed-logging-log4j.jar
Modified:
ofbiz/branches/20120329_portletWidget/ (props changed)
ofbiz/branches/20120329_portletWidget/.classpath
ofbiz/branches/20120329_portletWidget/LICENSE
ofbiz/branches/20120329_portletWidget/applications/accounting/config/AccountingEntityLabels.xml
ofbiz/branches/20120329_portletWidget/applications/accounting/config/AccountingErrorUiLabels.xml
ofbiz/branches/20120329_portletWidget/applications/accounting/config/AccountingUiLabels.xml
ofbiz/branches/20120329_portletWidget/applications/accounting/entitydef/entitymodel.xml
ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java
ofbiz/branches/20120329_portletWidget/applications/commonext/config/CommonExtUiLabels.xml
ofbiz/branches/20120329_portletWidget/applications/commonext/config/SetupUiLabels.xml
ofbiz/branches/20120329_portletWidget/applications/content/config/ContentEntityLabels.xml
ofbiz/branches/20120329_portletWidget/applications/content/config/ContentErrorUiLabels.xml
ofbiz/branches/20120329_portletWidget/applications/content/config/ContentUiLabels.xml
ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/search/ContentDocument.java
ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/search/DataResourceDocument.java
ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/search/SearchWorker.java
ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/test/LuceneTests.java
ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/actions/cms/Search.groovy
ofbiz/branches/20120329_portletWidget/applications/humanres/config/HumanResEntityLabels.xml
ofbiz/branches/20120329_portletWidget/applications/humanres/config/HumanResUiLabels.xml
ofbiz/branches/20120329_portletWidget/applications/manufacturing/config/ManufacturingEntityLabels.xml
ofbiz/branches/20120329_portletWidget/applications/manufacturing/config/ManufacturingReportsUiLabels.xml
ofbiz/branches/20120329_portletWidget/applications/manufacturing/config/ManufacturingUiLabels.xml
ofbiz/branches/20120329_portletWidget/applications/marketing/config/MarketingEntityLabels.xml
ofbiz/branches/20120329_portletWidget/applications/marketing/config/MarketingUiLabels.xml
ofbiz/branches/20120329_portletWidget/applications/order/config/OrderEntityLabels.xml
ofbiz/branches/20120329_portletWidget/applications/order/config/OrderUiLabels.xml
ofbiz/branches/20120329_portletWidget/applications/order/entitydef/entitymodel.xml
ofbiz/branches/20120329_portletWidget/applications/order/script/org/ofbiz/order/test/ShoppingCartTests.xml
ofbiz/branches/20120329_portletWidget/applications/order/src/org/ofbiz/order/order/OrderServices.java
ofbiz/branches/20120329_portletWidget/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java
ofbiz/branches/20120329_portletWidget/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java
ofbiz/branches/20120329_portletWidget/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
ofbiz/branches/20120329_portletWidget/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
ofbiz/branches/20120329_portletWidget/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java
ofbiz/branches/20120329_portletWidget/applications/party/config/PartyEntityLabels.xml
ofbiz/branches/20120329_portletWidget/applications/party/config/PartyErrorUiLabels.xml
ofbiz/branches/20120329_portletWidget/applications/party/config/PartyUiLabels.xml
ofbiz/branches/20120329_portletWidget/applications/party/entitydef/entitymodel.xml
ofbiz/branches/20120329_portletWidget/applications/product/config/ProductEntityLabels.xml
ofbiz/branches/20120329_portletWidget/applications/product/config/ProductErrorUiLabels.xml
ofbiz/branches/20120329_portletWidget/applications/product/config/ProductUiLabels.xml
ofbiz/branches/20120329_portletWidget/applications/product/entitydef/entitymodel_shipment.xml
ofbiz/branches/20120329_portletWidget/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml
ofbiz/branches/20120329_portletWidget/applications/workeffort/config/WorkEffortEntityLabels.xml
ofbiz/branches/20120329_portletWidget/applications/workeffort/config/WorkEffortUiLabels.xml
ofbiz/branches/20120329_portletWidget/build.xml
ofbiz/branches/20120329_portletWidget/framework/base/config/DateTimeLabels.xml
ofbiz/branches/20120329_portletWidget/framework/bi/config/BiUiLabels.xml
ofbiz/branches/20120329_portletWidget/framework/common/config/CommonEntityLabels.xml
ofbiz/branches/20120329_portletWidget/framework/common/config/CommonErrorUiLabels.xml
ofbiz/branches/20120329_portletWidget/framework/common/config/CommonHelpUiLabels.xml
ofbiz/branches/20120329_portletWidget/framework/common/config/CommonPortalEntityLabels.xml
ofbiz/branches/20120329_portletWidget/framework/common/config/CommonUiLabels.xml
ofbiz/branches/20120329_portletWidget/framework/common/config/PrefErrorUiLabels.xml
ofbiz/branches/20120329_portletWidget/framework/common/config/SecurityextUiLabels.xml
ofbiz/branches/20120329_portletWidget/framework/common/config/TemporalExpressionUiLabels.xml
ofbiz/branches/20120329_portletWidget/framework/common/ofbiz-component.xml
ofbiz/branches/20120329_portletWidget/framework/minilang/config/DefaultMessages.xml
ofbiz/branches/20120329_portletWidget/framework/security/config/SecurityEntityLabels.xml
ofbiz/branches/20120329_portletWidget/framework/service/config/ServiceErrorUiLabels.xml
ofbiz/branches/20120329_portletWidget/framework/service/src/org/ofbiz/service/engine/EntityAutoEngine.java
ofbiz/branches/20120329_portletWidget/framework/webapp/config/WebappEntityLabels.xml
ofbiz/branches/20120329_portletWidget/framework/webapp/config/WebappUiLabels.xml
ofbiz/branches/20120329_portletWidget/framework/webtools/config/WebtoolsErrorUiLabels.xml
ofbiz/branches/20120329_portletWidget/framework/webtools/config/WebtoolsUiLabels.xml
ofbiz/branches/20120329_portletWidget/framework/webtools/webapp/webtools/WEB-INF/actions/entity/XmlDsDump.groovy
ofbiz/branches/20120329_portletWidget/framework/widget/config/conditional.xml
ofbiz/branches/20120329_portletWidget/framework/widget/dtd/widget-form.xsd
ofbiz/branches/20120329_portletWidget/framework/widget/dtd/widget-menu.xsd
ofbiz/branches/20120329_portletWidget/framework/widget/dtd/widget-screen.xsd
ofbiz/branches/20120329_portletWidget/framework/widget/dtd/widget-tree.xsd
ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/config/IsMgrUiLabels.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/birt/config/BirtUiLabels.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java
ofbiz/branches/20120329_portletWidget/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java
ofbiz/branches/20120329_portletWidget/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java
ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java
ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/config/EcommerceUiLabels.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/content/Search.groovy
ofbiz/branches/20120329_portletWidget/specialpurpose/example/config/ExampleEntityLabels.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/example/config/ExampleHelpUiLabels.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/example/config/ExampleUiLabels.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/googlebase/config/GoogleBaseUiLabels.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java
ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/config/MyPortalUiLabels.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/pos/config/PosUiLabels.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java
ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/config/WebPosUiLabels.xml
ofbiz/branches/20120329_portletWidget/themes/flatgrey/data/FlatGreyThemeData.xml
ofbiz/branches/20120329_portletWidget/themes/flatgrey/webapp/flatgrey/javascript.css
Propchange: ofbiz/branches/20120329_portletWidget/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1401977-1408954
Modified: ofbiz/branches/20120329_portletWidget/.classpath
URL:
http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/.classpath?rev=1408976&r1=1408975&r2=1408976&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/.classpath (original)
+++ ofbiz/branches/20120329_portletWidget/.classpath Tue Nov 13 21:47:18 2012
@@ -2,10 +2,12 @@
<classpath>
<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib"
path="applications/content/lib/fontbox-1.4.0.jar"/>
- <classpathentry kind="lib"
path="applications/content/lib/jempbox-1.4.0.jar"/>
- <classpathentry kind="lib"
path="applications/content/lib/lucene-core-3.6.1.jar"/>
- <classpathentry kind="lib"
path="applications/content/lib/pdfbox-1.4.0.jar"/>
+ <classpathentry kind="lib"
path="applications/content/lib/fontbox-1.7.1.jar"/>
+ <classpathentry kind="lib"
path="applications/content/lib/jempbox-1.7.1.jar"/>
+ <classpathentry kind="lib"
path="applications/content/lib/lucene-analyzers-common-4.0.0.jar"/>
+ <classpathentry kind="lib"
path="applications/content/lib/lucene-core-4.0.0.jar"/>
+ <classpathentry kind="lib"
path="applications/content/lib/lucene-queryparser-4.0.0.jar"/>
+ <classpathentry kind="lib"
path="applications/content/lib/pdfbox-1.7.1.jar"/>
<classpathentry kind="lib"
path="applications/content/lib/dom4j-1.6.1.jar"/>
<classpathentry kind="lib"
path="applications/content/lib/poi-3.8-20120326.jar"/>
<classpathentry kind="lib"
path="applications/content/lib/poi-ooxml-3.8-20120326.jar"/>
@@ -108,11 +110,11 @@
<classpathentry kind="lib"
path="specialpurpose/birt/lib/org.eclipse.birt.runtime_3.7.2.v20120214-1408.jar"/>
<classpathentry kind="lib"
path="specialpurpose/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.30-catalina-ha.jar"/>
- <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-7.0.30-catalina-tribes.jar"/>
- <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-7.0.30-tomcat-embed-core.jar"/>
- <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-7.0.30-tomcat-embed-jasper.jar"/>
- <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-7.0.30-tomcat-embed-logging-log4j.jar"/>
+ <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-7.0.32-catalina-ha.jar"/>
+ <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-7.0.32-catalina-tribes.jar"/>
+ <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-7.0.32-tomcat-embed-core.jar"/>
+ <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-7.0.32-tomcat-embed-jasper.jar"/>
+ <classpathentry kind="lib"
path="framework/catalina/lib/tomcat-7.0.32-tomcat-embed-logging-log4j.jar"/>
<classpathentry kind="lib"
path="framework/entity/lib/commons-dbcp-1.4.jar"/>
<classpathentry kind="lib"
path="framework/geronimo/lib/geronimo-connector-2.1.1.jar"/>
<classpathentry kind="lib"
path="framework/geronimo/lib/geronimo-transaction-2.1.1.jar"/>
Modified: ofbiz/branches/20120329_portletWidget/LICENSE
URL:
http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/LICENSE?rev=1408976&r1=1408975&r2=1408976&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/LICENSE (original)
+++ ofbiz/branches/20120329_portletWidget/LICENSE Tue Nov 13 21:47:18 2012
@@ -74,11 +74,11 @@ ofbiz/trunk/framework/base/lib/scripting
ofbiz/trunk/framework/base/lib/xmlrpc-client-3.1.2.jar
ofbiz/trunk/framework/base/lib/xmlrpc-common-3.1.2.jar
ofbiz/trunk/framework/base/lib/xmlrpc-server-3.1.2.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.30-catalina-ha.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.30-catalina-tribes.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.30-tomcat-embed-core.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.30-tomcat-embed-jasper.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.30-tomcat-embed-logging-log4j.jar
+ofbiz/framework/catalina/lib/tomcat-7.0.32-catalina-ha.jar
+ofbiz/framework/catalina/lib/tomcat-7.0.32-catalina-tribes.jar
+ofbiz/framework/catalina/lib/tomcat-7.0.32-tomcat-embed-core.jar
+ofbiz/framework/catalina/lib/tomcat-7.0.32-tomcat-embed-jasper.jar
+ofbiz/framework/catalina/lib/tomcat-7.0.32-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
@@ -102,10 +102,12 @@ ofbiz/trunk/framework/webapp/lib/seriali
ofbiz/trunk/framework/webapp/lib/xalan-2.7.1.jar
ofbiz/trunk/framework/geronimo/lib/geronimo-connector-2.1.1.jar
ofbiz/trunk/framework/geronimo/lib/geronimo-transaction-2.1.1.jar
-ofbiz/trunk/applications/content/lib/fontbox-1.4.0.jar
-ofbiz/trunk/applications/content/lib/jempbox-1.4.0.jar
-ofbiz/trunk/applications/content/lib/lucene-core-3.6.1.jar
-ofbiz/trunk/applications/content/lib/pdfbox-1.4.0.jar
+ofbiz/trunk/applications/content/lib/fontbox-1.7.1.jar
+ofbiz/trunk/applications/content/lib/jempbox-1.7.1.jar
+ofbiz/trunk/applications/content/lib/lucene-analyzers-common-4.0.0.jar
+ofbiz/trunk/applications/content/lib/lucene-core-4.0.0.jar
+ofbiz/trunk/applications/content/lib/lucene-queryparser-4.0.0.jar
+ofbiz/trunk/applications/content/lib/pdfbox-1.7.1.jar
ofbiz/trunk/applications/content/lib/poi-3.8-20120326.jar
ofbiz/trunk/applications/content/lib/poi-ooxml-3.8-20120326.jar
ofbiz/trunk/applications/content/lib/poi-ooxml-schemas-3.8-20120326.jar
