You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2013/12/23 10:27:00 UTC

svn commit: r1553086 [1/10] - in /ofbiz/branches/jackrabbit20120501: ./ applications/accounting/config/ applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ applications/commonext/config/ applications/content/config/ applications/cont...

Author: jleroux
Date: Mon Dec 23 09:26:58 2013
New Revision: 1553086

URL: http://svn.apache.org/r1553086
Log:
Merges trunk HEAD

Modified:
    ofbiz/branches/jackrabbit20120501/   (props changed)
    ofbiz/branches/jackrabbit20120501/.project
    ofbiz/branches/jackrabbit20120501/.xmlcatalog.xml
    ofbiz/branches/jackrabbit20120501/LICENSE
    ofbiz/branches/jackrabbit20120501/applications/accounting/config/AccountingEntityLabels.xml
    ofbiz/branches/jackrabbit20120501/applications/accounting/config/AccountingErrorUiLabels.xml
    ofbiz/branches/jackrabbit20120501/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/branches/jackrabbit20120501/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java
    ofbiz/branches/jackrabbit20120501/applications/commonext/config/SetupUiLabels.xml
    ofbiz/branches/jackrabbit20120501/applications/content/config/ContentEntityLabels.xml
    ofbiz/branches/jackrabbit20120501/applications/content/config/ContentUiLabels.xml
    ofbiz/branches/jackrabbit20120501/applications/content/src/org/ofbiz/content/content/ContentServices.java
    ofbiz/branches/jackrabbit20120501/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl
    ofbiz/branches/jackrabbit20120501/applications/marketing/config/MarketingUiLabels.xml
    ofbiz/branches/jackrabbit20120501/applications/order/config/OrderEntityLabels.xml
    ofbiz/branches/jackrabbit20120501/applications/order/config/OrderErrorUiLabels.xml
    ofbiz/branches/jackrabbit20120501/applications/order/config/OrderUiLabels.xml
    ofbiz/branches/jackrabbit20120501/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
    ofbiz/branches/jackrabbit20120501/applications/order/src/org/ofbiz/order/order/OrderServices.java
    ofbiz/branches/jackrabbit20120501/applications/order/src/org/ofbiz/order/task/TaskWorker.java
    ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl
    ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/entry/checkinits.ftl
    ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/entry/optionsettings.ftl
    ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/order/editorderitems.ftl
    ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl
    ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/order/orderinfo.ftl
    ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/order/orderitems.ftl
    ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl
    ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
    ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/return/quickReturn.ftl
    ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/return/returnHeader.ftl
    ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/return/returnItems.ftl
    ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/return/returnList.ftl
    ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/task/ordertasklist.ftl
    ofbiz/branches/jackrabbit20120501/applications/party/config/PartyEntityLabels.xml
    ofbiz/branches/jackrabbit20120501/applications/party/config/PartyUiLabels.xml
    ofbiz/branches/jackrabbit20120501/applications/party/webapp/partymgr/party/profileblocks/FinAccounts.ftl
    ofbiz/branches/jackrabbit20120501/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl
    ofbiz/branches/jackrabbit20120501/applications/product/config/ProductEntityLabels.xml
    ofbiz/branches/jackrabbit20120501/applications/product/config/ProductUiLabels.xml
    ofbiz/branches/jackrabbit20120501/applications/product/src/org/ofbiz/product/category/CategoryServices.java
    ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl
    ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/facility/PicklistOptions.ftl
    ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/inventory/receiveInventory.ftl
    ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/returns/receiveReturn.ftl
    ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/shipment/PackOrder.ftl
    ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/shipment/VerifyPick.ftl
    ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/shipment/WeightPackage.ftl
    ofbiz/branches/jackrabbit20120501/applications/product/widget/catalog/CatalogMenus.xml
    ofbiz/branches/jackrabbit20120501/applications/product/widget/facility/InventoryForms.xml
    ofbiz/branches/jackrabbit20120501/applications/workeffort/config/WorkEffortEntityLabels.xml
    ofbiz/branches/jackrabbit20120501/applications/workeffort/config/WorkEffortUiLabels.xml
    ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/container/ContainerLoader.java
    ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/util/test/AssertTests.java
    ofbiz/branches/jackrabbit20120501/framework/build.xml
    ofbiz/branches/jackrabbit20120501/framework/common/config/CommonEntityLabels.xml
    ofbiz/branches/jackrabbit20120501/framework/common/config/CommonUiLabels.xml
    ofbiz/branches/jackrabbit20120501/framework/common/src/org/ofbiz/common/CommonEvents.java
    ofbiz/branches/jackrabbit20120501/framework/common/src/org/ofbiz/common/login/LoginServices.java
    ofbiz/branches/jackrabbit20120501/framework/component-load.xml
    ofbiz/branches/jackrabbit20120501/framework/datafile/src/org/ofbiz/datafile/ModelDataFileReader.java
    ofbiz/branches/jackrabbit20120501/framework/entity/dtd/entitymodel.xsd
    ofbiz/branches/jackrabbit20120501/framework/entity/src/org/ofbiz/entity/GenericDelegator.java
    ofbiz/branches/jackrabbit20120501/framework/entity/src/org/ofbiz/entity/util/SequenceUtil.java
    ofbiz/branches/jackrabbit20120501/framework/minilang/src/org/ofbiz/minilang/method/conditional/Compare.java
    ofbiz/branches/jackrabbit20120501/framework/webtools/config/WebtoolsUiLabels.xml
    ofbiz/branches/jackrabbit20120501/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java
    ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/WidgetWorker.java
    ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/screen/ScreenFactory.java
    ofbiz/branches/jackrabbit20120501/framework/widget/templates/htmlFormMacroLibrary.ftl
    ofbiz/branches/jackrabbit20120501/specialpurpose/LICENSE
    ofbiz/branches/jackrabbit20120501/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java
    ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
    ofbiz/branches/jackrabbit20120501/specialpurpose/googlebase/config/GoogleBaseUiLabels.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/myportal/config/MyPortalUiLabels.xml
    ofbiz/branches/jackrabbit20120501/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java
    ofbiz/branches/jackrabbit20120501/themes/bizznesstime/includes/secondary-appbar.ftl
    ofbiz/branches/jackrabbit20120501/themes/flatgrey/includes/appbar.ftl
    ofbiz/branches/jackrabbit20120501/themes/flatgrey/includes/header.ftl

