You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jo...@apache.org on 2006/12/11 09:59:39 UTC
svn commit: r485565 - in /incubator/ofbiz/trunk: ./
applications/accounting/webapp/accounting/WEB-INF/
applications/content/src/org/ofbiz/content/
applications/manufacturing/webapp/manufacturing/WEB-INF/
applications/marketing/webapp/marketing/WEB-INF/...
Author: jonesde
Date: Mon Dec 11 00:59:37 2006
New Revision: 485565
URL: http://svn.apache.org/viewvc?view=rev&rev=485565
Log:
Remove JPublish and EdenLib, now they are gone; includes doc/notice file updates too
Removed:
incubator/ofbiz/trunk/framework/webapp/lib/EdenLib.jar
incubator/ofbiz/trunk/framework/webapp/lib/JPublish.jar
Modified:
incubator/ofbiz/trunk/.classpath
incubator/ofbiz/trunk/LICENSE
incubator/ofbiz/trunk/NOTICE
incubator/ofbiz/trunk/OPTIONAL_LIBRARIES
incubator/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java
incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml
incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
incubator/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
incubator/ofbiz/trunk/applications/workeffort/build.xml
incubator/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
incubator/ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml
incubator/ofbiz/trunk/framework/shark/webapp/shark/WEB-INF/controller.xml
incubator/ofbiz/trunk/framework/webapp/build.xml
incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/Section.java
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
Modified: incubator/ofbiz/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/.classpath?view=diff&rev=485565&r1=485564&r2=485565
==============================================================================
--- incubator/ofbiz/trunk/.classpath (original)
+++ incubator/ofbiz/trunk/.classpath Mon Dec 11 00:59:37 2006
@@ -1,125 +1,125 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="src" path="framework/testtools/src"/>
- <classpathentry kind="src" path="specialpurpose/pos/src"/>
- <classpathentry kind="src" path="framework/base/src/base"/>
- <classpathentry kind="src" path="framework/base/src/start"/>
- <classpathentry kind="src" path="framework/geronimo/src"/>
- <classpathentry excluding="org/ofbiz/accounting/thirdparty/clearcommerce/**|org/ofbiz/accounting/thirdparty/cybersource/**|org/ofbiz/accounting/thirdparty/verisign/**|org/ofbiz/accounting/thirdparty/worldpay/**" 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/ecommerce/src"/>
- <classpathentry kind="src" path="applications/manufacturing/src"/>
- <classpathentry kind="src" path="applications/marketing/src"/>
- <classpathentry excluding="org/ofbiz/order/thirdparty/taxware/**" kind="src" path="applications/order/src"/>
- <classpathentry kind="src" path="applications/party/src"/>
- <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/workeffort/src"/>
- <classpathentry kind="src" path="framework/appserver/src"/>
- <classpathentry kind="src" path="framework/catalina/src"/>
- <classpathentry kind="src" path="framework/common/src"/>
- <classpathentry kind="src" path="framework/datafile/src"/>
- <classpathentry excluding="org/ofbiz/entity/transaction/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/guiapp/src"/>
- <classpathentry kind="src" path="framework/jetty/src"/>
- <classpathentry kind="src" path="framework/minilang/src"/>
- <classpathentry kind="src" path="framework/security/src"/>
- <classpathentry kind="src" path="framework/service/src"/>
- <classpathentry excluding="org/enhydra/|org/ofbiz/" kind="src" path="framework/shark/src"/>
- <classpathentry excluding="org/ofbiz/webapp/view/JasperReportsPdfViewHandler.java|org/ofbiz/webapp/view/JasperReportsXmlViewHandler.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="framework/workflow/src"/>
- <classpathentry kind="lib" path="framework/webapp/lib/velocity-dep-1.3.jar"/>
- <classpathentry kind="lib" path="framework/webapp/lib/velocity-1.3.jar"/>
- <classpathentry kind="lib" path="framework/webapp/lib/MinML2.jar"/>
- <classpathentry kind="lib" path="framework/webapp/lib/JPublish.jar"/>
- <classpathentry kind="lib" path="framework/webapp/lib/EdenLib.jar"/>
- <classpathentry kind="lib" path="framework/webapp/lib/DataVision.jar"/>
- <classpathentry kind="lib" path="framework/webapp/lib/barcode4j-fop-ext-0.92.jar"/>
- <classpathentry kind="lib" path="framework/webapp/lib/batik-all-1.6.jar"/>
- <classpathentry kind="lib" path="framework/webapp/lib/fop-0.92.jar"/>
- <classpathentry kind="lib" path="framework/webapp/lib/xmlgraphics-commons-1.0.jar"/>
- <classpathentry kind="lib" path="framework/service/lib/wsdl4j.jar"/>
- <classpathentry kind="lib" path="framework/service/lib/axis-ant.jar"/>
- <classpathentry kind="lib" path="framework/service/lib/axis.jar"/>
- <classpathentry kind="lib" path="framework/jetty/lib/org.mortbay.jmx.jar"/>
- <classpathentry kind="lib" path="framework/jetty/lib/org.mortbay.jetty.jar"/>
- <classpathentry kind="lib" path="framework/jetty/lib/jasper-runtime.jar"/>
- <classpathentry kind="lib" path="framework/jetty/lib/jasper-compiler.jar"/>
- <classpathentry kind="lib" path="framework/guiapp/lib/XuiCoreSwing_v2_0_6_jdk1_4.jar"/>
- <classpathentry kind="lib" path="applications/content/lib/poi.jar"/>
- <classpathentry kind="lib" path="applications/content/lib/lucene.jar"/>
- <classpathentry kind="lib" path="framework/catalina/lib/tomcat-util.jar"/>
- <classpathentry kind="lib" path="framework/catalina/lib/tomcat-http.jar"/>
- <classpathentry kind="lib" path="framework/catalina/lib/tomcat-coyote.jar"/>
- <classpathentry kind="lib" path="framework/catalina/lib/servlets-default.jar"/>
- <classpathentry kind="lib" path="framework/catalina/lib/catalina-optional.jar"/>
- <classpathentry kind="lib" path="framework/catalina/lib/catalina.jar"/>
- <classpathentry kind="lib" path="framework/catalina/lib/jmx.jar"/>
- <classpathentry kind="lib" path="framework/catalina/lib/catalina-cluster.jar"/>
- <classpathentry kind="lib" path="framework/webapp/lib/itext-1.3.6.jar"/>
- <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-transaction-1.0.jar"/>
- <classpathentry kind="lib" path="framework/geronimo/lib/jencks-1.1.3.jar"/>
- <classpathentry kind="lib" path="framework/entity/lib/oswego-concurrent.jar"/>
- <classpathentry kind="lib" path="framework/entity/lib/ofbiz-minerva.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/Tidy.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/mx4j-remote-3.0.1.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/mx4j-3.0.1.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/mail.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/log4j.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/junitperf.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/junit.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/jdbm.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/javolution.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/jakarta-regexp.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/icu4j_3_4.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/httpunit.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/freemarker-2.3.8.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"/>
- <classpathentry kind="lib" path="framework/base/lib/ant-launcher.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/ant.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-vfs-providers.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-vfs.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-primitives.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-pool.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-net-1.4.1.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-modeler.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-logging.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-lang-2.1.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-fileupload.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-el.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-discovery.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-digester-1.7.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-dbcp.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-collections.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-codec.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-cli.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-beanutils.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-servlet_2.4_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/geronimo-qname_1.1_spec-1.0.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jta_1.0.1B_spec-1.0.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jsp_2.0_spec-1.0.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jms_1.1_spec-1.0.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jaxrpc_1.1_spec-1.0.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jaxr_1.0_spec-1.0.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-j2ee-connector_1.5_spec-1.0.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-activation_1.0.2_spec-1.0.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/scripting/oro.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/scripting/jython-nooro.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/scripting/bsh.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/scripting/bsf.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/xml-apis-2.8.1.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/xercesImpl-2.8.1.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/resolver-2.8.1.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/commons/commons-validator-1.3.0.jar"/>
- <classpathentry kind="lib" path="specialpurpose/pos/lib/looks-2.0.2.jar"/>
- <classpathentry kind="lib" path="specialpurpose/pos/lib/jpos18-controls.jar"/>
- <classpathentry kind="lib" path="specialpurpose/pos/lib/jcl.jar"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="src" path="framework/testtools/src"/>
+ <classpathentry kind="src" path="specialpurpose/pos/src"/>
+ <classpathentry kind="src" path="framework/base/src/base"/>
+ <classpathentry kind="src" path="framework/base/src/start"/>
+ <classpathentry kind="src" path="framework/geronimo/src"/>
+ <classpathentry excluding="org/ofbiz/accounting/thirdparty/clearcommerce/**|org/ofbiz/accounting/thirdparty/cybersource/**|org/ofbiz/accounting/thirdparty/verisign/**|org/ofbiz/accounting/thirdparty/worldpay/**" 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/ecommerce/src"/>
+ <classpathentry kind="src" path="applications/manufacturing/src"/>
+ <classpathentry kind="src" path="applications/marketing/src"/>
+ <classpathentry excluding="org/ofbiz/order/thirdparty/taxware/**" kind="src" path="applications/order/src"/>
+ <classpathentry kind="src" path="applications/party/src"/>
+ <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/workeffort/src"/>
+ <classpathentry kind="src" path="framework/appserver/src"/>
+ <classpathentry kind="src" path="framework/catalina/src"/>
+ <classpathentry kind="src" path="framework/common/src"/>
+ <classpathentry kind="src" path="framework/datafile/src"/>
+ <classpathentry excluding="org/ofbiz/entity/transaction/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/guiapp/src"/>
+ <classpathentry kind="src" path="framework/jetty/src"/>
+ <classpathentry kind="src" path="framework/minilang/src"/>
+ <classpathentry kind="src" path="framework/security/src"/>
+ <classpathentry kind="src" path="framework/service/src"/>
+ <classpathentry excluding="org/enhydra/|org/ofbiz/" kind="src" path="framework/shark/src"/>
+ <classpathentry excluding="org/ofbiz/webapp/ftl/FreeMarkerViewHandler.java|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" kind="src" path="framework/webapp/src"/>
+ <classpathentry kind="src" path="framework/webtools/src"/>
+ <classpathentry kind="src" path="framework/widget/src"/>
+ <classpathentry kind="src" path="framework/workflow/src"/>
+ <classpathentry kind="lib" path="framework/webapp/lib/velocity-dep-1.3.jar"/>
+ <classpathentry kind="lib" path="framework/webapp/lib/velocity-1.3.jar"/>
+ <classpathentry kind="lib" path="framework/webapp/lib/MinML2.jar"/>
+ <classpathentry kind="lib" path="framework/webapp/lib/JPublish.jar"/>
+ <classpathentry kind="lib" path="framework/webapp/lib/EdenLib.jar"/>
+ <classpathentry kind="lib" path="framework/webapp/lib/DataVision.jar"/>
+ <classpathentry kind="lib" path="framework/webapp/lib/barcode4j-fop-ext-0.92.jar"/>
+ <classpathentry kind="lib" path="framework/webapp/lib/batik-all-1.6.jar"/>
+ <classpathentry kind="lib" path="framework/webapp/lib/fop-0.92.jar"/>
+ <classpathentry kind="lib" path="framework/webapp/lib/xmlgraphics-commons-1.0.jar"/>
+ <classpathentry kind="lib" path="framework/service/lib/wsdl4j.jar"/>
+ <classpathentry kind="lib" path="framework/service/lib/axis-ant.jar"/>
+ <classpathentry kind="lib" path="framework/service/lib/axis.jar"/>
+ <classpathentry kind="lib" path="framework/jetty/lib/org.mortbay.jmx.jar"/>
+ <classpathentry kind="lib" path="framework/jetty/lib/org.mortbay.jetty.jar"/>
+ <classpathentry kind="lib" path="framework/jetty/lib/jasper-runtime.jar"/>
+ <classpathentry kind="lib" path="framework/jetty/lib/jasper-compiler.jar"/>
+ <classpathentry kind="lib" path="framework/guiapp/lib/XuiCoreSwing_v2_0_6_jdk1_4.jar"/>
+ <classpathentry kind="lib" path="applications/content/lib/poi.jar"/>
+ <classpathentry kind="lib" path="applications/content/lib/lucene.jar"/>
+ <classpathentry kind="lib" path="framework/catalina/lib/tomcat-util.jar"/>
+ <classpathentry kind="lib" path="framework/catalina/lib/tomcat-http.jar"/>
+ <classpathentry kind="lib" path="framework/catalina/lib/tomcat-coyote.jar"/>
+ <classpathentry kind="lib" path="framework/catalina/lib/servlets-default.jar"/>
+ <classpathentry kind="lib" path="framework/catalina/lib/catalina-optional.jar"/>
+ <classpathentry kind="lib" path="framework/catalina/lib/catalina.jar"/>
+ <classpathentry kind="lib" path="framework/catalina/lib/jmx.jar"/>
+ <classpathentry kind="lib" path="framework/catalina/lib/catalina-cluster.jar"/>
+ <classpathentry kind="lib" path="framework/webapp/lib/itext-1.3.6.jar"/>
+ <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-transaction-1.0.jar"/>
+ <classpathentry kind="lib" path="framework/geronimo/lib/jencks-1.1.3.jar"/>
+ <classpathentry kind="lib" path="framework/entity/lib/oswego-concurrent.jar"/>
+ <classpathentry kind="lib" path="framework/entity/lib/ofbiz-minerva.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/Tidy.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/mx4j-remote-3.0.1.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/mx4j-3.0.1.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/mail.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/log4j.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/junitperf.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/junit.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/jdbm.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/javolution.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/jakarta-regexp.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/icu4j_3_4.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/httpunit.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/freemarker-2.3.8.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"/>
+ <classpathentry kind="lib" path="framework/base/lib/ant-launcher.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/ant.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-vfs-providers.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-vfs.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-primitives.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-pool.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-net-1.4.1.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-modeler.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-logging.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-lang-2.1.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-fileupload.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-el.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-discovery.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-digester-1.7.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-dbcp.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-collections.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-codec.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-cli.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-beanutils.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-servlet_2.4_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/geronimo-qname_1.1_spec-1.0.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jta_1.0.1B_spec-1.0.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jsp_2.0_spec-1.0.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jms_1.1_spec-1.0.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jaxrpc_1.1_spec-1.0.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jaxr_1.0_spec-1.0.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-j2ee-connector_1.5_spec-1.0.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-activation_1.0.2_spec-1.0.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/scripting/oro.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/scripting/jython-nooro.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/scripting/bsh.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/scripting/bsf.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/xml-apis-2.8.1.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/xercesImpl-2.8.1.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/resolver-2.8.1.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/commons/commons-validator-1.3.0.jar"/>
+ <classpathentry kind="lib" path="specialpurpose/pos/lib/looks-2.0.2.jar"/>
+ <classpathentry kind="lib" path="specialpurpose/pos/lib/jpos18-controls.jar"/>
+ <classpathentry kind="lib" path="specialpurpose/pos/lib/jcl.jar"/>
+ <classpathentry kind="output" path="bin"/>
</classpath>
Modified: incubator/ofbiz/trunk/LICENSE
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/LICENSE?view=diff&rev=485565&r1=485564&r2=485565
==============================================================================
--- incubator/ofbiz/trunk/LICENSE (original)
+++ incubator/ofbiz/trunk/LICENSE Mon Dec 11 00:59:37 2006
@@ -308,8 +308,6 @@
ofbiz/trunk/framework/catalina/lib/jasper-runtime.jar
ofbiz/trunk/framework/jetty/lib/jasper-runtime.jar
ofbiz/trunk/framework/webapp/lib/DataVision.jar
-ofbiz/trunk/framework/webapp/lib/EdenLib.jar
-ofbiz/trunk/framework/webapp/lib/JPublish.jar
=========================================================================
Apache Software License
Modified: incubator/ofbiz/trunk/NOTICE
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/NOTICE?view=diff&rev=485565&r1=485564&r2=485565
==============================================================================
--- incubator/ofbiz/trunk/NOTICE (original)
+++ incubator/ofbiz/trunk/NOTICE Mon Dec 11 00:59:37 2006
@@ -118,16 +118,6 @@
JDOM Project (http://www.jdom.org/).
=========================================================================
-== EdenLib and JPublish Notice ==
-=========================================================================
-
-This product includes software developed by
-Anthony Eden (http://www.anthonyeden.com/).
-
-This product includes software developed by
-Aetrion LLC (http://www.aetrion.com/).
-
-=========================================================================
== Freemarker Notice ==
=========================================================================
Modified: incubator/ofbiz/trunk/OPTIONAL_LIBRARIES
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/OPTIONAL_LIBRARIES?view=diff&rev=485565&r1=485564&r2=485565
==============================================================================
--- incubator/ofbiz/trunk/OPTIONAL_LIBRARIES (original)
+++ incubator/ofbiz/trunk/OPTIONAL_LIBRARIES Mon Dec 11 00:59:37 2006
@@ -50,6 +50,26 @@
TO DEPLOY, PART 2: to get the component to load on startup, and get the webapp in place and such
the shark component needs to be uncommented in the framework/component-load.xml file.
+-=- Web Presentation: ________________________________________________________________________________________________________________________________________________
+
+-JPublish/EdenLib (Apache):
+ NOTE: these were removed for library compatibility reasons, not for license reasons; working these back in may be tricky
+ http://sourceforge.net/projects/jpublish
+ http://edenlib.sourceforge.net/
+ framework/webapp/lib:
+ JPublish.jar
+ EdenLib.jar
+ TO BUILD comment out exclude: framework/webapp/build.xml:
+ org/ofbiz/webapp/view/GenericViewRenderer.java
+ org/ofbiz/webapp/view/JPublishViewHandler.java
+ org/ofbiz/webapp/view/JPublishWrapper.java
+ org/ofbiz/webapp/view/FopPdfViewHandler.java
+ org/ofbiz/webapp/ftl/FreeMarkerViewHandler.java
+ org/ofbiz/webapp/ftl/FreeMarkerViewRenderer.java
+ org/ofbiz/webapp/ftl/JpCacheIncludeTransform.java
+ AND uncomment the jpublish type section portions of:
+ org/ofbiz/webapp/region/Section.java
+
-=- Scripting: ________________________________________________________________________________________________________________________________________________
-JavaScript/Rhino (NPL 1.1):
@@ -144,4 +164,4 @@
readme.txt
select.jar
select.properties
- TO BUILD comment out exclude: applications/accounting/build.xml:org/ofbiz/accounting/thirdparty/worldpay/**
\ No newline at end of file
+ TO BUILD comment out exclude: applications/accounting/build.xml:org/ofbiz/accounting/thirdparty/worldpay/**
Modified: incubator/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?view=diff&rev=485565&r1=485564&r2=485565
==============================================================================
--- incubator/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Mon Dec 11 00:59:37 2006
@@ -30,7 +30,6 @@
<handler name="simple" type="request" class="org.ofbiz.webapp.event.SimpleEventHandler"/>
<!-- view handlers -->
- <handler name="ftl" type="view" class="org.ofbiz.webapp.ftl.FreeMarkerViewHandler"/>
<handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/>
<handler name="screen" type="view" class="org.ofbiz.widget.screen.ScreenWidgetViewHandler"/>
<handler name="screenfop" type="view" class="org.ofbiz.widget.screen.ScreenFopPdfViewHandler"/>
Modified: incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java?view=diff&rev=485565&r1=485564&r2=485565
==============================================================================
--- incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java (original)
+++ incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java Mon Dec 11 00:59:37 2006
@@ -188,6 +188,7 @@
}
//public static String getFromSomewhere(String name, org.ofbiz.base.util.collections.OrderedMap paramMap, HttpServletRequest request, org.jpublish.JPublishContext context) {
+ /* This method should no longer be in use; the JPublish library was removed by default from OFBiz
public static String getFromSomewhere(String name, Map paramMap, HttpServletRequest request, org.jpublish.JPublishContext context) {
String ret = null;
@@ -206,7 +207,7 @@
}
}
return ret;
- }
+ } */
public static void getCurrentValue(HttpServletRequest request, GenericDelegator delegator) {
Modified: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml?view=diff&rev=485565&r1=485564&r2=485565
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml Mon Dec 11 00:59:37 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
-
Copyright 2001-2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -33,8 +32,6 @@
<!-- view handlers -->
<handler name="screen" type="view" class="org.ofbiz.widget.screen.ScreenWidgetViewHandler"/>
<handler name="screenfop" type="view" class="org.ofbiz.widget.screen.ScreenFopPdfViewHandler"/>
-
- <handler name="ftl" type="view" class="org.ofbiz.webapp.ftl.FreeMarkerViewHandler"/>
<handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/>
<handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/>
Modified: incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml?view=diff&rev=485565&r1=485564&r2=485565
==============================================================================
--- incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml Mon Dec 11 00:59:37 2006
@@ -29,9 +29,7 @@
<handler name="screen" type="view" class="org.ofbiz.widget.screen.ScreenWidgetViewHandler"/>
<handler name="screenfop" type="view" class="org.ofbiz.widget.screen.ScreenFopPdfViewHandler"/>
- <handler name="ftl" type="view" class="org.ofbiz.webapp.ftl.FreeMarkerViewHandler"/>
<handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/>
-
<handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/>
<preprocessor>
Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?view=diff&rev=485565&r1=485564&r2=485565
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Mon Dec 11 00:59:37 2006
@@ -32,11 +32,8 @@
<!-- view handlers -->
<handler name="screen" type="view" class="org.ofbiz.widget.screen.ScreenWidgetViewHandler"/>
-
- <handler name="ftl" type="view" class="org.ofbiz.webapp.ftl.FreeMarkerViewHandler"/>
- <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/>
<handler name="screenfop" type="view" class="org.ofbiz.widget.screen.ScreenFopPdfViewHandler"/>
-
+ <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/>
<handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/>
<preprocessor>
Modified: incubator/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml?view=diff&rev=485565&r1=485564&r2=485565
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Mon Dec 11 00:59:37 2006
@@ -30,11 +30,8 @@
<handler name="bsf" type="request" class="org.ofbiz.webapp.event.BsfEventHandler"/>
<handler name="screen" type="view" class="org.ofbiz.widget.screen.ScreenWidgetViewHandler"/>
-
- <handler name="ftl" type="view" class="org.ofbiz.webapp.ftl.FreeMarkerViewHandler"/>
- <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/>
<handler name="screenfop" type="view" class="org.ofbiz.widget.screen.ScreenFopPdfViewHandler"/>
-
+ <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/>
<handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/>
<firstvisit></firstvisit>
Modified: incubator/ofbiz/trunk/applications/workeffort/build.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/workeffort/build.xml?view=diff&rev=485565&r1=485564&r2=485565
==============================================================================
--- incubator/ofbiz/trunk/applications/workeffort/build.xml (original)
+++ incubator/ofbiz/trunk/applications/workeffort/build.xml Mon Dec 11 00:59:37 2006
@@ -44,6 +44,7 @@
<fileset dir="../../framework/security/build/lib" includes="*.jar"/>
<fileset dir="../../framework/service/lib" includes="*.jar"/>
<fileset dir="../../framework/service/build/lib" includes="*.jar"/>
+ <fileset dir="../../framework/common/build/lib" includes="*.jar"/>
<fileset dir="../party/build/lib" includes="*.jar"/>
</path>
</target>
Modified: incubator/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml?view=diff&rev=485565&r1=485564&r2=485565
==============================================================================
--- incubator/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml Mon Dec 11 00:59:37 2006
@@ -27,10 +27,8 @@
<handler name="service" type="request" class="org.ofbiz.webapp.event.ServiceEventHandler"/>
<handler name="simple" type="request" class="org.ofbiz.webapp.event.SimpleEventHandler"/>
- <handler name="ftl" type="view" class="org.ofbiz.webapp.ftl.FreeMarkerViewHandler"/>
- <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/>
<handler name="screen" type="view" class="org.ofbiz.widget.screen.ScreenWidgetViewHandler"/>
-
+ <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/>
<handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/>
<preprocessor>
Modified: incubator/ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml?view=diff&rev=485565&r1=485564&r2=485565
==============================================================================
--- incubator/ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml Mon Dec 11 00:59:37 2006
@@ -28,10 +28,9 @@
<handler name="simple" type="request" class="org.ofbiz.webapp.event.SimpleEventHandler"/>
<!-- view handlers -->
- <handler name="ftl" type="view" class="org.ofbiz.webapp.ftl.FreeMarkerViewHandler"/>
- <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/>
<handler name="screen" type="view" class="org.ofbiz.widget.screen.ScreenWidgetViewHandler"/>
<handler name="screenfop" type="view" class="org.ofbiz.widget.screen.ScreenFopPdfViewHandler"/>
+ <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/>
<handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/>
<!--
Modified: incubator/ofbiz/trunk/framework/shark/webapp/shark/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/shark/webapp/shark/WEB-INF/controller.xml?view=diff&rev=485565&r1=485564&r2=485565
==============================================================================
--- incubator/ofbiz/trunk/framework/shark/webapp/shark/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/framework/shark/webapp/shark/WEB-INF/controller.xml Mon Dec 11 00:59:37 2006
@@ -30,7 +30,6 @@
<!-- view handlers -->
<handler name="screen" type="view" class="org.ofbiz.widget.screen.ScreenWidgetViewHandler"/>
- <handler name="ftl" type="view" class="org.ofbiz.webapp.ftl.FreeMarkerViewHandler"/>
<handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/>
<handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/>
Modified: incubator/ofbiz/trunk/framework/webapp/build.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webapp/build.xml?view=diff&rev=485565&r1=485564&r2=485565
==============================================================================
--- incubator/ofbiz/trunk/framework/webapp/build.xml (original)
+++ incubator/ofbiz/trunk/framework/webapp/build.xml Mon Dec 11 00:59:37 2006
@@ -15,7 +15,7 @@
under the License.
-->
-<project name="OFBiz - Web App Component" default="jar" basedir=".">
+<project name="OFBiz - WebApp Component" default="jar" basedir=".">
<!-- ================================================================== -->
<!-- Initialization of all property settings -->
@@ -84,8 +84,17 @@
<path refid="local.class.path"/>
</classpath>
<src path="${src.dir}"/>
+ <!-- JasperReports dependent files -->
<exclude name="org/ofbiz/webapp/view/JasperReportsPdfViewHandler.java"/>
<exclude name="org/ofbiz/webapp/view/JasperReportsXmlViewHandler.java"/>
+ <!-- JPublish/EdenLib dependent files -->
+ <exclude name="org/ofbiz/webapp/view/GenericViewRenderer.java"/>
+ <exclude name="org/ofbiz/webapp/view/JPublishViewHandler.java"/>
+ <exclude name="org/ofbiz/webapp/view/JPublishWrapper.java"/>
+ <exclude name="org/ofbiz/webapp/view/FopPdfViewHandler.java"/>
+ <exclude name="org/ofbiz/webapp/ftl/FreeMarkerViewHandler.java"/>
+ <exclude name="org/ofbiz/webapp/ftl/FreeMarkerViewRenderer.java"/>
+ <exclude name="org/ofbiz/webapp/ftl/JpCacheIncludeTransform.java"/>
</javac>
<copy todir="${build.dir}/classes">
<!-- don't put the DTDs in the jar file... -->
Modified: incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/Section.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/Section.java?view=diff&rev=485565&r1=485564&r2=485565
==============================================================================
--- incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/Section.java (original)
+++ incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/Section.java Mon Dec 11 00:59:37 2006
@@ -23,10 +23,8 @@
import javax.servlet.jsp.PageContext;
import org.ofbiz.base.util.Debug;
-import org.ofbiz.base.util.GeneralException;
import org.ofbiz.base.util.UtilJ2eeCompat;
import org.ofbiz.webapp.control.RequestHandler;
-import org.ofbiz.webapp.view.JPublishWrapper;
import org.ofbiz.webapp.view.ViewHandler;
import org.ofbiz.webapp.view.ViewHandlerException;
@@ -115,6 +113,7 @@
RegionStack.pop(request);
} else if ("jpublish".equals(type)) {
// rather then using the view handler use the wrapper directly
+ /* NOTE: In order to use the "jpublish" section type the JPublish libraries must be added as described in OPTIONAL_LIBRARIES and then uncomment this section
ServletContext sctx = (ServletContext) request.getAttribute("servletContext");
if (sctx != null) {
JPublishWrapper jp = this.getJPublishWrapper(sctx);
@@ -136,6 +135,7 @@
} else {
throw new IllegalStateException("No servletContext found in request");
}
+ */
} else {
// default is the string that the ViewFactory expects for webapp resources
viewHandlerRender("default", request, response);
@@ -162,6 +162,7 @@
}
}
+ /* NOTE: In order to use the "jpublish" section type the JPublish libraries must be added as described in OPTIONAL_LIBRARIES and then uncomment this section
protected JPublishWrapper getJPublishWrapper(ServletContext ctx) {
JPublishWrapper wrapper = (JPublishWrapper) ctx.getAttribute("jpublishWrapper");
if (wrapper == null) {
@@ -169,6 +170,7 @@
}
return wrapper;
}
+ */
public String toString() {
return "Section: " + name + ", info=" + info + ", content=" + content + ", type=" + type;
Modified: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml?view=diff&rev=485565&r1=485564&r2=485565
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml Mon Dec 11 00:59:37 2006
@@ -29,10 +29,7 @@
<handler name="region" type="view" class="org.ofbiz.webapp.view.RegionViewHandler"/>
<handler name="screen" type="view" class="org.ofbiz.widget.screen.ScreenWidgetViewHandler"/>
-
- <handler name="ftl" type="view" class="org.ofbiz.webapp.ftl.FreeMarkerViewHandler"/>
<handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/>
-
<handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/>
<handler name="datavision" type="view" class="org.ofbiz.webapp.view.DataVisionViewHandler"/>