Permalink
Browse files

Merging 1210493:1305499 to keep updated from trunk

  • Loading branch information...
2 parents 87c6430 + a28791e commit 7f752750aab86fa04fd5464383b77ce8dcc7d6f1 Erwan de Ferrieres committed Mar 26, 2012
Showing 1,146 changed files with 30,558 additions and 13,845 deletions.
View
Oops, something went wrong.
View
@@ -1,57 +1,11 @@
-tools/build
-applications/accounting/build/
-applications/content/build/
-applications/content/index/
-applications/humanres/build/
-applications/manufacturing/build/
-applications/marketing/build/
-applications/order/build/
-applications/party/build/
-applications/product/build/
-applications/securityext/build/
-applications/workeffort/build/
-bin/
-framework/appserver/build/
-framework/base/build/
+applications/*/build
+framework/*/build
framework/base/lib/cobertura-*.jar
-framework/bi/build/
-framework/birt/build/
-framework/catalina/build/
-framework/common/build/
-framework/datafile/build/
-framework/entity/build/
framework/entity/lib/jdbc/postgresql-*.jar
-framework/entityext/build/
-framework/example/build/
-framework/geronimo/build/
-framework/guiapp/build/
-framework/jetty/build/
-framework/minilang/build/
-framework/security/build/
-framework/service/build/
-framework/sql/build/
-framework/start/build/
-framework/testtools/build/
-framework/webapp/build/
-framework/webslinger/build/
-framework/webslinger/websites/webslinger/Var/
-framework/webtools/build/
-framework/widget/build/
-specialpurpose/assetmaint/build/
-specialpurpose/crowd/build/
-specialpurpose/ebay/build/
-specialpurpose/ebaystore/build/
-specialpurpose/ecommerce/build/
-specialpurpose/googlebase/build/
-specialpurpose/googlecheckout/build/
-specialpurpose/hhfacility/build/
-specialpurpose/ldap/build/
-specialpurpose/oagis/build/
-specialpurpose/pos/build/
-specialpurpose/projectmgr/build/
-specialpurpose/webpos/build/
-specialpurpose/scrum/build/
-specialpurpose/shark/build/
+hot-deploy/*/build
+specialpurpose/*/build
+applications/content/index/
+bin/
ofbiz.jar
changelog
runtime/svninfo.ftl
@@ -64,6 +18,7 @@ runtime/logs/*.log*
runtime/logs/*.html*
runtime/logs/test-results/*
runtime/data/derby/*
+runtime/data/jcr/*
runtime/data/utilcache.*
runtime/catalina/work/*
runtime/tempfiles/*
@@ -88,3 +43,7 @@ debian/stamps/
debian/orig-work
.pc
.DS_Store
+.idea
+*.iml
+*~
+*#
View
Oops, something went wrong.
View
@@ -113,7 +113,6 @@ on the old Undersun SVN server in the specialized/libraries component directory.
TO BUILD comment out excludes:
framework/webapp/build.xml:org/ofbiz/webapp/view/JasperReportsPdfViewHandler.java,org/ofbiz/webapp/view/JasperReportsXmlViewHandler.java
applications/content/build.xml:org/ofbiz/content/report/JREntityListIteratorDataSource.java,org/ofbiz/content/report/JRMapCollectionDataSource.java
- Also upgrade the itext2.0.1.jar to itext.2.1.7.jar (this will however break the birt report generator.)
- JIMI (used by FOP ):
http://java.sun.com/products/jimi
View
@@ -1,25 +1,36 @@
Welcome to Apache OFBiz!
-If you have a release build all you need to run OFBiz is a
+All you need to run OFBiz is a
1.6 (version 6) JDK (not just the JRE, the full JDK).
http://java.sun.com/javase/downloads/index.jsp
-However if you have downloaded ofbiz from SVN then you should
-load the demo data (strongly advised) with the following command
-on the command line: (being in the OFbiz directory)
+You can load the demo data (strongly advised) with the following command
+on the command line: (being in the OFBiz directory)
-linux: ./ant run-install
-windows: ant run-install
+linux/unix/osx:
+./ant run-install
+
+windows:
+ant run-install
Once that is properly setup just run the executable jar file
that comes with OFBiz, which is ofbiz.jar. To do this on the
command line you would run:
java -Xms128M -Xmx512M -XX:MaxPermSize=128m -jar ofbiz.jar
-Even better use the startup scripts for Windows and Unix-based
-operating systems, namely startofbiz.bat and startofbiz.sh.
+or
+
+linux/unix/osx:
+./ant run
+
+windows:
+ant run
+
+You will also find several platform dependent startup scripts in the "tools" folder
+(for Windows and Unix-based operating systems, the startup scripts are startofbiz.bat
+and startofbiz.sh).
Once OFBiz starts, you can look at the demo storefront at:
http://localhost:8080/ecommerce
View
@@ -19,5 +19,5 @@ REM # under the License.
REM #####################################################################
ECHO ON
-"%JAVA_HOME%\bin\java" -jar framework/base/lib/ant-launcher-1.7.1.jar -lib framework/base/lib/ant %1 %2 %3 %4 %5 %6
+"%JAVA_HOME%\bin\java" -jar framework/base/lib/ant-launcher-1.8.2.jar -lib framework/base/lib/ant %1 %2 %3 %4 %5 %6
@@ -3919,6 +3919,30 @@
<value xml:lang="zh">供应商预付款</value>
<value xml:lang="zh_TW">供應商預付款</value>
</property>
+ <property key="RateType.description.AVERAGE_PAY_RATE">
+ <value xml:lang="en">Average Pay Rate</value>
+ <value xml:lang="fr">Prix moyen</value>
+ </property>
+ <property key="RateType.description.DISCOUNTED">
+ <value xml:lang="en">Discounted Rate</value>
+ <value xml:lang="fr">Réduit</value>
+ </property>
+ <property key="RateType.description.HIGH_PAY_RATE">
+ <value xml:lang="en">Highest Pay Rate</value>
+ <value xml:lang="fr">Prix haut</value>
+ </property>
+ <property key="RateType.description.LOW_PAY_RATE">
+ <value xml:lang="en">Lowest Pay Rate</value>
+ <value xml:lang="fr">Prix bas</value>
+ </property>
+ <property key="RateType.description.OVERTIME">
+ <value xml:lang="en">Overtime Rate</value>
+ <value xml:lang="fr">Majoré</value>
+ </property>
+ <property key="RateType.description.STANDARD">
+ <value xml:lang="en">Standard Rate</value>
+ <value xml:lang="fr">Standard</value>
+ </property>
<property key="TaxAuthorityAssocType.description.COLLECT_AGENT">
<value xml:lang="en">Collection Agent</value>
<value xml:lang="fr">Agent percepteur</value>
Oops, something went wrong.

0 comments on commit 7f75275

Please sign in to comment.