Propchange: ofbiz/branches/jackrabbit20120501/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1550057-1553084

Modified: ofbiz/branches/jackrabbit20120501/.project
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/.project?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/.project (original)
+++ ofbiz/branches/jackrabbit20120501/.project Mon Dec 23 09:26:58 2013
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-    <name>ofbiz</name>
-    <comment></comment>
-    <projects>
-    </projects>
-    <buildSpec>
-        <buildCommand>
-            <name>org.eclipse.jdt.core.javabuilder</name>
-            <arguments>
-            </arguments>
-        </buildCommand>
-    </buildSpec>
-    <natures>
-        <nature>org.eclipse.jdt.groovy.core.groovyNature</nature>
-        <nature>org.eclipse.jdt.core.javanature</nature>
-    </natures>
+	<name>jackrabbit20120501</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.groovy.core.groovyNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
 </projectDescription>

Modified: ofbiz/branches/jackrabbit20120501/.xmlcatalog.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/.xmlcatalog.xml?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/.xmlcatalog.xml (original)
+++ ofbiz/branches/jackrabbit20120501/.xmlcatalog.xml Mon Dec 23 09:26:58 2013
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- This is the catalog of OFBiz XML schemas for Eclipse. Just import it and this will avoid Eclipse to go to the web for checking the xml files against their schema. 
-     More at https://cwiki.apache.org/confluence/display/OFBIZ/Eclipse+Tips#EclipseTips-UsinglocalXSD'swhennointernetconnectionisavailable
+     More at https://cwiki.apache.org/confluence/display/OFBIZ/Eclipse+Tips#EclipseTips-xmlCatalog
 -->
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
   <nextCatalog catalog="platform:/resource/ofbiz/framework/base/dtd/base-catalog.xml"/>

Modified: ofbiz/branches/jackrabbit20120501/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/LICENSE?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/LICENSE (original)
+++ ofbiz/branches/jackrabbit20120501/LICENSE Mon Dec 23 09:26:58 2013
@@ -7,126 +7,125 @@ Other licenses used by libraries distrib
 below. This file includes a list of all libraries distributed with Apache
 OFBiz and the full text of the license used for each.
 
-For additional details, see the NOTICE file and:
-http://cwiki.apache.org/confluence/display/OFBADMIN/Libraries+Included+in+OFBiz
+For additional details, see the NOTICE file.
 =========================================================================
 The following libraries are licensed under the Apache License Version 2.0:
