Propchange: ofbiz/branches/20111205EmailHandling/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Mon Mar 26 20:56:02 2012 @@ -8,3 +8,4 @@ bin .settings .project changelog +.idea Propchange: ofbiz/branches/20111205EmailHandling/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1210494-1305499 Merged /ofbiz/branches/jackrabbit20100709:r962442-1231517 Modified: ofbiz/branches/20111205EmailHandling/.classpath URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/.classpath?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/.classpath (original) +++ ofbiz/branches/20111205EmailHandling/.classpath Mon Mar 26 20:56:02 2012 @@ -1,25 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="GROOVY_SUPPORT" exported="true"/> + <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.0.3.jar"/> - <classpathentry kind="lib" path="applications/content/lib/metadata-extractor-2.4.0-beta-1.jar"/> + <classpathentry kind="lib" path="applications/content/lib/lucene-core-3.5.0.jar"/> <classpathentry kind="lib" path="applications/content/lib/pdfbox-1.4.0.jar"/> - <classpathentry kind="lib" path="applications/content/lib/poi-3.7.jar"/> - <classpathentry kind="lib" path="applications/content/lib/poi-ooxml-3.7.jar"/> - <classpathentry kind="lib" path="applications/content/lib/poi-scratchpad-3.7.jar"/> - <classpathentry kind="lib" path="applications/content/lib/tika-core-0.9.jar"/> - <classpathentry kind="lib" path="applications/content/lib/tika-parsers-0.9.jar"/> + <classpathentry kind="lib" path="applications/content/lib/dom4j-1.6.1.jar"/> + <classpathentry kind="lib" path="applications/content/lib/poi-3.8-beta5-20111217.jar"/> + <classpathentry kind="lib" path="applications/content/lib/poi-ooxml-3.8-beta5-20111217.jar"/> + <classpathentry kind="lib" path="applications/content/lib/poi-ooxml-schemas-3.8-beta5-20111217.jar"/> + <classpathentry kind="lib" path="applications/content/lib/poi-scratchpad-3.8-beta5-20111217.jar"/> <classpathentry kind="lib" path="applications/product/lib/watermarker-0.0.4.jar"/> <classpathentry kind="lib" path="applications/product/lib/dozer-4.2.1.jar"/> - <classpathentry kind="lib" path="framework/base/lib/ant-1.7.1.jar"/> - <classpathentry kind="lib" path="framework/base/lib/ant-junit-1.7.1.jar"/> - <classpathentry kind="lib" path="framework/base/lib/ant-launcher-1.7.1.jar"/> - <classpathentry kind="lib" path="framework/base/lib/ant-trax-1.7.1.jar"/> - <classpathentry kind="lib" path="framework/base/lib/ant/ant-apache-bsf-1.7.1.jar"/> - <classpathentry kind="lib" path="framework/base/lib/ant/ant-nodeps-1.7.1.jar"/> + <classpathentry kind="lib" path="framework/base/lib/ant-1.8.2.jar"/> + <classpathentry kind="lib" path="framework/base/lib/ant-junit-1.8.2.jar"/> + <classpathentry kind="lib" path="framework/base/lib/ant-launcher-1.8.2.jar"/> + <classpathentry kind="lib" path="framework/base/lib/ant-trax-1.8.0.jar"/> + <classpathentry kind="lib" path="framework/base/lib/ant/ant-apache-bsf-1.8.2.jar"/> + <classpathentry kind="lib" path="framework/base/lib/ant/ant-nodeps-1.8.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/antisamy-bin.1.2.jar"/> <classpathentry kind="lib" path="framework/base/lib/avalon-framework-4.2.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/avalon-util-exception-1.0.0.jar"/> @@ -39,13 +38,14 @@ <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"/> <classpathentry kind="lib" path="framework/base/lib/juel-2.2.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/junit.jar"/> <classpathentry kind="lib" path="framework/base/lib/junitperf.jar"/> - <classpathentry kind="lib" path="framework/base/lib/log4j-1.2.15.jar"/> + <classpathentry kind="lib" path="framework/base/lib/log4j-1.2.16.jar"/> <classpathentry kind="lib" path="framework/base/lib/mail.jar"/> <classpathentry kind="lib" path="framework/base/lib/mx4j-3.0.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/mx4j-remote-3.0.1.jar"/> @@ -53,6 +53,8 @@ <classpathentry kind="lib" path="framework/base/lib/owasp-esapi-full-java-1.4.jar"/> <classpathentry kind="lib" path="framework/base/lib/resolver-2.9.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/serializer-2.9.1.jar"/> + <classpathentry kind="lib" path="framework/base/lib/slf4j-api-1.6.4.jar"/> + <classpathentry kind="lib" path="framework/base/lib/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"/> @@ -73,7 +75,7 @@ <classpathentry kind="lib" path="framework/base/lib/commons/commons-discovery-0.4.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-el-1.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-fileupload-1.2.2.jar"/> - <classpathentry kind="lib" path="framework/base/lib/commons/commons-io-1.3.1.jar"/> + <classpathentry kind="lib" path="framework/base/lib/commons/commons-io-1.4.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-lang-2.4.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-logging-1.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-modeler-2.0.jar"/> @@ -90,10 +92,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.22.annotations-api.jar"/> - <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-7.0.22.el-api.jar"/> - <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-7.0.22.jsp-api.jar"/> - <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-7.0.22.servlet-api.jar"/> + <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-7.0.26.annotations-api.jar"/> + <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-7.0.26.el-api.jar"/> + <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-7.0.26.jsp-api.jar"/> + <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-7.0.26.servlet-api.jar"/> <classpathentry kind="lib" path="framework/base/lib/scripting/antlr-2.7.6.jar"/> <classpathentry kind="lib" path="framework/base/lib/scripting/asm-3.2.jar"/> <classpathentry kind="lib" path="framework/base/lib/scripting/asm-analysis-3.2.jar"/> @@ -106,48 +108,51 @@ <classpathentry kind="lib" path="framework/base/lib/scripting/jython-nooro.jar"/> <classpathentry kind="lib" path="framework/base/lib/scripting/jansi-1.2.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/scripting/jline-0.9.94.jar"/> - <classpathentry kind="lib" path="framework/birt/lib/chartengineapi.jar"/> - <classpathentry kind="lib" path="framework/birt/lib/chartitemapi.jar"/> - <classpathentry kind="lib" path="framework/birt/lib/coreapi.jar"/> - <classpathentry kind="lib" path="framework/birt/lib/crosstabcoreapi.jar"/> - <classpathentry kind="lib" path="framework/birt/lib/dataadapterapi.jar"/> - <classpathentry kind="lib" path="framework/birt/lib/dataaggregationapi.jar"/> - <classpathentry kind="lib" path="framework/birt/lib/dataextraction.jar"/> - <classpathentry kind="lib" path="framework/birt/lib/dteapi.jar"/> - <classpathentry kind="lib" path="framework/birt/lib/emitterconfig.jar"/> - <classpathentry kind="lib" path="framework/birt/lib/engineapi.jar"/> - <classpathentry kind="lib" path="framework/birt/lib/jaxrpc.jar"/> - <classpathentry kind="lib" path="framework/birt/lib/modelapi.jar"/> - <classpathentry kind="lib" path="framework/birt/lib/modelodaapi.jar"/> - <classpathentry kind="lib" path="framework/birt/lib/odadesignapi.jar"/> - <classpathentry kind="lib" path="framework/birt/lib/saaj.jar"/> - <classpathentry kind="lib" path="framework/birt/lib/scriptapi.jar"/> + <classpathentry kind="lib" path="framework/birt/lib/org.eclipse.birt.runtime_3.7.2.v20120214-1408.jar"/> <classpathentry kind="lib" path="framework/birt/lib/viewservlets.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/ecj-3.7.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22-tomcat-juli-adapters.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22-tomcat-juli.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22.catalina-ant.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22.catalina-ha.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22.catalina-tribes.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22.catalina.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22.jasper-el.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22.jasper.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22.tomcat-coyote.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22.tomcat-dbcp.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22.tomcat-api.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22.tomcat-util.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/ecj-3.7.1.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.26.tomcat-juli-adapters.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.26.tomcat-juli.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.26.catalina-ant.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.26.catalina-ha.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.26.catalina-tribes.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.26.catalina.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.26.jasper-el.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.26.jasper.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.26.tomcat-coyote.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.26.tomcat-dbcp.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.26.tomcat-api.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.26.tomcat-util.jar"/> <classpathentry kind="lib" path="framework/entity/lib/commons-dbcp-1.3-20091113-r835956.jar"/> <classpathentry kind="lib" path="framework/entity/lib/ofbiz-minerva.jar"/> <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-connector-2.1.1.jar"/> <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-transaction-2.1.1.jar"/> <classpathentry kind="lib" path="framework/guiapp/lib/XuiCoreSwing-v3.2rc2b.jar"/> <classpathentry kind="lib" path="framework/guiapp/lib/XuiOptional-v3.2rc2b.jar"/> - <classpathentry kind="lib" path="framework/jetty/lib/jasper-compiler-5.5.15.jar"/> - <classpathentry kind="lib" path="framework/jetty/lib/jasper-runtime-5.5.15.jar"/> - <classpathentry kind="lib" path="framework/jetty/lib/jetty-6.1.11.jar"/> - <classpathentry kind="lib" path="framework/jetty/lib/jetty-ajp-6.1.11.jar"/> - <classpathentry kind="lib" path="framework/jetty/lib/jetty-sslengine-6.1.11.jar"/> - <classpathentry kind="lib" path="framework/jetty/lib/jetty-util-6.1.11.jar"/> + <classpathentry kind="lib" path="framework/jcr/lib/concurrent-1.3.4.jar"/> + <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-api-2.3.3.jar"/> + <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-core-2.3.3.jar"/> + <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-jca-2.3.3.jar"/> + <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-jcr-commons-2.3.3.jar"/> + <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-spi-2.3.3.jar"/> + <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-spi-commons-2.3.3.jar"/> + <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-ocm-2.0.jar" sourcepath="/ocm"/> + <classpathentry kind="lib" path="framework/jcr/lib/jcr-2.0.jar"/> + <classpathentry kind="lib" path="framework/jetty/lib/com.sun.el-2.2.0.v201108011116.jar"/> + <classpathentry kind="lib" path="framework/jetty/lib/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar"/> + <classpathentry kind="lib" path="framework/jetty/lib/jetty-ajp-8.1.2.v20120308.jar"/> + <classpathentry kind="lib" path="framework/jetty/lib/jetty-continuation-8.1.2.v20120308.jar"/> + <classpathentry kind="lib" path="framework/jetty/lib/jetty-http-8.1.2.v20120308.jar"/> + <classpathentry kind="lib" path="framework/jetty/lib/jetty-io-8.1.2.v20120308.jar"/> + <classpathentry kind="lib" path="framework/jetty/lib/jetty-security-8.1.2.v20120308.jar"/> + <classpathentry kind="lib" path="framework/jetty/lib/jetty-server-8.1.2.v20120308.jar"/> + <classpathentry kind="lib" path="framework/jetty/lib/jetty-servlet-8.1.2.v20120308.jar"/> + <classpathentry kind="lib" path="framework/jetty/lib/jetty-util-8.1.2.v20120308.jar"/> + <classpathentry kind="lib" path="framework/jetty/lib/jetty-webapp-8.1.2.v20120308.jar"/> + <classpathentry kind="lib" path="framework/jetty/lib/jetty-xml-8.1.2.v20120308.jar"/> + <classpathentry kind="lib" path="framework/jetty/lib/org.apache.jasper.glassfish-2.2.2.v201112011158.jar"/> + <classpathentry kind="lib" path="framework/jetty/lib/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar"/> + <classpathentry kind="lib" path="framework/jetty/lib/org.eclipse.jdt.core-3.7.1.jar"/> <classpathentry kind="lib" path="framework/service/lib/axis.jar"/> <classpathentry kind="lib" path="framework/service/lib/axis-ant.jar"/> <classpathentry kind="lib" path="framework/service/lib/wsdl4j.jar"/> @@ -169,44 +174,6 @@ <classpathentry kind="lib" path="framework/webapp/lib/json-lib-2.2.3-jdk15.jar"/> <classpathentry kind="lib" path="framework/webapp/lib/rome-0.9.jar"/> <classpathentry kind="lib" path="framework/webapp/lib/velocity-1.6.1.jar"/> - <classpathentry kind="lib" path="framework/base/lib/webslinger-base-invoker-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-cache-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-collections-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-collections-arrays-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-concurrent-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-html-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-io-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-javacc-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-junit-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-lang-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-logging-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-resolver-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-util-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-base-xml-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-catalina-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-cgi-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-embryo-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-beanshell-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-bsf-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-code-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-commonsvfs-object-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-directory-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-freemarker-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-groovy-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-image-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-janino-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-jruby-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-jython-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-nutch-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-plan9-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-quercus-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-rhino-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-servlet-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-template-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-velocity-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-wiki-20091211-3897-7ab22baea4b6.jar"/> - <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-launcher-20091211-3897-7ab22baea4b6.jar"/> <classpathentry kind="lib" path="specialpurpose/googlecheckout/lib/checkout-sdk-0.8.8.jar"/> <classpathentry kind="lib" path="specialpurpose/ldap/lib/cas-server-core-3.3.jar"/> <classpathentry kind="lib" path="specialpurpose/pos/lib/jcl.jar"/> @@ -216,29 +183,30 @@ <classpathentry kind="lib" path="specialpurpose/ebaystore/lib/ebaycalls.jar"/> <classpathentry kind="lib" path="specialpurpose/ebaystore/lib/ebaysdkcore.jar"/> <classpathentry kind="lib" path="specialpurpose/ebaystore/lib/helper.jar"/> - <classpathentry kind="src" path="applications/accounting/src" excluding="org/ofbiz/accounting/thirdparty/cybersource/**|org/ofbiz/accounting/thirdparty/verisign/**|org/ofbiz/accounting/thirdparty/worldpay/**|org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java|org/ofbiz/accounting/thirdparty/orbital/**|org/ofbiz/accounting/thirdparty/securepay/**|org/ofbiz/accounting/thirdparty/ideal/**"/> - <classpathentry kind="src" path="applications/content/src" excluding="org/ofbiz/content/openoffice/|org/ofbiz/content/report/"/> + <classpathentry excluding="org/ofbiz/accounting/thirdparty/cybersource/**|org/ofbiz/accounting/thirdparty/verisign/**|org/ofbiz/accounting/thirdparty/worldpay/**|org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java|org/ofbiz/accounting/thirdparty/orbital/**|org/ofbiz/accounting/thirdparty/securepay/**|org/ofbiz/accounting/thirdparty/ideal/**" kind="src" path="applications/accounting/src"/> + <classpathentry excluding="org/ofbiz/content/openoffice/|org/ofbiz/content/report/" kind="src" path="applications/content/src"/> <classpathentry kind="src" path="applications/manufacturing/src"/> <classpathentry kind="src" path="applications/marketing/src"/> - <classpathentry kind="src" path="applications/order/src" excluding="org/ofbiz/order/thirdparty/taxware/**"/> + <classpathentry excluding="org/ofbiz/order/thirdparty/taxware/**" kind="src" path="applications/order/src"/> <classpathentry kind="src" path="applications/party/src"/> - <classpathentry kind="src" path="applications/product/src" excluding="ShipmentScaleApplet.java"/> - <classpathentry kind="src" path="applications/securityext/src" excluding="org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java"/> + <classpathentry excluding="ShipmentScaleApplet.java" kind="src" path="applications/product/src"/> + <classpathentry excluding="org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java" kind="src" path="applications/securityext/src"/> <classpathentry kind="src" path="applications/humanres/src"/> <classpathentry kind="src" path="applications/workeffort/src"/> <classpathentry kind="src" path="framework/appserver/src"/> <classpathentry kind="src" path="framework/base/build/gen-src/javacc"/> - <classpathentry kind="src" path="framework/base/src" excluding="org/ofbiz/base/config/CoberturaInstrumenter.java"/> + <classpathentry excluding="org/ofbiz/base/config/CoberturaInstrumenter.java" kind="src" path="framework/base/src"/> <classpathentry kind="src" path="framework/bi/src"/> <classpathentry kind="src" path="framework/birt/src"/> <classpathentry kind="src" path="framework/catalina/src"/> <classpathentry kind="src" path="framework/common/src"/> <classpathentry kind="src" path="framework/datafile/src"/> - <classpathentry kind="src" path="framework/entity/src" excluding="org/ofbiz/entity/connection/XaPoolConnectionFactory.java"/> + <classpathentry excluding="org/ofbiz/entity/connection/XaPoolConnectionFactory.java" kind="src" path="framework/entity/src"/> <classpathentry kind="src" path="framework/entityext/src"/> <classpathentry kind="src" path="framework/example/src"/> <classpathentry kind="src" path="framework/geronimo/src"/> <classpathentry kind="src" path="framework/guiapp/src"/> + <classpathentry kind="src" path="framework/jcr/src"/> <classpathentry kind="src" path="framework/jetty/src"/> <classpathentry kind="src" path="framework/minilang/src"/> <classpathentry kind="src" path="framework/security/src"/> @@ -246,9 +214,8 @@ <classpathentry kind="src" path="framework/sql/src"/> <classpathentry kind="src" path="framework/sql/build/gen-src/javacc"/> <classpathentry kind="src" path="framework/start/src"/> - <classpathentry kind="src" path="framework/testtools/src" excluding="org/ofbiz/testtools/seleniumxml/**"/> - <classpathentry kind="src" path="framework/webapp/src" excluding="org/ofbiz/webapp/ftl/FreeMarkerViewRenderer.java|org/ofbiz/webapp/ftl/JpCacheIncludeTransform.java|org/ofbiz/webapp/view/FopPdfViewHandler.java|org/ofbiz/webapp/view/GenericViewRenderer.java|org/ofbiz/webapp/view/JPublishViewHandler.java|org/ofbiz/webapp/view/JPublishWrapper.java|org/ofbiz/webapp/view/JasperReportsPdfViewHandler.java|org/ofbiz/webapp/view/JasperReportsXmlViewHandler.java|org/ofbiz/webapp/view/JasperReportsJXlsViewHandler.java|org/ofbiz/webapp/view/JasperReportsPoiXlsViewHandler.java"/> - <classpathentry kind="src" path="framework/webslinger/src"/> + <classpathentry excluding="org/ofbiz/testtools/seleniumxml/**" kind="src" path="framework/testtools/src"/> + <classpathentry excluding="org/ofbiz/webapp/ftl/FreeMarkerViewRenderer.java|org/ofbiz/webapp/ftl/JpCacheIncludeTransform.java|org/ofbiz/webapp/view/FopPdfViewHandler.java|org/ofbiz/webapp/view/GenericViewRenderer.java|org/ofbiz/webapp/view/JPublishViewHandler.java|org/ofbiz/webapp/view/JPublishWrapper.java|org/ofbiz/webapp/view/JasperReportsPdfViewHandler.java|org/ofbiz/webapp/view/JasperReportsXmlViewHandler.java|org/ofbiz/webapp/view/JasperReportsJXlsViewHandler.java|org/ofbiz/webapp/view/JasperReportsPoiXlsViewHandler.java" kind="src" path="framework/webapp/src"/> <classpathentry kind="src" path="framework/webtools/src"/> <classpathentry kind="src" path="framework/widget/src"/> <classpathentry kind="src" path="specialpurpose/assetmaint/src"/> @@ -262,8 +229,11 @@ <classpathentry kind="src" path="specialpurpose/oagis/src"/> <classpathentry kind="src" path="specialpurpose/pos/src"/> <classpathentry kind="src" path="specialpurpose/projectmgr/src"/> - <classpathentry kind="src" path="specialpurpose/shark/src" excluding="org/enhydra/|org/ofbiz/"/> + <classpathentry excluding="org/enhydra/|org/ofbiz/" kind="src" path="specialpurpose/shark/src"/> <classpathentry kind="src" path="specialpurpose/webpos/src"/> <classpathentry kind="src" path="specialpurpose/workflow/src"/> + <classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/> + <classpathentry kind="lib" path="framework/jcr/lib/tika-core-1.0.jar"/> + <classpathentry kind="lib" path="framework/jcr/lib/tika-parsers-1.0.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: ofbiz/branches/20111205EmailHandling/.gitignore URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/.gitignore?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/.gitignore (original) +++ ofbiz/branches/20111205EmailHandling/.gitignore Mon Mar 26 20:56:02 2012 @@ -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 +*~ +*# Modified: ofbiz/branches/20111205EmailHandling/LICENSE URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/LICENSE?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/LICENSE (original) +++ ofbiz/branches/20111205EmailHandling/LICENSE Mon Mar 26 20:56:02 2012 @@ -11,12 +11,12 @@ For additional details, see the NOTICE f http://cwiki.apache.org/confluence/display/OFBADMIN/Libraries+Included+in+OFBiz ========================================================================= The following libraries are licensed under the Apache License Version 2.0: -ofbiz/trunk/framework/base/lib/ant-launcher-1.7.1.jar -ofbiz/trunk/framework/base/lib/ant-1.7.1.jar -ofbiz/trunk/framework/base/lib/ant-junit-1.7.1.jar -ofbiz/trunk/framework/base/lib/ant-trax-1.7.1.jar -ofbiz/trunk/framework/base/lib/ant/ant-apache-bsf-1.7.1.jar -ofbiz/trunk/framework/base/lib/ant/ant-nodeps-1.7.1.jar +ofbiz/trunk/framework/base/lib/ant-launcher-1.8.2.jar +ofbiz/trunk/framework/base/lib/ant-1.8.2.jar +ofbiz/trunk/framework/base/lib/ant-junit-1.8.2.jar +ofbiz/trunk/framework/base/lib/ant-trax-1.8.0.jar +ofbiz/trunk/framework/base/lib/ant/ant-apache-bsf-1.8.2.jar +ofbiz/trunk/framework/base/lib/ant/ant-nodeps-1.8.1.jar ofbiz/trunk/framework/base/lib/avalon-framework-4.2.0.jar ofbiz/trunk/framework/base/lib/avalon-util-exception-1.0.0.jar ofbiz/trunk/framework/base/lib/batik-all-1.7.jar @@ -30,7 +30,6 @@ ofbiz/trunk/framework/base/lib/ivy-2.2.0 ofbiz/trunk/framework/base/lib/jakarta-regexp-1.5.jar ofbiz/trunk/framework/base/lib/jpim-0.1.jar ofbiz/trunk/framework/base/lib/juel-2.2.1.jar -ofbiz/trunk/framework/base/lib/log4j-1.2.15.jar ofbiz/trunk/framework/base/lib/mx4j-3.0.1.jar ofbiz/trunk/framework/base/lib/mx4j-remote-3.0.1.jar ofbiz/trunk/framework/base/lib/nekohtml.jar @@ -65,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-6.0.32-annotations-api.jar -ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.32-el-api.jar -ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.32-jsp-api.jar -ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.32-servlet-api.jar +ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-7.0.26.annotations-api.jar +ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-7.0.26.el-api.jar +ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-7.0.26.jsp-api.jar +ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-7.0.26.servlet-api.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.7.7.jar @@ -76,27 +75,24 @@ 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/trunk/framework/catalina/lib/tomcat-6.0.32-catalina-ha.jar -ofbiz/trunk/framework/catalina/lib/tomcat-6.0.32-catalina-tribes.jar -ofbiz/trunk/framework/catalina/lib/tomcat-6.0.32-catalina.jar -ofbiz/trunk/framework/catalina/lib/tomcat-6.0.32-jasper-el.jar -ofbiz/trunk/framework/catalina/lib/tomcat-6.0.32-jasper.jar -ofbiz/trunk/framework/catalina/lib/tomcat-6.0.32-tomcat-coyote.jar -ofbiz/trunk/framework/catalina/lib/tomcat-6.0.32-tomcat-dbcp.jar -ofbiz/trunk/framework/catalina/lib/tomcat-6.0.32-tomcat-juli.jar -ofbiz/trunk/framework/catalina/lib/tomcat-6.0.32-tomcat-juli-adapters.jar +ofbiz/framework/catalina/lib/tomcat-7.0.26.tomcat-util.jar +ofbiz/framework/catalina/lib/tomcat-7.0.26.tomcat-i18n-es.jar +ofbiz/framework/catalina/lib/tomcat-7.0.26.catalina-ant.jar +ofbiz/framework/catalina/lib/tomcat-7.0.26.catalina.jar +ofbiz/framework/catalina/lib/tomcat-7.0.26.jasper-el.jar +ofbiz/framework/catalina/lib/tomcat-7.0.26.tomcat-juli.jar +ofbiz/framework/catalina/lib/tomcat-7.0.26.tomcat-i18n-ja.jar +ofbiz/framework/catalina/lib/tomcat-7.0.26.catalina-tribes.jar +ofbiz/framework/catalina/lib/tomcat-7.0.26.tomcat-dbcp.jar +ofbiz/framework/catalina/lib/tomcat-7.0.26.tomcat-juli-adapters.jar +ofbiz/framework/catalina/lib/tomcat-7.0.26.tomcat-i18n-fr.jar +ofbiz/framework/catalina/lib/tomcat-7.0.26.tomcat-coyote.jar +ofbiz/framework/catalina/lib/tomcat-7.0.26.catalina-ha.jar +ofbiz/framework/catalina/lib/tomcat-7.0.26.tomcat-api.jar +ofbiz/framework/catalina/lib/tomcat-7.0.26.jasper.jar ofbiz/trunk/framework/entity/lib/commons-dbcp-1.3-20091113-r835956.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 -ofbiz/trunk/framework/jetty/lib/ant-1.6.5.jar -ofbiz/trunk/framework/jetty/lib/jasper-compiler-5.5.15.jar -ofbiz/trunk/framework/jetty/lib/jasper-compiler-jdt-5.5.15.jar -ofbiz/trunk/framework/jetty/lib/jasper-runtime-5.5.15.jar -ofbiz/trunk/framework/jetty/lib/jetty-6.1.11.jar -ofbiz/trunk/framework/jetty/lib/jetty-ajp-6.1.11.jar -ofbiz/trunk/framework/jetty/lib/jetty-sslengine-6.1.11.jar -ofbiz/trunk/framework/jetty/lib/jetty-util-6.1.11.jar -ofbiz/trunk/framework/jetty/lib/xmlParserAPIs-2.6.2.jar ofbiz/trunk/framework/service/lib/axis-ant.jar ofbiz/trunk/framework/service/lib/axis.jar ofbiz/trunk/framework/service/lib/axiom-api-1.2.9.jar @@ -118,55 +114,19 @@ 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/framework/base/lib/webslinger-base-invoker-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-base-cache-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-base-collections-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-base-collections-arrays-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-base-concurrent-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-base-html-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-base-invoker-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-base-io-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-base-javacc-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-base-junit-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-base-lang-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-base-logging-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-base-resolver-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-base-util-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-base-xml-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-catalina-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-cgi-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-embryo-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-extension-beanshell-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-extension-bsf-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-extension-code-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-extension-commonsvfs-object-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-extension-directory-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-extension-freemarker-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-extension-groovy-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-extension-image-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-extension-janino-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-extension-jruby-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-extension-jython-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-extension-nutch-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-extension-plan9-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-extension-quercus-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-extension-rhino-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-extension-servlet-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-extension-template-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-extension-velocity-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-extension-wiki-20091211-3897-7ab22baea4b6.jar -ofbiz/trunk/framework/webslinger/lib/webslinger-launcher-20091211-3897-7ab22baea4b6.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.0.3.jar -ofbiz/trunk/applications/content/lib/metadata-extractor-2.4.0.jar +ofbiz/trunk/applications/content/lib/lucene-core-3.5.0.jar ofbiz/trunk/applications/content/lib/pdfbox-1.4.0.jar +ofbiz/trunk/applications/content/lib/poi-3.8-beta5-20111217.jar +ofbiz/trunk/applications/content/lib/poi-ooxml-3.8-beta5-20111217.jar +ofbiz/trunk/applications/content/lib/poi-ooxml-schemas-3.8-beta5-20111217.jar +ofbiz/trunk/applications/content/lib/poi-scratchpad-3.8-beta5-20111217.jar ofbiz/trunk/applications/content/lib/poi-3.7.jar ofbiz/trunk/applications/content/lib/poi-ooxml-3.7.jar ofbiz/trunk/applications/content/lib/poi-scratchpad-3.7.jar -ofbiz/trunk/applications/content/lib/tika-core-0.9.jar -ofbiz/trunk/applications/content/lib/tika-parsers-0.9.jar +ofbiz/trunk/applications/content/lib/tika-core-1.0.jar +ofbiz/trunk/applications/content/lib/tika-parsers-1.0.jar ofbiz/trunk/applications/product/lib/dozer-4.2.1.jar ofbiz/trunk/applications/product/lib/watermarker-0.0.4.jar ofbiz/trunk/specialpurpose/googlecheckout/lib/checkout-sdk-0.8.8.jar @@ -495,7 +455,9 @@ The JDOM License ========================================================================= The following libraries distributed with Apache OFBiz are licensed under the BSD License: +ofbiz/trunk/applications/content/lib/dom4j-1.6.1.jar ofbiz/trunk/framework/base/lib/antisamy-bin.1.2.jar +ofbiz/trunk/framework/base/lib/bsh-engine-modified.jar 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 @@ -1271,10 +1233,10 @@ any resulting litigation. The following libraries distributed with Apache OFBiz are licensed under the MIT/X License: ofbiz/trunk/framework/base/lib/icu4j-4_4.jar +ofbiz/trunk/framework/base/lib/jcl-over-slf4j-1.6.4.jar ofbiz/trunk/framework/entity/lib/ofbiz-minerva.jar -ofbiz/trunk/framework/jetty/lib/jcl104-over-slf4j-1.3.1.jar -ofbiz/trunk/framework/jetty/lib/slf4j-api-1.3.1.jar -ofbiz/trunk/framework/jetty/lib/slf4j-log4j12-1.3.1.jar +ofbiz/trunk/framework/base/lib/slf4j-api-1.6.4.jar +ofbiz/trunk/framework/base/lib/slf4j-simple-1.6.4.jar ofbiz/trunk/framework/images/webapp/images/jquery/* ========================================================================= The MIT License @@ -2009,6 +1971,10 @@ The following library distributed with A COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL): ofbiz/trunk/framework/base/lib/juel-2.1.1.jar (contains the javax.el package) ofbiz/trunk/framework/base/lib/mail.jar +ofbiz/trunk/framework/jetty/lib/com.sun.el-2.2.0.v201108011116.jar +ofbiz/trunk/framework/jetty/lib/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar +ofbiz/trunk/framework/jetty/lib/org.apache.jasper.glassfish-2.2.2.v201112011158.jar +ofbiz/trunk/framework/jetty/lib/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar ofbiz/trunk/specialpurpose/ebaystore/lib/attributes.jar ofbiz/trunk/specialpurpose/ebaystore/lib/ebaysdkcore.jar ofbiz/trunk/specialpurpose/ebaystore/lib/helper.jar @@ -2356,122 +2322,49 @@ questions or comments regarding the usag ========================================================================= The following libraries distributed with Apache OFBiz are licensed under the Eclipse Public License - v 1.0: -ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-jasper-jdt.jar -ofbiz/trunk/framework/birt/lib/chartengineapi.jar -ofbiz/trunk/framework/birt/lib/coreapi.jar -ofbiz/trunk/framework/birt/lib/crosstabcoreapi.jar -ofbiz/trunk/framework/birt/lib/dataadapterapi.jar -ofbiz/trunk/framework/birt/lib/dataaggregationapi.jar -ofbiz/trunk/framework/birt/lib/dataextraction.jar -ofbiz/trunk/framework/birt/lib/dteapi.jar -ofbiz/trunk/framework/birt/lib/emitterconfig.jar -ofbiz/trunk/framework/birt/lib/engineapi.jar +ofbiz/trunk/framework/birt/lib/flute.jar ofbiz/trunk/framework/birt/lib/jaxrpc.jar -ofbiz/trunk/framework/birt/lib/modelapi.jar -ofbiz/trunk/framework/birt/lib/modelodaapi.jar -ofbiz/trunk/framework/birt/lib/odadesignapi.jar +ofbiz/trunk/framework/birt/lib/js.jar +ofbiz/trunk/framework/birt/lib/org.apache.xml.resolver_1.2.0.v201005080400.jar +ofbiz/trunk/framework/birt/lib/org.apache.xml.serializer_2.7.1.v201005080400.jar +ofbiz/trunk/framework/birt/lib/org.eclipse.birt.runtime_3.7.2.v20120214-1408.jar +ofbiz/trunk/framework/birt/lib/org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar +ofbiz/trunk/framework/birt/lib/org.eclipse.core.expressions_3.4.300.v20110228.jar +ofbiz/trunk/framework/birt/lib/org.eclipse.core.filesystem_1.3.100.v20110423-0524.jar +ofbiz/trunk/framework/birt/lib/org.eclipse.core.jobs_3.5.101.v20120113-1953.jar +ofbiz/trunk/framework/birt/lib/org.eclipse.core.resources_3.7.101.v20120125-1505.jar +ofbiz/trunk/framework/birt/lib/org.eclipse.core.runtime_3.7.0.v20110110.jar +ofbiz/trunk/framework/birt/lib/org.eclipse.datatools.connectivity.oda_3.3.3.v201110130935.jar +ofbiz/trunk/framework/birt/lib/org.eclipse.emf_2.6.0.v20120123-1045.jar +ofbiz/trunk/framework/birt/lib/org.eclipse.emf.common_2.7.0.v20120123-0926.jar +ofbiz/trunk/framework/birt/lib/org.eclipse.emf.ecore_2.7.0.v20120123-0926.jar +ofbiz/trunk/framework/birt/lib/org.eclipse.emf.ecore.change_2.7.1.v20120123-0926.jar +ofbiz/trunk/framework/birt/lib/org.eclipse.emf.ecore.xmi_2.7.0.v20120123-0926.jar +ofbiz/trunk/framework/birt/lib/org.eclipse.equinox.app_1.3.100.v20110321.jar +ofbiz/trunk/framework/birt/lib/org.eclipse.equinox.common_3.6.0.v20110523.jar +ofbiz/trunk/framework/birt/lib/org.eclipse.equinox.preferences_3.4.2.v20120111-2020.jar +ofbiz/trunk/framework/birt/lib/org.eclipse.equinox.registry_3.5.101.R37x_v20110810-1611.jar +ofbiz/trunk/framework/birt/lib/org.eclipse.osgi_3.7.2.v20120110-1415.jar +ofbiz/trunk/framework/birt/lib/org.eclipse.osgi.services_3.3.0.v20110513.jar +ofbiz/trunk/framework/birt/lib/org.eclipse.update.configurator_3.3.100.v20100512.jar +ofbiz/trunk/framework/birt/lib/org.w3c.css.sac_1.3.0.v200805290154.jar +ofbiz/trunk/framework/birt/lib/org.w3c.dom.smil_1.0.0.v200806040011.jar +ofbiz/trunk/framework/birt/lib/org.w3c.dom.svg_1.1.0.v201011041433.jar ofbiz/trunk/framework/birt/lib/saaj.jar -ofbiz/trunk/framework/birt/lib/scriptapi.jar +ofbiz/trunk/framework/birt/lib/Tidy.jar ofbiz/trunk/framework/birt/lib/viewservlets.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.batik.css_1.6.0.v200912221622.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.batik.util_1.6.0.v200805290154.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.batik.transcoder_1.6.0.v200805290154.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.batik.dom.svg_1.6.0.v200805290154.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.batik.bridge_1.6.0.v200912221622.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.batik.dom_1.6.0.v200912221622.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.xml.resolver_1.2.0.v201005080400.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.apache.xml.serializer_2.7.1.v201005080400.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.api_1.0.0.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.chart.device.extension_2.6.0.v20100521.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.chart.device.svg_2.6.0.v20100527.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.chart.engine_2.6.0.v20100607.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.chart.engine.extension_2.6.0.v20100601.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.chart.reportitem_2.6.0.v20100604.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.core_2.6.0.v20100526.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.core.script.function_2.6.0.v20100524.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.data_2.6.0.v20100524.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.data.aggregation_2.6.0.v20100524.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.data.adapter_2.6.0.v20100525.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.data.oda.jdbc.dbprofile_2.6.0.v20100524.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb_2.6.0.v20100524.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.data.oda.xml_2.6.0.v20100524.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.engine_2.6.0.v20100609.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.engine.dataextraction_2.5.2.v20100115.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.engine.dataextraction.csv_2.5.2.v20100115.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.engine.emitter.config_2.6.0.v20100304.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.engine.emitter.html.config_2.6.0.v20100304.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.engine.emitter.pdf_2.6.0.v20100513.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.engine.emitter.postscript_2.6.0.v20100526.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.engine.emitter.ppt_2.6.0.v20100429.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.engine.emitter.prototype.excel_2.6.0.v20100601.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.engine.emitter.wpml_2.6.0.v20100520.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.item.crosstab.core_2.6.0.v20100531.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.model_2.6.0.v20100603.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.report.model.adapter.oda_2.6.0.v20100528.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.core.contenttype_3.4.100.v20100505-1235.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.core.expressions_3.4.200.v20100505.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.core.filesystem_1.3.0.v20100526-0737.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.core.jobs_3.5.0.v20100515.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.core.resources_3.6.0.v20100526-0737.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.core.runtime_3.6.0.v20100505.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.core.runtime.compatibility_3.2.100.v20100505.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20100517.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.connectivity_1.2.0.v201005270426.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.connectivity.apache.derby_1.0.100.v200906020900.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.connectivity.apache.derby.dbdefinition_1.0.2.v200906020900.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.connectivity.console.profile_1.0.0.v200906020553.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC_1.0.1.v200906111145.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.connectivity.db.generic_1.0.1.v200906020900.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.connectivity.oda_3.3.0.v201004270801.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.connectivity.oda.consumer_3.2.3.v201005281018.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.connectivity.oda.design_3.3.0.v201004020648.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.connectivity.oda.flatfile_3.1.1.v201001131420.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.connectivity.oda.profile_3.2.3.v201005281018.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.connectivity.sqm.core_1.2.0.v201005270630.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.hsqldb_1.0.0.v200906020900.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.hsqldb.dbdefinition_1.0.0.v200906020900.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.ibm.db2.iseries_1.0.2.v201005211230.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.ibm.db2.iseries.dbdefinition_1.0.3.v200906020900.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.ibm.db2.luw_1.0.2.v201005211230.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.ibm.db2.luw.dbdefinition_1.0.4.v201005211215.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.ibm.db2.zseries_1.0.2.v201005211230.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.ibm.db2.zseries.dbdefinition_1.0.4.v201005211230.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.ibm.informix_1.0.1.v201005211230.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.ibm.informix.dbdefinition_1.0.4.v201005211230.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.msft.sqlserver_1.0.1.v201001180222.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.msft.sqlserver.dbdefinition_1.0.0.v201004211630.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.mysql_1.0.2.v201002041100.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.mysql.dbdefinition_1.0.4.v200906020900.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.oda.ws_1.2.2.v201001131420.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.oda.xml_1.2.1.v201001151620.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.oracle_1.0.0.v200906020900.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.oracle.dbdefinition_1.0.101.v201004211630.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.postgresql_1.0.1.v200906020900.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.postgresql.dbdefinition_1.0.1.v200906020900.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.sap.maxdb_1.0.0.v200906020900.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.enablement.sap.maxdb.dbdefinition_1.0.0.v200906020900.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.modelbase.dbdefinition_1.0.2.v201002130228.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.modelbase.derby_1.0.0.v201002161452.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.datatools.modelbase.sql_1.0.4.v201002250945.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.emf_2.6.0.v20100607-0756.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.emf.common_2.6.0.v20100607-0756.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.emf.ecore_2.6.0.v20100607-0756.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.emf.ecore.change_2.5.0.v20100521-1846.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.emf.ecore.xmi_2.5.0.v20100521-1846.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.equinox.app_1.3.0.v20100512.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.equinox.common_3.6.0.v20100503.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.equinox.preferences_3.3.0.v20100503.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.equinox.registry_3.5.0.v20100503.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.osgi_3.6.0.v20100517.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.osgi.services_3.2.100.v20100503.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.update.configurator_3.3.100.v20100512.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.w3c.css.sac_1.3.0.v200805290154.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.w3c.dom.smil_1.0.0.v200806040011.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.w3c.dom.svg_1.1.0.v200806040011.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.core.runtime.compatibility.registry_3.3.0.v20100520-1800/runtime_registry_compatibility.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.mozilla.rhino_1.7.1.v20090608/lib/js.jar -ofbiz/trunk/framework/birt/lib/platform/plugins/org.w3c.sac_1.3.0.v20090608/lib/flute.jar -ofbiz/trunk/framework/catalina/lib/ecj-3.3.1.jar +ofbiz/trunk/framework/catalina/lib/ecj-3.7.1.jar +ofbiz/trunk/framework/jetty/lib/jetty-ajp-8.1.2.v20120308.jar +ofbiz/trunk/framework/jetty/lib/jetty-continuation-8.1.2.v20120308.jar +ofbiz/trunk/framework/jetty/lib/jetty-http-8.1.2.v20120308.jar +ofbiz/trunk/framework/jetty/lib/jetty-io-8.1.2.v20120308.jar +ofbiz/trunk/framework/jetty/lib/jetty-security-8.1.2.v20120308.jar +ofbiz/trunk/framework/jetty/lib/jetty-server-8.1.2.v20120308.jar +ofbiz/trunk/framework/jetty/lib/jetty-servlet-8.1.2.v20120308.jar +ofbiz/trunk/framework/jetty/lib/jetty-util-8.1.2.v20120308.jar +ofbiz/trunk/framework/jetty/lib/jetty-webapp-8.1.2.v20120308.jar +ofbiz/trunk/framework/jetty/lib/jetty-xml-8.1.2.v20120308.jar +ofbiz/trunk/framework/jetty/lib/org.eclipse.jdt.core-3.7.1.jar ========================================================================= Eclipse Public License - v 1.0 Modified: ofbiz/branches/20111205EmailHandling/OPTIONAL_LIBRARIES URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/OPTIONAL_LIBRARIES?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/OPTIONAL_LIBRARIES (original) +++ ofbiz/branches/20111205EmailHandling/OPTIONAL_LIBRARIES Mon Mar 26 20:56:02 2012 @@ -113,7 +113,6 @@ on the old Undersun SVN server in the sp 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 Modified: ofbiz/branches/20111205EmailHandling/README URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/README?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/README (original) +++ ofbiz/branches/20111205EmailHandling/README Mon Mar 26 20:56:02 2012 @@ -1,16 +1,18 @@ 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 @@ -18,8 +20,17 @@ 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 Modified: ofbiz/branches/20111205EmailHandling/ant.bat URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/ant.bat?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/ant.bat (original) +++ ofbiz/branches/20111205EmailHandling/ant.bat Mon Mar 26 20:56:02 2012 @@ -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 Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/config/AccountingEntityLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/config/AccountingEntityLabels.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/accounting/config/AccountingEntityLabels.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/accounting/config/AccountingEntityLabels.xml Mon Mar 26 20:56:02 2012 @@ -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> Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/config/AccountingErrorUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/config/AccountingErrorUiLabels.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/accounting/config/AccountingErrorUiLabels.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/accounting/config/AccountingErrorUiLabels.xml Mon Mar 26 20:56:02 2012 @@ -20,108 +20,126 @@ --> <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <property key="AccountingDeleteRateAmount"> + <value xml:lang="de">Kann die zu löschende Raten-Summe nicht finden</value> <value xml:lang="en">Could not find RateAmount record to be deleted</value> <value xml:lang="it">Non è possibile trovare un record di RateAmount che deve essere cancellato</value> <value xml:lang="pt">Não foi possÃvel localizar o registro a ser excluÃdo RateAmount</value> <value xml:lang="zh">æ¾ä¸å°è¦å é¤çè´¹çéé¢ï¼RateAmountï¼è®°å½</value> </property> <property key="AccountingEftAccountCannotBeCreated"> + <value xml:lang="de">FEHLER: Kann die Bezahlmethoden-ID nicht anlegen (ID Generierungsfehler)</value> <value xml:lang="en">ERROR: Could not create payment method Id (id generation failure)</value> <value xml:lang="it">ERRORE: Non è possibile creare il metodo pagamento (fallimento generazione id)</value> <value xml:lang="pt">ERRO: Não foi possÃvel criar Id de étodo de pagamento (falha ao gerar ID)</value> <value xml:lang="zh">é误ï¼æ æ³å建æ¯ä»æ¹æ³æ è¯ï¼çææ è¯æ¶å¤±è´¥ï¼</value> </property> <property key="AccountingEftAccountCannotBeCreatedWriteFailure"> + <value xml:lang="de">FEHLER: Kann den Elektr. Zahlungsverkehr-Zugang nicht anlegen (Schreib-Fehler): ${errorString}</value> <value xml:lang="en">ERROR: Could not create EFT account (write failure): ${errorString}</value> <value xml:lang="it">ERRORE: Non è possibile creare il conto EFT (fallita scrittura): ${errorString}</value> <value xml:lang="pt">ERRO: Não foi possÃvel criar conta de EFT (falha de escrita): ${errorString}</value> <value xml:lang="zh">é误ï¼æ æ³å建çµåèµé转账账æ·ï¼åæä½å¤±è´¥ï¼ï¼${errorString}</value> </property> <property key="AccountingEftAccountCannotBeUpdated"> + <value xml:lang="de">FEHLER: Kann den Elektr. Zahlungsverkehr-Zugang nicht ändern (Schreib-Fehler): ${errorString}</value> <value xml:lang="en">ERROR: Could not update EFT Account (write failure): ${errorString}</value> <value xml:lang="it">ERRORE: Non è possibile aggiornare il conto EFT (scrittura fallita): ${errorString}</value> <value xml:lang="pt">ERRO: Não foi possÃvel atualizar Conta EFT (falha de escrita): ${errorString}</value> <value xml:lang="zh">é误ï¼æ æ³æ´æ°çµåèµé转账账æ·ï¼åæä½å¤±è´¥ï¼ï¼${errorString}</value> </property> <property key="AccountingEftAccountCannotBeUpdatedReadFailure"> + <value xml:lang="de">FEHLER: Kann den Elektr. Zahlungsverkehr-Zugang nicht ändern (Lese-Fehler): ${errorString}</value> <value xml:lang="en">ERROR: Could not update EFT Account (read error): ${errorString}</value> <value xml:lang="it">ERRORE: Non è possibile aggiornare il conto EFT (fallita lettura): ${errorString}</value> <value xml:lang="pt">ERRO: Não foi possÃvel atualizar Conta EFT (erro de leitura): ${errorString}</value> <value xml:lang="zh">é误ï¼æ æ³æ´æ°çµåèµé转账账æ·ï¼è¯»åæ¶åºéï¼ï¼${errorString}</value> </property> <property key="AccountingEftPartyNotAuthorized"> + <value xml:lang="de">Akteur Id ${partyId} ist nicht der Besitzer der Bezahlmethode ${paymentMethodId} und hat keine Berechtigung diese zu ändern.</value> <value xml:lang="en">Party Id ${partyId} is not the owner of payment method ${paymentMethodId} and does not have permission to change it.</value> <value xml:lang="it">Il soggetto ${partyId} non è il propretario del metodo di pagamento ${paymentMethodId} non hai il permesso per cambiarlo.</value> <value xml:lang="pt">Participante com ID ${partyId} não é o proprietário do método de pagamento de US ${paymentMethodId} e não têm permissão para alterá-lo.</value> <value xml:lang="zh">ä¼åæ è¯ ${partyId} ä¸æ¯æ¯ä»æ¹æ³ ${paymentMethodId} çæ¥æè ï¼æ æä¿®æ¹å®ã</value> </property> <property key="AccountingFinAccountAuthorizationExpired"> + <value xml:lang="de">Authroisierungs-Transaktion ${paymentGatewayResponseId} ist seit ${authExpiration} abgelaufen</value> <value xml:lang="en">Authorization transaction ${paymentGatewayResponseId} has expired as of ${authExpiration}</value> <value xml:lang="it">Autorizzazione transazione ${paymentGatewayResponseId} ha una scadenza del ${authExpiration}</value> <value xml:lang="pt">Autorização de transação de ${paymentGatewayResponseId} expirou como de ${authExpiration}</value> <value xml:lang="zh">ææ交æ ${paymentGatewayResponseId} å·²è¿æï¼åå æ¯ ${authExpiration}</value> </property> <property key="AccountingFinAccountCancelled"> + <value xml:lang="de">Zugriff wurde storniert</value> <value xml:lang="en">Account has been cancelled</value> <value xml:lang="it">Il conto è stato cancellato</value> <value xml:lang="pt">Conta foi cancelada</value> <value xml:lang="zh">è´¦æ·å·²è¢«åæ¶äº</value> </property> <property key="AccountingFinAccountCannotBeAuthorized"> + <value xml:lang="de">Kann die Abrechnung nicht durchführen, wegen: ${errorString}</value> <value xml:lang="en">Cannot authorize financial account due to: ${errorString}</value> <value xml:lang="it">Non è possibile autorizzare il conto finanziario per: ${errorString}</value> <value xml:lang="pt">Não é possÃvel autorizar a conta financeira decorrente de: ${errorString}</value> <value xml:lang="zh">æ æ³ææè´¢å¡è´¦ç®ï¼åå æ¯ï¼${errorString}</value> </property> <property key="AccountingFinAccountCannotBeExpired"> + <value xml:lang="de">Es ist nicht möglich die Abrechnungs-Authorisierung zu stornieren: </value> <value xml:lang="en">Unable to expire financial account authorization: </value> <value xml:lang="it">Non è possibile cancellare l'autorizzazione per il conto finanziario: </value> <value xml:lang="pt">Incapaz de expirar a autorização da conta financeira:</value> <value xml:lang="zh">æ æ³è¿æè´¢å¡è´¦ç®ææï¼</value> </property> <property key="AccountingFinAccountCannotBeRefunded"> + <value xml:lang="de">Der verfügbare Betrag ist ungleich dem aktuellen Betrag; Schwebende Authorisierung; Es ist derzeit nicht möglich eine Rückerstattung durchzuführen.</value> <value xml:lang="en">Available balance does not match the actual balance; pending authorizations; cannot refund FinAccount at this time.</value> <value xml:lang="it">Bilancio disponibilie non corrisponde all'attuale bilancio; autorizzazioni in attesa; non è possibile rimborsare il conto finanziario in questo momento.</value> <value xml:lang="pt">Saldo disponÃvel não corresponde ao saldo real, autorizações pendentes; não é possÃvel reembolsar FinAccount neste momento.</value> <value xml:lang="zh">å¯å¨ç¨ç»ä½ä¸å®é ç»ä½ä¸ä¸è´ï¼æåææï¼æ¬æ¬¡æ æ³é款å°è´¢å¡è´¦ç®ã</value> </property> <property key="AccountingFinAccountCannotBeReplenish"> + <value xml:lang="de">Kann das Produkt-Lager nicht in den vorherigen Absätzen zu finden. Produkt-Lager darf nicht leer sein</value> <value xml:lang="en">Cannot locate product store from previous deposits; product store cannot be empty</value> <value xml:lang="it">Non è possibile localizzare il negozio dei precedenti depositi; il negozio non può essere vuoto</value> <value xml:lang="pt">Não é possÃvel localizar loja de produtos de depósitos anteriores; loja de produtos não pode estar vazia</value> <value xml:lang="zh">æ æ³ä»ä»¥åçå款确å®äº§ååºéºï¼äº§ååºéºä¸è½ä¸ºç©º</value> </property> <property key="AccountingFinAccountCannotCapture"> + <value xml:lang="de">Keine Authorizierungs-Transaktion für die Bestell-Bezahl-Einstellungen gefunden; kann nicht OrderPaymentPreference; keine Erfassung möglich</value> <value xml:lang="en">No authorization transaction found for the OrderPaymentPreference; cannot capture</value> <value xml:lang="it">Nessuna transazione di autorizzazione trovata per le preferenze pagamento ordine; non è possibile catturare</value> <value xml:lang="pt">Nenhuma autorização de transação encontrado para a OrderPaymentPreference; não é possÃvel capturar</value> <value xml:lang="zh">æ¾ä¸å°ç¨äºè¿ä¸ªè®¢åæ¯ä»å¼ç¨ï¼OrderPaymentPreferenceï¼çææ交æï¼æ æ³ææ</value> </property> <property key="AccountingFinAccountCannotCreate"> + <value xml:lang="de">Es ist nicht möglich ein Finanz-Konto anzulegen; Keine Product-Laden-Id am Bestell-Kopf: ${orderId}</value> <value xml:lang="en">Unable to create financial accout; no productStoreId on OrderHeader: ${orderId}</value> <value xml:lang="it">Non è possibile creare conto finanziario; nessun negozio impostato sulla testata ordine: ${orderId}</value> <value xml:lang="pt">Não é possÃvel criar accout financeira; sem productStoreId em OrderHeader: ${orderId}</value> <value xml:lang="zh">æ æ³å建财å¡è´¦ç®ï¼è®¢å头ï¼OrderHeaderï¼ä¸æ²¡æ产ååºéºæ è¯ï¼productStoreIdï¼ï¼è®¢åç¼å·ï¼${orderId}</value> </property> <property key="AccountingFinAccountCannotCreateTransaction"> + <value xml:lang="de">Es ist nicht möglich ein Finanz-Konto Transaktion anzulegen!</value> <value xml:lang="en">Unable to create financial account transaction!</value> <value xml:lang="it">Non è possibile creare un transazione di un conto finanziario!</value> <value xml:lang="pt">Não é possÃvel criar transação na conta de financeiras!</value> <value xml:lang="zh">æ æ³æ§è¡å建财å¡è´¦ç®äºå¡ï¼</value> </property> <property key="AccountingFinAccountCannotCreditAccount"> + <value xml:lang="de">Es ist nicht möglich ein Dienste-Kredit-Konto anzulegen oder zu finden</value> <value xml:lang="en">Could not find or create a service credit account</value> <value xml:lang="it">Non è possibile trovare o creare un servizio di accredito conto</value> <value xml:lang="pt">Não foi possÃvel encontrar ou criar um serviço de conta de crédito</value> <value xml:lang="zh">æ æ³æ¾å°æå建ä¸ä¸ªæå¡ä¿¡ç¨è´¦æ·</value> </property> <property key="AccountingFinAccountCannotFindAuthorization"> + <value xml:lang="de"> Kann keine Authorisierungs-Transaktion finden.</value> <value xml:lang="en"> Could not find authorization transaction.</value> <value xml:lang="it"> Non è possibile trovare la transazione di autorizzazione.</value> <value xml:lang="pt">Não foi possÃvel encontrar autorização para a transação.</value> <value xml:lang="zh">æ æ³æ¾å°ææäºå¡ã</value> </property> <property key="AccountingFinAccountCannotLocateItFromAccountCode"> + <value xml:lang="de">Kann kein Finanz-Konto zum Zugangs-Code finden</value> <value xml:lang="en">Unable to locate financial account from account code</value> <value xml:lang="it">Non è possibile localizzare il conto finanziario dal codice conto</value> <value xml:lang="pt">Não foi possÃvel localizar a conta financeira do código de conta</value> @@ -134,12 +152,14 @@ <value xml:lang="zh">æ æ³ææ è¯ä¸º ${parameters.finAccountTransId} çè´¢å¡è´¦ç®äº¤ææ交å°æ®éæ¥è®°è´¦ä¸ï¼æ æ³æ¾å° ${creditDebit} ${requiredField}</value> </property> <property key="AccountingFinAccountExpired"> + <value xml:lang="de">Konto ist zum ${thruDate} abgelaufen</value> <value xml:lang="en">Account has expired as of ${thruDate}</value> <value xml:lang="it">Conto scaduto dal ${thruDate}</value> <value xml:lang="pt">Conta expirou a partir de ${thruDate}</value> <value xml:lang="zh">è´¦ç®å·²è¿æï¼è¿ææ¥æ为 ${thruDate}</value> </property> <property key="AccountingFinAccountFrozen"> + <value xml:lang="de">Konto ist derzeit eingefroren</value> <value xml:lang="en">Account is currently frozen</value> <value xml:lang="it">Il conto è attualmente congelato</value> <value xml:lang="pt">Conta está congelada</value> @@ -543,6 +563,7 @@ <value xml:lang="zh">æ§è¡ä»è®¾ç½®å建æ¯ä»ï¼CreatePaymentFromPreferenceï¼è¿ä¸ªæå¡æ¶åºé</value> </property> <property key="worldPayEvents.noValidOrderIdReturned"> + <value xml:lang="de">Es wurde keine valide BestellId zurückgegeben</value> <value xml:lang="en">No Valid OrderId Returned</value> <value xml:lang="fr">Référence commande retournée n'est pas valide</value> <value xml:lang="hi_IN">मानà¥à¤¯ OrderId वापस नहà¥à¤ लà¥à¤à¤¾</value> @@ -591,6 +612,7 @@ <value xml:lang="zh">è·ååæ·é ç½®æ¶åºé</value> </property> <property key="worldPayEvents.problemsGettingOrderHeader"> + <value xml:lang="de">Probleme den Bestellkopf zu ermitteln</value> <value xml:lang="en">Problems Getting OrderHeader</value> <value xml:lang="fr">Problème de récupération de la commande</value> <value xml:lang="hi_IN">OrderHeader मà¥à¤ समसà¥à¤¯à¤¾à¤à¤ हॠरहà¥</value> @@ -606,6 +628,7 @@ <value xml:lang="zh">æ§è¡ä»è®¾ç½®å建æ¯ä»ï¼CreatePaymentFromPreferenceï¼è¿ä¸ªæå¡æ¶åºé</value> </property> <property key="idealEvents.noValidOrderIdReturned"> + <value xml:lang="de">Es wurde keine valide BestellId zurückgegeben</value> <value xml:lang="en">No Valid OrderId Returned</value> <value xml:lang="fr">Référence commande retournée n'est pas valide</value> <value xml:lang="hi_IN">मानà¥à¤¯ OrderId वापस नहà¥à¤ लà¥à¤à¤¾</value> @@ -613,6 +636,7 @@ <value xml:lang="zh">è¿åç订åæ è¯æ æ</value> </property> <property key="idealEvents.problemsConnectingWithIdeal"> + <value xml:lang="de">Probleme bei der Verbindung zu iDEAL</value> <value xml:lang="en">Problems Connecting With iDEAL</value> <value xml:lang="fr">Problème rencontré dans la connexion avec iDEAL</value> <value xml:lang="hi_IN">iDEAL à¤à¥ साथ à¤à¥à¤¡à¤¼à¤¨à¥ मà¥à¤ समसà¥à¤¯à¤¾</value> @@ -620,6 +644,7 @@ <value xml:lang="zh">è¿æ¥ iDEAL æ¶åºé</value> </property> <property key="idealEvents.problemsGettingAuthenticationUser"> + <value xml:lang="de">Probleme den berechtigten Benutzer zu ermitteln</value> <value xml:lang="en">Problems Getting Authentication User</value> <value xml:lang="fr">Problème sur l'authentification de l'utilisateur</value> <value xml:lang="hi_IN">à¤à¤ªà¤¯à¥à¤à¤à¤°à¥à¤¤à¤¾(user) à¤à¥ पà¥à¤°à¤®à¤¾à¤£à¥à¤à¤°à¤£ मà¥à¤ समसà¥à¤¯à¤¾à¤à¤ हॠरहà¥</value> @@ -627,6 +652,7 @@ <value xml:lang="zh">è·å认è¯ç¨æ·æ¶åºé</value> </property> <property key="idealEvents.problemsGettingMerchantConfiguration"> + <value xml:lang="de">Probleme die Verkaufs-Konfiguration zu ermitteln</value> <value xml:lang="en">Problems Getting Merchant Configuration</value> <value xml:lang="fr">Problème de récupération de la configuration marchand</value> <value xml:lang="hi_IN">वà¥à¤¯à¤¾à¤ªà¤¾à¤°à¥ विनà¥à¤¯à¤¾à¤¸ मà¥à¤ समसà¥à¤¯à¤¾à¤à¤ हॠरहà¥</value> @@ -634,6 +660,7 @@ <value xml:lang="zh">è·ååæ·é ç½®æ¶åºé</value> </property> <property key="idealEvents.problemsGettingOrderHeader"> + <value xml:lang="de">Probleme den Bestellkopf zu ermitteln</value> <value xml:lang="en">Problems Getting OrderHeader</value> <value xml:lang="fr">Problème de récupération de la commande</value> <value xml:lang="hi_IN">OrderHeader मà¥à¤ समसà¥à¤¯à¤¾à¤à¤ हॠरहà¥</value> |
Free forum by Nabble | Edit this page |