-ofbiz/trunk/framework/base/lib/ant-launcher-1.8.4.jar
-ofbiz/trunk/framework/base/lib/ant-1.8.4.jar
-ofbiz/trunk/framework/base/lib/ant-junit-1.8.4.jar
-ofbiz/trunk/framework/base/lib/ant/ant-apache-bsf-1.8.4.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
-ofbiz/trunk/framework/base/lib/barcode4j-fop-ext-complete-2.0.jar
-ofbiz/trunk/framework/base/lib/clhm-release-1.0-lru.jar
-ofbiz/trunk/framework/base/lib/httpclient-4.1.1.jar
-ofbiz/trunk/framework/base/lib/httpclient-cache-4.1.1.jar
-ofbiz/trunk/framework/base/lib/httpcore-4.1.jar
-ofbiz/trunk/framework/base/lib/httpmime-4.1.1.jar
-ofbiz/trunk/framework/base/lib/ivy-2.2.0.jar
-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/mx4j-3.0.1.jar
-ofbiz/trunk/framework/base/lib/mx4j-remote-3.0.1.jar
-ofbiz/trunk/framework/base/lib/nekohtml.jar
-ofbiz/trunk/framework/base/lib/resolver-2.9.1.jar
-ofbiz/trunk/framework/base/lib/serializer-2.9.1.jar
-ofbiz/trunk/framework/base/lib/ws-commons-java5-1.0.1.jar
-ofbiz/trunk/framework/base/lib/ws-commons-util-1.0.2.jar
-ofbiz/trunk/framework/base/lib/xercesImpl-2.9.1.jar
-ofbiz/trunk/framework/base/lib/xml-apis-2.9.1.jar
-ofbiz/trunk/framework/base/lib/commons/commons-beanutils-1.7.0.jar
-ofbiz/trunk/framework/base/lib/commons/commons-cli-1.0.jar
-ofbiz/trunk/framework/base/lib/commons/commons-codec-1.4.jar
-ofbiz/trunk/framework/base/lib/commons/commons-collections-3.2.jar
-ofbiz/trunk/framework/base/lib/commons/commons-compress-1.4.1.jar
-ofbiz/trunk/framework/base/lib/commons/commons-digester-1.8.jar
-ofbiz/trunk/framework/base/lib/commons/commons-discovery-0.4.jar
-ofbiz/trunk/framework/base/lib/commons/commons-el-1.0.jar
-ofbiz/trunk/framework/base/lib/commons/commons-fileupload-1.2.2.jar
-ofbiz/trunk/framework/base/lib/commons/commons-io-1.3.1.jar
-ofbiz/trunk/framework/base/lib/commons/commons-lang-2.4.jar
-ofbiz/trunk/framework/base/lib/commons/commons-logging-1.1.jar
-ofbiz/trunk/framework/base/lib/commons/commons-modeler-2.0.jar
-ofbiz/trunk/framework/base/lib/commons/commons-net-1.4.1.jar
-ofbiz/trunk/framework/base/lib/commons/commons-pool-1.3.jar
-ofbiz/trunk/framework/base/lib/commons/commons-primitives-1.0.jar
-ofbiz/trunk/framework/base/lib/commons/commons-validator-1.3.1
-ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-activation_1.0.2_spec-1.0.jar
-ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-j2ee-connector_1.5_spec-1.0.jar
-ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-jaxr_1.0_spec-1.0.jar
-ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-jaxrpc_1.1_spec-1.0.jar
-ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-jms_1.1_spec-1.0.jar
-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/annotations-api-3.0.jar
-ofbiz/trunk/framework/base/lib/j2eespecs/el-api-2.2.jar
-ofbiz/trunk/framework/base/lib/j2eespecs/jsp-api-2.2.jar
-ofbiz/trunk/framework/base/lib/j2eespecs/servlet-api-3.0.jar
-ofbiz/trunk/framework/base/lib/scripting/bsf-2.4.0.jar
-ofbiz/trunk/framework/base/lib/scripting/jakarta-oro-2.0.8.jar
-ofbiz/trunk/framework/base/lib/scripting/groovy-all-1.8.6.jar
-ofbiz/trunk/framework/base/lib/scripting/jansi-1.2.1.jar
-ofbiz/trunk/framework/base/lib/xmlrpc-client-3.1.2.jar
-ofbiz/trunk/framework/base/lib/xmlrpc-common-3.1.2.jar
-ofbiz/trunk/framework/base/lib/xmlrpc-server-3.1.2.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.29-catalina-ha.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.29-catalina-tribes.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.29-tomcat-embed-core.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.29-tomcat-embed-jasper.jar
-ofbiz/framework/catalina/lib/tomcat-7.0.29-tomcat-embed-logging-log4j.jar
-ofbiz/trunk/framework/entity/lib/commons-dbcp-1.4.jar
-ofbiz/trunk/framework/entity/lib/jdbc/derby-10.8.2.2.jar
-ofbiz/trunk/framework/entity/lib/jdbc/derbytools-10.8.2.2.jar
-ofbiz/trunk/framework/jcr/lib/concurrent-1.3.4.jar
-ofbiz/trunk/framework/jcr/lib/jackrabbit-api-2.5.1.jar
-ofbiz/trunk/framework/jcr/lib/jackrabbit-core-2.5.1.jar
-ofbiz/trunk/framework/jcr/lib/jackrabbit-jca-2.5.1.jar
-ofbiz/trunk/framework/jcr/lib/jackrabbit-jcr-commons-2.5.1.jar
-ofbiz/trunk/framework/jcr/lib/jackrabbit-ocm-2.0.jar
-ofbiz/trunk/framework/jcr/lib/jackrabbit-spi-2.5.1.jar
-ofbiz/trunk/framework/jcr/lib/jackrabbit-spi-commons-2.5.1.jar
-ofbiz/trunk/framework/jcr/lib/jcr-2.0.jar
-ofbiz/trunk/framework/jcr/lib/tagsoup-1.2.1.jar
-ofbiz/trunk/framework/jcr/lib/tika-core-1.0.jar
-ofbiz/trunk/framework/jcr/lib/tika-parsers-1.0.jar
-ofbiz/trunk/framework/service/lib/axis-ant-1.4.jar
-ofbiz/trunk/framework/service/lib/axis-1.4.jar
-ofbiz/trunk/framework/service/lib/axiom-api-1.2.9.jar
-ofbiz/trunk/framework/service/lib/axiom-impl-1.2.9.jar
-ofbiz/trunk/framework/service/lib/axis2-kernel-1.5.2.jar
-ofbiz/trunk/framework/service/lib/axis2-transport-http-1.5.2.jar
-ofbiz/trunk/framework/service/lib/axis2-transport-local-1.5.2.jar
-ofbiz/trunk/framework/service/lib/commons-httpclient-3.1.jar
-ofbiz/trunk/framework/service/lib/neethi-2.0.4.jar
-ofbiz/trunk/framework/service/lib/XmlSchema-1.4.3.jar
-ofbiz/trunk/framework/webapp/lib/fop-1.0.jar
-ofbiz/trunk/framework/webapp/lib/velocity-1.6.1.jar
-ofbiz/trunk/framework/webapp/lib/xmlgraphics-commons-1.4.jar
-ofbiz/trunk/framework/webapp/lib/json-lib-2.2.3-jdk15.jar
-ofbiz/trunk/framework/webapp/lib/ezmorph-0.9.1.jar
-ofbiz/trunk/framework/webapp/lib/rome-0.9.jar
-ofbiz/trunk/framework/webapp/lib/serializer-2.7.0.jar
-ofbiz/trunk/framework/webapp/lib/xalan-2.7.1.jar
-ofbiz/trunk/framework/geronimo/lib/geronimo-connector-2.1.1.jar
-ofbiz/trunk/framework/geronimo/lib/geronimo-transaction-2.1.1.jar
-ofbiz/trunk/applications/content/lib/fontbox-1.4.0.jar
-ofbiz/trunk/applications/content/lib/jempbox-1.4.0.jar
-ofbiz/trunk/applications/content/lib/lucene-core-3.5.0.jar
-ofbiz/trunk/applications/content/lib/pdfbox-1.4.0.jar
-ofbiz/trunk/applications/content/lib/poi-3.8-20120326.jar
-ofbiz/trunk/applications/content/lib/poi-ooxml-3.8-20120326.jar
-ofbiz/trunk/applications/content/lib/poi-ooxml-schemas-3.8-20120326.jar
-ofbiz/trunk/applications/content/lib/poi-scratchpad-3.8-20120326.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
+framework/base/lib/ant-1.9.0-ant-launcher.jar
+framework/base/lib/ant-1.9.0-ant.jar
+framework/base/lib/ant-1.9.0-ant-junit.jar
+framework/base/lib/ant/ant-1.9.0-ant-apache-bsf.jar
+framework/base/lib/ant/ant-nodeps-1.8.1.jar
+framework/base/lib/avalon-framework-4.2.0.jar
+framework/base/lib/avalon-util-exception-1.0.0.jar
+framework/base/lib/batik-all-1.7.jar
+framework/base/lib/barcode4j-2.1-barcode4j-fop-ext-complete.jar
+framework/base/lib/clhm-release-1.0-lru.jar
+framework/base/lib/httpclient-4.2.1.jar
+framework/base/lib/httpclient-cache-4.2.1.jar
+framework/base/lib/httpcore-4.2.1.jar
+framework/base/lib/httpmime-4.2.1.jar
+framework/base/lib/ivy-2.2.0.jar
+framework/base/lib/jakarta-regexp-1.5.jar
+framework/base/lib/jpim-0.1.jar
+framework/base/lib/juel-2.2.1.jar
+framework/base/lib/log4j-1.2.17.jar
+framework/base/lib/mx4j-3.0.1.jar
+framework/base/lib/mx4j-remote-3.0.1.jar
+framework/base/lib/nekohtml-1.9.16.jar
+framework/base/lib/resolver-2.9.1.jar
+framework/base/lib/serializer-2.9.1.jar
+framework/base/lib/ws-commons-java5-1.0.1.jar
+framework/base/lib/ws-commons-util-1.0.2.jar
+framework/base/lib/xercesImpl-2.9.1.jar
+framework/base/lib/xml-apis-2.9.1.jar
+framework/base/lib/xml-apis-ext-1.3.04.jar
+framework/base/lib/commons/commons-beanutils-core-1.8.3.jar
+framework/base/lib/commons/commons-cli-1.2.jar
+framework/base/lib/commons/commons-codec-1.6.jar
+framework/base/lib/commons/commons-collections-3.2.1.jar
+framework/base/lib/commons/commons-compress-1.4.1.jar
+framework/base/lib/commons/commons-csv-1.0.jar
+framework/base/lib/commons/commons-digester3-3.2.jar
+framework/base/lib/commons/commons-discovery-0.4.jar
+framework/base/lib/commons/commons-el-1.0.jar
+framework/base/lib/commons/commons-fileupload-1.2.2.jar
+framework/base/lib/commons/commons-io-2.4.jar
+framework/base/lib/commons/commons-lang-2.6.jar
+framework/base/lib/commons/commons-logging-1.1.2.jar
+framework/base/lib/commons/commons-modeler-2.0.1.jar
+framework/base/lib/commons/commons-net-3.1.jar
+framework/base/lib/commons/commons-pool-1.3.jar
+framework/base/lib/commons/commons-primitives-1.0.jar
+framework/base/lib/commons/commons-validator-1.4.0.jar
+framework/base/lib/j2eespecs/geronimo-activation_1.0.2_spec-1.0.jar
+framework/base/lib/j2eespecs/geronimo-j2ee-connector_1.5_spec-1.0.jar
+framework/base/lib/j2eespecs/geronimo-jaxr_1.0_spec-1.0.jar
+framework/base/lib/j2eespecs/geronimo-jaxrpc_1.1_spec-1.0.jar
+framework/base/lib/j2eespecs/geronimo-jms_1.1_spec-1.0.jar
+framework/base/lib/j2eespecs/geronimo-jta_1.1_spec-1.1.1.jar
+framework/base/lib/j2eespecs/geronimo-saaj_1.1_spec-1.0.jar
+framework/base/lib/j2eespecs/annotations-api-3.0.jar
+framework/base/lib/j2eespecs/jsp-api-2.2.jar
+framework/base/lib/j2eespecs/servlet-api-3.0.jar
+framework/base/lib/scripting/bsf-2.4.0.jar
+framework/base/lib/scripting/jakarta-oro-2.0.8.jar
+framework/base/lib/scripting/groovy-all-2.1.9.jar
+framework/base/lib/scripting/jansi-1.2.1.jar
+framework/base/lib/xmlrpc-client-3.1.2.jar
+framework/base/lib/xmlrpc-common-3.1.2.jar
+framework/base/lib/xmlrpc-server-3.1.2.jar
+framework/catalina/lib/tomcat-7.0.47-catalina-ha.jar
+framework/catalina/lib/tomcat-7.0.47-catalina-tribes.jar
+framework/catalina/lib/tomcat-7.0.47-tomcat-embed-core.jar
+framework/catalina/lib/tomcat-7.0.47-tomcat-embed-jasper.jar
+framework/catalina/lib/tomcat-7.0.47-tomcat-embed-logging-log4j.jar
+framework/entity/lib/commons-dbcp-1.4.jar
+framework/entity/lib/jdbc/derby-10.8.2.2.jar
+framework/entity/lib/jdbc/derbytools-10.8.2.2.jar
+framework/jcr/lib/concurrent-1.3.4.jar
+framework/jcr/lib/jackrabbit-api-2.5.1.jar
+framework/jcr/lib/jackrabbit-core-2.5.1.jar
+framework/jcr/lib/jackrabbit-jca-2.5.1.jar
+framework/jcr/lib/jackrabbit-jcr-commons-2.5.1.jar
+framework/jcr/lib/jackrabbit-ocm-2.0.jar
+framework/jcr/lib/jackrabbit-spi-2.5.1.jar
+framework/jcr/lib/jackrabbit-spi-commons-2.5.1.jar
+framework/jcr/lib/jcr-2.0.jar
+framework/jcr/lib/tagsoup-1.2.1.jar
+framework/jcr/lib/tika-core-1.0.jar
+framework/jcr/lib/tika-parsers-1.0.jar
+framework/service/lib/axis-ant-1.4.jar
+framework/service/lib/axis-1.4.jar
+framework/service/lib/axiom-api-1.2.9.jar
+framework/service/lib/axiom-impl-1.2.9.jar
+framework/service/lib/axis2-kernel-1.5.2.jar
+framework/service/lib/axis2-transport-http-1.5.2.jar
+framework/service/lib/axis2-transport-local-1.5.2.jar
+framework/service/lib/commons-httpclient-3.1.jar
+framework/service/lib/neethi-2.0.4.jar
+framework/service/lib/XmlSchema-1.4.3.jar
+framework/webapp/lib/fop-1.1.jar
+framework/webapp/lib/velocity-1.6.1.jar
+framework/webapp/lib/xmlgraphics-commons-1.5.jar
+framework/webapp/lib/json-lib-2.2.3-jdk15.jar
+framework/webapp/lib/ezmorph-0.9.1.jar
+framework/webapp/lib/rome-0.9.jar
+framework/webapp/lib/serializer-2.7.0.jar
+framework/webapp/lib/xalan-2.7.1.jar
+framework/geronimo/lib/geronimo-connector-2.1.1.jar
+framework/geronimo/lib/geronimo-transaction-2.1.1.jar
+framework/testtools/lib/org.springframework.core-3.1.0.M2.jar
+framework/testtools/lib/org.springframework.test-3.1.0.M2.jar
+framework/testtools/lib/org.springframework.web-3.1.0.M2.jar
+applications/content/lib/fontbox-1.7.1.jar
+applications/content/lib/jempbox-1.7.1.jar
+applications/content/lib/pdfbox-1.7.1.jar
+applications/content/lib/poi-3.9-20121203.jar
+applications/content/lib/tika-core-1.0.jar
+applications/content/lib/tika-parsers-1.0.jar
+applications/product/lib/dozer-4.2.1.jar
+applications/product/lib/watermarker-0.0.4.jar
+framework/images/webapp/images/date/timezones*
 =========================================================================
                                  Apache License
                            Version 2.0, January 2004
@@ -338,8 +337,8 @@ ofbiz/trunk/specialpurpose/googlecheckou
 =========================================================================
 The following libraries distributed with Apache OFBiz are licensed under the
 Apache Software License:
-ofbiz/trunk/framework/webapp/lib/DataVision-1.0.0.jar
-ofbiz/trunk/framework/base/lib/ant/ant-contrib-1.0b3.jar
+framework/webapp/lib/DataVision-1.0.0.jar
+framework/base/lib/ant/ant-contrib-1.0b3.jar
 =========================================================================
 Apache Software License
 
@@ -396,7 +395,7 @@ Illinois, Urbana-Champaign.
 =========================================================================
 The following libraries distributed with Apache OFBiz are licensed under the
 JDOM (Modified Apache)  License:
-ofbiz/trunk/framework/webapp/lib/jdom-1.1.jar
+framework/webapp/lib/jdom-1.1.jar
 =========================================================================
 The JDOM License
  Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
@@ -452,27 +451,25 @@ 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.19-null-wildcards.jar
-ofbiz/trunk/framework/base/lib/hamcrest-all-1.2.jar
-ofbiz/trunk/framework/base/lib/httpunit-1.7.jar
-ofbiz/trunk/framework/base/lib/ical4j-1.0-rc2.jar
-ofbiz/trunk/lib/build/javacc/javacc.jar (5.0)
-ofbiz/trunk/framework/base/lib/javolution-5.4.3.jar
-ofbiz/trunk/framework/base/lib/xpp3_min-1.1.4c.jar
-ofbiz/trunk/framework/base/lib/xstream-1.3.1.jar
-ofbiz/trunk/framework/base/lib/owasp-esapi-full-java-1.4.jar
-ofbiz/trunk/framework/base/lib/scripting/antlr-2.7.6.jar
-ofbiz/trunk/framework/base/lib/scripting/asm-3.2.jar
-ofbiz/trunk/framework/base/lib/scripting/asm-analysis-3.2.jar
-ofbiz/trunk/framework/base/lib/scripting/asm-tree-3.2.jar
-ofbiz/trunk/framework/base/lib/scripting/asm-util-3.2.jar
-ofbiz/trunk/framework/base/lib/scripting/janino-2.5.15.jar
-ofbiz/trunk/framework/base/lib/scripting/jline-0.9.94.jar
-ofbiz/trunk/specialpurpose/ldap/lib/cas-server-core-3.3.jar
-ofbiz/trunk/specialpurpose/pos/lib/looks-2.0.2.jar
+applications/content/lib/dom4j-1.6.1.jar
+framework/base/lib/antisamy-bin.1.2.jar
+framework/base/lib/bsh-engine-modified.jar
+framework/base/lib/freemarker-2.3.19-null-wildcards.jar
+framework/base/lib/hamcrest-all-1.2.jar
+framework/base/lib/httpunit-1.7.jar
+framework/base/lib/ical4j-1.0-rc2.jar
+lib/build/javacc/javacc.jar (5.0)
+framework/base/lib/javolution-5.4.3.jar
+framework/base/lib/xpp3_min-1.1.4c.jar
+framework/base/lib/xstream-1.3.1.jar
+framework/base/lib/owasp-esapi-full-java-1.4.jar
+framework/base/lib/scripting/antlr-2.7.6.jar
+framework/base/lib/scripting/asm-3.2.jar
+framework/base/lib/scripting/asm-analysis-3.2.jar
+framework/base/lib/scripting/asm-tree-3.2.jar
+framework/base/lib/scripting/asm-util-3.2.jar
+framework/base/lib/scripting/janino-2.5.15.jar
+framework/base/lib/scripting/jline-0.9.94.jar
 
 =========================================================================
 The BSD License
@@ -529,9 +526,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 =========================================================================
 The following libraries distributed with Apache OFBiz are licensed under the
 Mozilla Public License Version 1.1:
-ofbiz/trunk/specialpurpose/pos/lib/XuiCoreSwing-v3.2rc2b.jar
-ofbiz/trunk/specialpurpose/pos/lib/XuiOptional-v3.2rc2b.jar
-ofbiz/trunk/framework/webapp/lib/iText-2.1.7.jar
+framework/webapp/lib/iText-2.1.7.jar
 =========================================================================
                           MOZILLA PUBLIC LICENSE
                                 Version 1.1
@@ -1006,10 +1001,8 @@ EXHIBIT A -Mozilla Public License.
 =========================================================================
 The following libraries distributed with Apache OFBiz are licensed under the
 Common Public License:
-ofbiz/trunk/specialpurpose/pos/lib/jcl.jar
-ofbiz/trunk/specialpurpose/pos/lib/jpos18-controls.jar
-ofbiz/trunk/framework/service/lib/wsdl4j-1.6.2.jar
-ofbiz/trunk/framework/base/lib/junit-dep-4.10.jar
+framework/service/lib/wsdl4j-1.6.2.jar
+framework/base/lib/junit-dep-4.10.jar
 =========================================================================
 Common Public License Version 1.0
 
@@ -1228,11 +1221,12 @@ any resulting litigation.
 =========================================================================
 The following libraries distributed with Apache OFBiz are licensed under the
 MIT/X License:
-ofbiz/trunk/framework/base/lib/icu4j-49_1.jar
-ofbiz/trunk/framework/base/lib/jcl-over-slf4j-1.6.4.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/*
+framework/base/lib/icu4j-49_1.jar
+framework/base/lib/jcl-over-slf4j-1.6.4.jar
+framework/base/lib/slf4j-api-1.6.4.jar
+framework/base/lib/slf4j-log4j12-1.6.4.jar
+framework/images/webapp/images/jquery/*
+framework/images/webapp/images/date/date.format-1.2.3*.js
 =========================================================================
 The MIT License
 
@@ -1259,7 +1253,7 @@ THE SOFTWARE.
 =========================================================================
 The following libraries distributed with Apache OFBiz are licensed under the
 Sun Public License:
-ofbiz/trunk/framework/base/lib/scripting/bsh-2.0b4.jar
+framework/base/lib/scripting/bsh-2.0b4.jar
 =========================================================================
 SUN PUBLIC LICENSE Version 1.0
 
@@ -1735,7 +1729,7 @@ Exhibit A -Sun Public License Notice.
 
 =========================================================================
 The Jython library is licensed under the BeOpen/CNRI as follows.
-ofbiz/trunk/framework/base/lib/scripting/jython-nooro.jar
+framework/base/lib/scripting/jython-nooro.jar
 =========================================================================
 Jython changes Software License.
 =========================================================================
@@ -1860,7 +1854,7 @@ JPython version 1.1.x
 =========================================================================
 The JDBM library is licensed under the JDBM LICENSE v1.00 as follows.
 This license is nearly equivalent to the BSD License.
-ofbiz/trunk/framework/base/lib/jdbm-1.0-SNAPSHOT.jar
+framework/base/lib/jdbm-1.0-SNAPSHOT.jar
 =========================================================================
 /**
  * JDBM LICENSE v1.00
@@ -1911,16 +1905,8 @@ ofbiz/trunk/framework/base/lib/jdbm-1.0-
 =========================================================================
 The following library distributed with Apache OFBiz is licensed under the
 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-1.4.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
-ofbiz/trunk/specialpurpose/ebaystore/lib/ebaycalls.jar
+framework/base/lib/juel-2.1.1.jar (contains the javax.el package)
+framework/base/lib/mail-1.4.jar
 =========================================================================
 COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 1.
 
@@ -2210,103 +2196,9 @@ Courts of the Northern District of Calif
 of California, with venue lying in Santa Clara County, California.
 
 =========================================================================
-Apache OFBiz includes the XML Schema files from the Open Applications Group, Inc
-NOTE: these files and the license are for an older version of the OAGIS
-specification, namely version 7.2.1.
-ofbiz/specialpurpose/oagis/dtd/002_confirm_bod_004.xsd
-ofbiz/specialpurpose/oagis/dtd/068_sync_inventory_005.xsd
-ofbiz/specialpurpose/oagis/dtd/161_show_shipment_005.xsd
-ofbiz/specialpurpose/oagis/dtd/161B_process_shipment_001.xsd
-ofbiz/specialpurpose/oagis/dtd/196_acknowledge_delivery_001.xsd
-ofbiz/specialpurpose/oagis/dtd/197_receive_delivery_001.xsd
-ofbiz/specialpurpose/oagis/dtd/oagis_fields.xsd
-ofbiz/specialpurpose/oagis/dtd/oagis_segments.xsd
-Open Applications Group Xml Schema is licensed as follows:
-=========================================================================
-Copyright (c) 1998-2001 Open Applications Group, Inc. All Rights Reserved
-
-Documents and resource files on the Open Applications Group, Inc. Internet site are
-provided under the following license.  By obtaining, using, and/or copying this file,
-or any related file obtained from this site, you agree that you have read, understood,
-and will comply with the following terms and conditions:
-
-Permissions to use, copy, and distribute the contents of this file, in any medium
-for any purpose and without fee or royalty is hereby granted, provided that you
-include the following on ALL copies of the file that you use:
-
-1. A reference to the original Open Applications Group resource
-2. A notice of the form "Copyright (c) Open Applications Group. All Rights Reserved
-
-When space permits, inclusion of the full text of this NOTICE should be provided.
-Attribution is requested to be provided in any software, documentation, or other items
-or products that you create related to the implementation of the contents of this file.
-
-THIS RESOURCE IS PROVIDED AS IS, AND THE COPYRIGHT HOLDER MAKES NO REPRESENTATIONS
-OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT
-THE CONTENTS OF THE DOCUMENT ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION
-OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR
-OTHER RIGHTS.
-THE COPYRIGHT HOLDER WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE DOCUMENT OR THE PERFORMANCE OR
-IMPLEMENTATION OF THE CONTENTS THEREOF.
-
-The name and trademarks of copyright holder may NOT be used in advertising or publicity
-pertaining to this file or its contents without specific, written prior permission.
-
-Title to copyright in this document will at all times remain with copyright holders.
-
-Please Note: This file is a work in process, and may be modified or enhanced, at the
-discretion of the Open Applications Group without notice, at any time.
-Please contact the Open Applications Group at www.openapplications.org with any
-questions or comments regarding the usage of this material.
-
-=========================================================================
 The following libraries distributed with Apache OFBiz are licensed under the
 Eclipse Public License - v 1.0:
-ofbiz/trunk/specialpurpose/birt/lib/flute.jar
-ofbiz/trunk/specialpurpose/birt/lib/jaxrpc.jar
-ofbiz/trunk/specialpurpose/birt/lib/js.jar
-ofbiz/trunk/specialpurpose/birt/lib/org.apache.xml.resolver_1.2.0.v201005080400.jar
-ofbiz/trunk/specialpurpose/birt/lib/org.apache.xml.serializer_2.7.1.v201005080400.jar
-ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.birt.runtime_3.7.2.v20120214-1408.jar
-ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar
-ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.core.expressions_3.4.300.v20110228.jar
-ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.core.filesystem_1.3.100.v20110423-0524.jar
-ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.core.jobs_3.5.101.v20120113-1953.jar
-ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.core.resources_3.7.101.v20120125-1505.jar
-ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.core.runtime_3.7.0.v20110110.jar
-ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.datatools.connectivity.oda_3.3.3.v201110130935.jar
-ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.emf_2.6.0.v20120123-1045.jar
-ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.emf.common_2.7.0.v20120123-0926.jar
-ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.emf.ecore_2.7.0.v20120123-0926.jar
-ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.emf.ecore.change_2.7.1.v20120123-0926.jar
-ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.emf.ecore.xmi_2.7.0.v20120123-0926.jar
-ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.equinox.app_1.3.100.v20110321.jar
-ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.equinox.common_3.6.0.v20110523.jar
-ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.equinox.preferences_3.4.2.v20120111-2020.jar
-ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.equinox.registry_3.5.101.R37x_v20110810-1611.jar
-ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.osgi_3.7.2.v20120110-1415.jar
-ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.osgi.services_3.3.0.v20110513.jar
-ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.update.configurator_3.3.100.v20100512.jar
-ofbiz/trunk/specialpurpose/birt/lib/org.w3c.css.sac_1.3.0.v200805290154.jar
-ofbiz/trunk/specialpurpose/birt/lib/org.w3c.dom.smil_1.0.0.v200806040011.jar
-ofbiz/trunk/specialpurpose/birt/lib/org.w3c.dom.svg_1.1.0.v201011041433.jar
-ofbiz/trunk/specialpurpose/birt/lib/saaj.jar
-ofbiz/trunk/specialpurpose/birt/lib/Tidy.jar
-ofbiz/trunk/specialpurpose/birt/lib/viewservlets.jar
-ofbiz/trunk/framework/catalina/lib/ecj-3.7.2.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
+framework/catalina/lib/ecj-4.2.2.jar
 =========================================================================
 Eclipse Public License - v 1.0
 
@@ -2520,56 +2412,9 @@ after the cause of action arose. Each pa
 any resulting litigation.
 
 =========================================================================
-Apache Ofbiz includes docbook templates in the /applications/content/template/docbook
-directory with the following licence:
-Copyright
----------
-Copyright (C) 1999-2007 Norman Walsh
-Copyright (C) 2003 Jiří Kosek
-Copyright (C) 2004-2007 Steve Ball
-Copyright (C) 2005-2008 The DocBook Project
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the ``Software''), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-Except as contained in this notice, the names of individuals
-credited with contribution to this software shall not be used in
-advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization
-from the individuals in question.
-
-Any stylesheet derived from this Software that is publically
-distributed will be identified with a different name and the
-version strings in any derived Software will be changed so that
-no possibility of confusion between the derived package and this
-Software will exist.
-
-Warranty
---------
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT.  IN NO EVENT SHALL NORMAN WALSH OR ANY OTHER
-CONTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Contacting the Author
----------------------
 The DocBook XSL stylesheets are maintained by Norman Walsh,
 <nd...@nwalsh.com>, and members of the DocBook Project,
 <do...@sf.net>
-=========================================================================
 The docbook schemas in the files docbook.xsd, docbook.dtd xlink.xsd
 and xml.xsd are distributed under the GNU Free Documentation License
 GNU Free Documentation License
@@ -2577,11 +2422,14 @@ It was allowed by the author to use the 
 Apache OFBiz system in an email to H.Bakker from N.Walsh dd
 Tue, 25 Aug 2009 07:27:51 -0400 (18:27 ICT)
 =========================================================================
+The following libraries are licensed under the Creative Commons Attribution 
+2.5 License:
+jcip-annotations-1.0.jar
+
 Apache Ofbiz includes images in the ofbiz/framework/images/webapp/images/icons
 directory with the following licence: Creative Commons Attribution 2.5 License
 and condition :
 
-
 =========================================================================
 Creative Commons Attribution 2.5 License.
 http://creativecommons.org/licenses/by/2.5/
@@ -2792,4 +2640,50 @@ OF SUCH DAMAGES.
      Licensor shall not be bound by any additional provisions that may appear
      in any communication from You. This License may not be modified without
      the mutual written agreement of the Licensor and You.
+=========================================================================
+Web-based Help from DocBook XML license
+David Cramer <dcramer AT motive DOT com><david AT thingbag DOT net>
+Kasun Gajasinghe <kasunbg AT gmail DOT com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software 
+and associated documentation files (the Software), to deal in the Software without restriction, 
+including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, 
+subject to the following conditions:
+
+    * The above copyright notice and this permission notice shall be included in all copies or substantial 
+    portions of the Software.
+    * Except as contained in this notice, the names of individuals credited with contribution to this software 
+    shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software 
+    without prior written authorization from the individuals in question.
+    * Any stylesheet derived from this Software that is publicly distributed will be identified with a different 
+    name and the version strings in any derived Software will be changed so that no possibility of confusion 
+    between the derived package and this Software will exist.
+
+Warranty: THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE 
+AND NONINFRINGEMENT. IN NO EVENT SHALL DAVID CRAMER, KASUN GAJASINGHE, OR ANY OTHER CONTRIBUTOR 
+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+This package is maintained by Kasun Gajasinghe, <kasunbg AT gmail DOT com> and David Cramer, <david AT thingbag DOT net>.
+
+This package also includes the following software written and copyrighted by others:
+
+This package also includes the following software written and copyrighted by others:
+    * Files in template/common/jquery are copyrighted by JQuery under the MIT License. 
+      The file jquery.cookie.js Copyright (c) 2006 Klaus Hartl under the MIT license.
+    * Some files in the template/content/search and indexer directories were originally 
+      part of N. Quaine's htmlsearch DITA plugin. The htmlsearch DITA plugin is 
+      available from the files page of the DITA-users yahoogroup. 
+      The htmlsearch plugin was released under a BSD-style license. 
+      See indexer/license.txt for details.
+    * Stemmers from the Snowball project released under a BSD license.
+    * Code from the Apache Lucene search engine provides support for tokenizing Chinese, 
+      Japanese, and Korean content released under the Apache 2.0 license.
+    * Code that provides weighted search results and some other improvements was graciously 
+      donated by SyncRO Soft Ltd., the publishers of the oXygen XML Editor.
+    * Cosmetic improvements provided by OpenStack.
+
+Webhelp for DocBook was developed as a Google Summer of Code project. August 2010