cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject svn commit: r1573205 [1/5] - in /cocoon/branches/BRANCH_2_1_X-dojo1_1: ./ legal/ lib/ lib/core/ lib/endorsed/ lib/optional/ misc/notes/ src/blocks/auth/java/org/apache/cocoon/auth/ src/blocks/batik/java/org/apache/cocoon/serialization/ src/blocks/batik...
Date Sat, 01 Mar 2014 18:02:20 GMT
Author: ilgrosso
Date: Sat Mar  1 18:02:14 2014
New Revision: 1573205

URL: http://svn.apache.org/r1573205
Log:
Merging 5.5 years - who said Subversion is antiquate?

Added:
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/LICENSE.txt
      - copied unchanged from r1573202, cocoon/branches/BRANCH_2_1_X/legal/LICENSE.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/NOTICE.txt
      - copied unchanged from r1573202, cocoon/branches/BRANCH_2_1_X/legal/NOTICE.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/lib/core/servlet-2.3.jar
      - copied unchanged from r1573202, cocoon/branches/BRANCH_2_1_X/lib/core/servlet-2.3.jar
    cocoon/branches/BRANCH_2_1_X-dojo1_1/lib/core/slf4j-api-1.6.4.jar
      - copied unchanged from r1573202, cocoon/branches/BRANCH_2_1_X/lib/core/slf4j-api-1.6.4.jar
    cocoon/branches/BRANCH_2_1_X-dojo1_1/lib/core/xml-commons-resolver-1.2.jar
      - copied unchanged from r1573202, cocoon/branches/BRANCH_2_1_X/lib/core/xml-commons-resolver-1.2.jar
    cocoon/branches/BRANCH_2_1_X-dojo1_1/lib/endorsed/xercesImpl-2.11.0.jar
      - copied unchanged from r1573202, cocoon/branches/BRANCH_2_1_X/lib/endorsed/xercesImpl-2.11.0.jar
    cocoon/branches/BRANCH_2_1_X-dojo1_1/lib/endorsed/xml-apis-1.4.01.jar
      - copied unchanged from r1573202, cocoon/branches/BRANCH_2_1_X/lib/endorsed/xml-apis-1.4.01.jar
    cocoon/branches/BRANCH_2_1_X-dojo1_1/lib/endorsed/xml-apis-ext-1.4.01.jar
      - copied unchanged from r1573202, cocoon/branches/BRANCH_2_1_X/lib/endorsed/xml-apis-ext-1.4.01.jar
    cocoon/branches/BRANCH_2_1_X-dojo1_1/lib/optional/batik-all-1.7.jar
      - copied unchanged from r1573202, cocoon/branches/BRANCH_2_1_X/lib/optional/batik-all-1.7.jar
    cocoon/branches/BRANCH_2_1_X-dojo1_1/lib/optional/fop-1.0.jar
      - copied unchanged from r1573202, cocoon/branches/BRANCH_2_1_X/lib/optional/fop-1.0.jar
    cocoon/branches/BRANCH_2_1_X-dojo1_1/lib/optional/xmlgraphics-commons-1.5.jar
      - copied unchanged from r1573202, cocoon/branches/BRANCH_2_1_X/lib/optional/xmlgraphics-commons-1.5.jar
    cocoon/branches/BRANCH_2_1_X-dojo1_1/misc/notes/
      - copied from r1573202, cocoon/branches/BRANCH_2_1_X/misc/notes/
    cocoon/branches/BRANCH_2_1_X-dojo1_1/misc/notes/review-jars.txt
      - copied unchanged from r1573202, cocoon/branches/BRANCH_2_1_X/misc/notes/review-jars.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/batik/java/org/apache/cocoon/serialization/AbstractDOMSerializer.java
      - copied unchanged from r1573202, cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/serialization/AbstractDOMSerializer.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/fop/java/org/apache/cocoon/components/
      - copied from r1573202, cocoon/branches/BRANCH_2_1_X/src/blocks/fop/java/org/apache/cocoon/components/
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/fop/java/org/apache/cocoon/components/renderer/
      - copied from r1573202, cocoon/branches/BRANCH_2_1_X/src/blocks/fop/java/org/apache/cocoon/components/renderer/
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/fop/java/org/apache/cocoon/components/renderer/ExtendableRendererFactory.java
      - copied unchanged from r1573202, cocoon/branches/BRANCH_2_1_X/src/blocks/fop/java/org/apache/cocoon/components/renderer/ExtendableRendererFactory.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/fop/java/org/apache/cocoon/components/renderer/RendererFactory.java
      - copied unchanged from r1573202, cocoon/branches/BRANCH_2_1_X/src/blocks/fop/java/org/apache/cocoon/components/renderer/RendererFactory.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/java/org/apache/cocoon/util/log/SLF4JLoggerAdapter.java
      - copied unchanged from r1573202, cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/log/SLF4JLoggerAdapter.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/java/org/apache/cocoon/util/log/SLF4JLoggerManager.java
      - copied unchanged from r1573202, cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/log/SLF4JLoggerManager.java
Removed:
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/ant-contrib-0.6.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/ant-junit.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/ant-launcher.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/ant-trax.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/ant.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/antlr-2.7.6.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/asm-2.2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/asm-util-2.2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/avalon-framework-api-4.3.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/avalon-framework-impl-4.3.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/avalon-logkit-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/axis-1.4.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/axis-jaxrpc-1.4.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/axis-saaj-1.4.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/batik-all-1.6.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/bsf-2.4.0.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/castor-0.9.6-xml.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/chaperon-20040205.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/commons-beanutils-core-1.7.0.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/commons-cli-1.0.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/commons-codec-1.3.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/commons-collections-3.2.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/commons-dbcp-1.2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/commons-digester-1.7.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/commons-discovery-0.2.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/commons-el-1.0.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/commons-httpclient-2.0.2.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/commons-io-1.3.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/commons-jexl-1.0.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/commons-jxpath-1.2.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/commons-lang-2.4.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/commons-logging-1.0.4.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/commons-pool-1.2.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/commons-transaction-1.0.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/concurrent-1.3.4.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/daisy-htmlcleaner-1.4.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/daisy-util-1.4.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/db-ojb-1.0.4.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/deli-x050330.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/dojo-rsrc-0.4.3.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/easymock-1.1.jar.license.html
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/ehcache-1.2.3.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/excalibur-component-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/excalibur-datasource-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/excalibur-i18n-1.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/excalibur-instrument-api-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/excalibur-instrument-client-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/excalibur-instrument-mgr-api-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/excalibur-instrument-mgr-http-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/excalibur-instrument-mgr-impl-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/excalibur-logger-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/excalibur-naming-1.0.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/excalibur-pool-api-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/excalibur-pool-impl-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/excalibur-pool-instrumented-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/excalibur-sourceresolve-2.2.3.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/excalibur-store-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/excalibur-xmlutil-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/fop-0.20.5.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/geronimo-spec-activation-1.0.2-rc4.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/geronimo-spec-javamail-1.3.1-rc5.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/geronimo-spec-jms-1.1-rc3.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/geronimo-spec-jta-1.0.1B-rc3.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/groovy-1.0-jsr-05.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/hsqldb-1.8.0.7.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/htmlarea.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/icu4j-2.8.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/itext-1.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/jackrabbit-core-1.0.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/jakarta-bcel-20040329.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/jakarta-oro-2.0.8.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/jakarta-regexp-1.5.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/jakarta-slide-webdavlib-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/jcs-1.2.5-dev-20050313.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/jdbi-1.3.1.jar.licence.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/jdom-1.0.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/jdtcore-3.0.2.jar.license.html
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/jena-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/jetty-4.2.23.jar.license.html
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/jfor-0.7.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/jing-20030619.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/joost-20040330.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/js-1.6R5.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/jsp-api-2.0.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/jtidy-04aug2000r7-dev.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/junit-3.8.2.jar.license.html
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/log4j-1.2.14.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/lucene-1.4.3.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/midi-license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/myfaces-api-r233484.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/myfaces-impl-r233484.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/nekodtd-0.1.11.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/nekohtml-0.9.5.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/pizza-1.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/pluto-1.0.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/poi-2.5.1-final-20040804.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/portals-bridges-common-1.0.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/portlet-api-1.0.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/qdox-1.5.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/quartz-1.5.2.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/servlet-2.3.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/servlet_2_2.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/slide-kernel-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/slide-stores-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/slide-webdavservlet-2.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/spark.fpl.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/spark.opl.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/velocity-1.4.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/wsdl4j-1.5.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/xalan-2.7.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/xercesImpl-2.9.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/xindice-1.1b4.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/xml-apis-1.3.04.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/xml-commons-resolver-1.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/xmldb-api-20030701.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/xmldb-common-20030701.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/xmldb-xupdate-20040205.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/xmlrpc-1.1.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/xmlunit1.0.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/legal/xreporter-expression-20040701.jar.license.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/lib/core/servlet_2_2.jar
    cocoon/branches/BRANCH_2_1_X-dojo1_1/lib/core/xml-commons-resolver-1.1.jar
    cocoon/branches/BRANCH_2_1_X-dojo1_1/lib/endorsed/xercesImpl-2.9.1.jar
    cocoon/branches/BRANCH_2_1_X-dojo1_1/lib/endorsed/xml-apis-1.3.04.jar
    cocoon/branches/BRANCH_2_1_X-dojo1_1/lib/optional/batik-all-1.6.jar
    cocoon/branches/BRANCH_2_1_X-dojo1_1/lib/optional/fop-0.20.5.jar
    cocoon/branches/BRANCH_2_1_X-dojo1_1/tools/jetty/lib/servlet-2.3.jar
Modified:
    cocoon/branches/BRANCH_2_1_X-dojo1_1/   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/CREDITS.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/INSTALL.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/KEYS
    cocoon/branches/BRANCH_2_1_X-dojo1_1/NOTICE.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/README.txt
    cocoon/branches/BRANCH_2_1_X-dojo1_1/build.bat
    cocoon/branches/BRANCH_2_1_X-dojo1_1/build.sh
    cocoon/branches/BRANCH_2_1_X-dojo1_1/cocoon.bat
    cocoon/branches/BRANCH_2_1_X-dojo1_1/cocoon.sh
    cocoon/branches/BRANCH_2_1_X-dojo1_1/forrest.properties
    cocoon/branches/BRANCH_2_1_X-dojo1_1/gump.xml
    cocoon/branches/BRANCH_2_1_X-dojo1_1/lib/jars.xml
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/auth/java/org/apache/cocoon/auth/ApplicationUtil.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/batik/java/org/apache/cocoon/serialization/SVGSerializer.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/batik/samples/samples.xml
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/captcha/java/org/apache/cocoon/reading/CaptchaReader.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/captcha/samples/sitemap.xmap
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/cron/samples/docs.xml
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/java/org/apache/cocoon/databases/ibatis/ExcaliburDataSourceFactory.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/mod-db/edit-groups.xsp
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/mod-db/file-upload-blob.xsp
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/mod-db/user-list.xsp
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/org-db/add-department.xsp
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/org-db/add-employee.xsp
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/org-db/employee.xsp
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/org-db/process-department.xsp
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/org-db/process-employee.xsp
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/samples.xml
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/transform/sql-page.xml
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/transform/sql-page2.xml
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/transform/sql-page3.xml
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/xsp/esql.xsp
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/fop/java/org/apache/cocoon/serialization/FOPSerializer.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/fop/samples/misc/samples.xml
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/java/org/apache/cocoon/forms/binding/RepeaterAdapter.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/java/org/apache/cocoon/forms/binding/RepeaterJXPathAdapter.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/java/org/apache/cocoon/forms/binding/RepeaterJXPathCollection.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/java/org/apache/cocoon/forms/binding/TreeModelJXPath.java   (contents, props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/java/org/apache/cocoon/forms/binding/TreeModelJXPathBuilder.java   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/EnhancedRepeater.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Messages.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/RepeaterActionDefinition.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/resources/org/apache/cocoon/forms/resources/forms-advanced-field-styling.xsl
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/resources/org/apache/cocoon/forms/resources/js/DropdownDateTimePicker.js
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/resources/org/apache/cocoon/forms/resources/js/MultiValueEditorWithSuggestion.js
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/resources/org/apache/cocoon/forms/resources/js/templates/InfoPopup.html   (contents, props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/resources/org/apache/cocoon/forms/resources/js/templates/MultiValueDoubleList.html
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/resources/org/apache/cocoon/forms/resources/js/templates/MultiValueEditor.html   (contents, props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/resources/org/apache/cocoon/forms/resources/js/templates/MultiValueEditorWithSuggestion.html
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/resources/org/apache/cocoon/forms/system/i18n/messages_pt_BR.xml   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/contactsjson.xml
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/html/java/org/apache/cocoon/components/NekoHtmlSaxParser.java   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/html/java/org/apache/cocoon/transformation/HTMLTransformer.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/imageop/samples/dir2page.xsl
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/versions/data/dead/beef/facebabecafebabecafebabe/.node.xml
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/versions/data/dead/beef/facebabecafebabecafebabe/672388333465d36a71297afb5d46001f.xml
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/cafe/babe/cafebabecafebabecafebabe/.node.xml
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/cafe/babe/cafebabecafebabecafebabe/672388333465d36a71297afb5d46001f.xml
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/dead/beef/cafebabecafebabecafebabe/.node.xml
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/dead/beef/cafebabecafebabecafebabe/672388333465d36a71297afb5d46001f.xml
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/dead/beef/cafecafecafebabecafebabe/.node.xml
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/dead/beef/cafecafecafebabecafebabe/672388333465d36a71297afb5d46001f.xml
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/dead/beef/facebabecafebabecafebabe/.node.xml
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/jcr/samples/repotest/workspaces/default/data/dead/beef/facebabecafebabecafebabe/672388333465d36a71297afb5d46001f.xml
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/mail/java/org/apache/cocoon/mail/transformation/SendMailTransformer.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/mail/samples/mail/docs/mid-col-2/asciiart-generator.xml
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/mail/samples/samples.xml
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/mail/samples/sendmail/done.xml
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/mail/samples/sendmail/form.xml
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/mail/samples/sendmail/sendmail_xsp.xml
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/conf/addressbook.xconf   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/conf/naming.xsamples   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/flow/AddressbookManager.js   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/flow/flow.js   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/forms/person-binding.xml   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/forms/person-model.xml   (contents, props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/forms/person-template.xml   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/i18n/addressbook.xml   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/resources/contact.ldif   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/resources/directory.ldif   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/resources/slapd.conf   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/screens/departments.xml   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/screens/error.xml   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/screens/people.xml   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/screens/person.xml   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/sitemap.xmap   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/styles/addressbook.css   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/welcome.xml   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/xslt/forms.xsl   (contents, props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/naming/samples/xslt/page2html.xsl   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/ojb/build.xml
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/portal/conf/portal.samplesxconf
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/portal/conf/portal.xconf
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/portal/mocks/javax/servlet/http/HttpServletRequestWrapper.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/portal/mocks/javax/servlet/http/HttpServletResponseWrapper.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/repository/java/org/apache/cocoon/components/repository/SourceRepositoryImpl.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/repository/java/org/apache/cocoon/components/source/helpers/DelaySourceRefresher.java   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/repository/java/org/apache/cocoon/components/source/helpers/SourceRefresher.java   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/repository/java/org/apache/cocoon/components/source/impl/CachedSourceResponse.java   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/repository/java/org/apache/cocoon/components/source/impl/CachingSource.java   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/repository/java/org/apache/cocoon/components/source/impl/CachingSourceFactory.java   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/repository/java/org/apache/cocoon/components/source/impl/InspectableTraversableCachingSource.java   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/repository/java/org/apache/cocoon/components/source/impl/TraversableCachingSource.java   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/EncodingSerializer.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/HTMLSerializer.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/XHTMLSerializer.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/encoding/CharsetFactory.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/encoding/XHTMLEncoder.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/template/resources/META-INF/license.txt   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/template/resources/META-INF/notice.txt   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/web3/samples/samples.xml
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/webdav/samples/samples.xml
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/SOAPHelper.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/xsp/samples/java/java5.xsp   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/java/org/apache/cocoon/bean/CocoonBean.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/java/org/apache/cocoon/cocoon.properties
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/java/org/apache/cocoon/components/modules/input/XPathXMLFileModule.java   (contents, props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/java/org/apache/cocoon/environment/commandline/AbstractCommandLineEnvironment.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/java/org/apache/cocoon/environment/commandline/FileSavingEnvironment.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/java/org/apache/cocoon/environment/commandline/LinkSamplingEnvironment.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/java/org/apache/cocoon/environment/http/HttpEnvironment.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/java/org/apache/cocoon/environment/http/HttpRequest.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/java/org/apache/cocoon/reading/ImageReader.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/java/org/apache/cocoon/reading/ResourceReader.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/java/org/apache/cocoon/selection/HostSelector.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/java/org/apache/cocoon/selection/NamedPatternsSelector.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/java/org/apache/cocoon/servlet/CocoonServlet.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/java/org/apache/cocoon/transformation/I18nTransformer.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/java/org/apache/cocoon/transformation/StripNameSpacesTransformer.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/java/org/apache/cocoon/xml/XMLBaseSupport.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/test/org/apache/cocoon/SitemapComponentTestCase.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/test/org/apache/cocoon/caching/CachingOutputStreamTestCase.java   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/test/org/apache/cocoon/components/source/impl/ZipSourceTestCase.xtest   (contents, props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/test/org/apache/cocoon/selection/HostSelectorTestCase.java
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/test/org/apache/cocoon/selection/HostSelectorTestCase.xtest
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/test/org/apache/cocoon/transformation/xinclude-result-1.xml
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/test/org/apache/cocoon/util/BufferedOutputStreamTestCase.java   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/webapp/samples/catalog/catalog-demo.xml
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/webapp/samples/common/style/xsl/html/simple-page2html.xsl
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/webapp/samples/hello-world/style/xsl/page2fo.xsl
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/webapp/samples/imagereader/dir2page.xsl
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/webapp/samples/modules/a/forrestconf.xml   (props changed)
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/webapp/samples/protected/docs/protected.xml
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/webapp/samples/simpleform/one/ERROR.xsp
    cocoon/branches/BRANCH_2_1_X-dojo1_1/src/webapp/samples/simpleform/one/OK.xsp
    cocoon/branches/BRANCH_2_1_X-dojo1_1/status.xml
    cocoon/branches/BRANCH_2_1_X-dojo1_1/tools/bin/ant
    cocoon/branches/BRANCH_2_1_X-dojo1_1/tools/bin/ant.bat
    cocoon/branches/BRANCH_2_1_X-dojo1_1/tools/bin/ant.cmd
    cocoon/branches/BRANCH_2_1_X-dojo1_1/tools/bin/antRun
    cocoon/branches/BRANCH_2_1_X-dojo1_1/tools/bin/antRun.bat
    cocoon/branches/BRANCH_2_1_X-dojo1_1/tools/bin/antRun.pl
    cocoon/branches/BRANCH_2_1_X-dojo1_1/tools/bin/antenv.cmd
    cocoon/branches/BRANCH_2_1_X-dojo1_1/tools/bin/complete-ant-cmd.pl
    cocoon/branches/BRANCH_2_1_X-dojo1_1/tools/bin/envset.cmd
    cocoon/branches/BRANCH_2_1_X-dojo1_1/tools/bin/lcp.bat
    cocoon/branches/BRANCH_2_1_X-dojo1_1/tools/bin/runant.pl
    cocoon/branches/BRANCH_2_1_X-dojo1_1/tools/bin/runant.py
    cocoon/branches/BRANCH_2_1_X-dojo1_1/tools/bin/runrc.cmd
    cocoon/branches/BRANCH_2_1_X-dojo1_1/tools/lib/ant-junit.jar
    cocoon/branches/BRANCH_2_1_X-dojo1_1/tools/lib/ant-launcher.jar
    cocoon/branches/BRANCH_2_1_X-dojo1_1/tools/lib/ant-trax.jar
    cocoon/branches/BRANCH_2_1_X-dojo1_1/tools/lib/ant.jar
    cocoon/branches/BRANCH_2_1_X-dojo1_1/tools/src/blocks-build.xsl
    cocoon/branches/BRANCH_2_1_X-dojo1_1/tools/targets/dist-build.xml
    cocoon/branches/BRANCH_2_1_X-dojo1_1/tools/targets/init-build.xml

Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Mar  1 18:02:14 2014
@@ -1,20 +1,21 @@
-bin
-build
-dist
-prj.el
-.project
-.classpath
-*.launch
-local.build.properties
-local.blocks.properties
-cocoon.sampledata
-.DS_Store
-*.ipr
-*.iws
-*.iml
-mount-table.xml
-tomcat
-tomcat.bat
-slide
-local.blocks.*.xconf
-.settings
+local.blocks.properties
+local.blocks.*.xconf
+mount-table.xml
+*.iws
+.DS_Store
+.project
+cocoon.sampledata
+build
+local.build.properties
+.settings
+*.ipr
+tomcat.bat
+tomcat
+.classpath
+*.iml
+slide
+bin
+*.launch
+prj.el
+dist
+nbproject

Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/
------------------------------------------------------------------------------
    svn:mergeinfo = /cocoon/branches/BRANCH_2_1_X:687721-1573202

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/CREDITS.txt
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/CREDITS.txt?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/CREDITS.txt (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/CREDITS.txt Sat Mar  1 18:02:14 2014
@@ -45,58 +45,6 @@ The initial code of the official Cocoon 
 evolved from the CoWarp donation made by Carsten Ziegeler (cziegeler@osoco.org).
 
 
- Credits of included software
- ----------------------------
-
-This product includes software developed by the Apache Software Foundation 
-(http://www.apache.org/).
-
-This product includes software developed by the XML:DB Initiative 
-(http://www.xmldb.org/).
-
-This product includes software developed by the IronSmith Project 
-(http://www.ironsmith.org/).
-
-This product includes software developed by the jfor Project 
-(http://www.jfor.org).
-
-This product includes software developed by the JDOM Project 
-(http://www.jdom.org/).
-
-This product includes software developed by the OpenORB Community Project 
-(http://sourceforge.net/projects/openorb/).
-
-This product includes software developed by the Chaperon Project
-(http://www.sourceforge.net/projects/chaperon/).
-
-This product includes software developed by the Exolab Project
-(http://www.exolab.org/).
-
-This product includes software developed by ANTLR Project
-(http://www.antlr.org/)
-
-
-Portions are Copyright (c) 2001 Tivano Software GmbH
-(http://www.tivano.de). All Rights Reserved.
-
-Portions are Copyright (c) 1998-2000 World Wide Web Consortium 
-(Massachusetts Institute of Technology, Institut National de Recherche en
-Informatique et en Automatique, Keio University). All Rights Reserved.
-
-Portions are Copyright (c) 2001 Scott Robert Ladd. All rights reserved.
-
-Portions are Copyright (c) 2001, 2002 Thai Open Source Software Center Ltd.
-All rights reserved.
-
-Portions are Copyright (c) Mort Bay Consulting Pty. Ltd. All rights reserved.
-
-Portions are Copyright (c) Hewlett-Packard Company 2002. All rights reserved.
-
-Schematron portions are Copyright (c) 2000,2001 Rick Jelliffe and Academia
-Sinica Computing Center, Taiwan
-
-
-
 
                                                  The Apache Cocoon Community
                                                   http://cocoon.apache.org/

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/INSTALL.txt
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/INSTALL.txt?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/INSTALL.txt (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/INSTALL.txt Sat Mar  1 18:02:14 2014
@@ -19,7 +19,7 @@
  2) Set your JAVA_HOME environment
   
   You have to set your JAVA_HOME environment to point to the root directory of
-  the Java Virtual Machine (JDK 1.3.x or later) installed on your machine. 
+  the Java Virtual Machine (JDK 1.4.x or later) installed on your machine. 
 
   To do this simply type:
   
@@ -29,10 +29,6 @@
   your mileage may vary depending on your shell, but you know how to setup 
   environments, right?
 
-  If you're using JDK 1.3.x, you have to exclude the JCR block before building
-  Cocoon. Have a look at the "Choosing the blocks" section below on how to
-  exculude a block. Please note that some samples require JDK 1.4 or above.
-
  3) Build Cocoon by typing "build" or "./build.sh"
 
  4) Run Cocoon by typing "cocoon" or "./cocoon.sh"

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/KEYS
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/KEYS?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/KEYS (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/KEYS Sat Mar  1 18:02:14 2014
@@ -442,7 +442,7 @@ sig 3       2C312D2F 2005-07-21   Rodent
 sig 3       302DA568 2005-07-21   Rodent of Unusual Size (DSA) <coar@Apache.Org>
 sig 3       E04F9A89 2005-07-22   Roy T. Fielding <fielding@gbiv.com>
 sig 3       5F6B8B72 2005-07-22   Stefan Bodewig <bodewig@apache.org>
-sig 3       87315C31 2005-07-23   Raphaël Luta <raphael.luta@aptiwan.com>
+sig 3       87315C31 2005-07-23   Rapha�l Luta <raphael.luta@aptiwan.com>
 sig 3       F39B3750 2005-07-24   Colm MacCarthaigh <colm.maccarthaigh@heanet.ie>
 sig 3       40581837 2005-07-24   Nick Kew <nick@webthing.com>
 sig 3       9C85222B 2005-07-24   Henning Schmiedehausen <hps@intermeta.de>
@@ -477,7 +477,7 @@ sig 3       2C312D2F 2005-07-21   Rodent
 sig 3       302DA568 2005-07-21   Rodent of Unusual Size (DSA) <coar@Apache.Org>
 sig 3       E04F9A89 2005-07-22   Roy T. Fielding <fielding@gbiv.com>
 sig 3       5F6B8B72 2005-07-22   Stefan Bodewig <bodewig@apache.org>
-sig 3       87315C31 2005-07-23   Raphaël Luta <raphael.luta@aptiwan.com>
+sig 3       87315C31 2005-07-23   Rapha�l Luta <raphael.luta@aptiwan.com>
 sig 3       F39B3750 2005-07-24   Colm MacCarthaigh <colm.maccarthaigh@heanet.ie>
 sig 3       40581837 2005-07-24   Nick Kew <nick@webthing.com>
 sig 3       9C85222B 2005-07-24   Henning Schmiedehausen <hps@intermeta.de>
@@ -811,3 +811,61 @@ EQIACQUCSE4y6gIbDAAKCRDIyQiPQGZBQdtoAJ9V
 bACeJy/ums/+DMvyWkRhptgIi8mIWU0=
 =lQBb
 -----END PGP PUBLIC KEY BLOCK-----
+pub   4096R/DD478570 2012-11-27
+uid                  Cédric Damioli (CODE SIGNING) <cdamioli@apache.org>
+sig 3        DD478570 2012-11-27  Cédric Damioli (CODE SIGNING) <cdamioli@apache.org>
+sub   4096R/F909DA37 2012-11-27
+sig          DD478570 2012-11-27  Cédric Damioli (CODE SIGNING) <cdamioli@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.12 (Cygwin)
+
+mQINBFC0yaMBEAC2q6uewWDisQHfG5RE2ok47WE+WMzWTAmGjTwtZLCQ28Lx8reG
+yw+Zo/xwpXVIYLvwe9pKUpCZuPIoFP0TGQre7R04+dl48fZ2doIJsB21ounMn1XD
+F6GGfNtwtLTo8CXenF1mfTTao5h0HHcc+owjpQyA2rV5nKmlTxdInSewbnGDBgGf
+TmAu/dXSbakqHPcGcq2Z7kzl+L6NqIV6WfyPp6YO5+lCFmpxswjCZrxvt6H1WmhF
+CMVIKesGRs2fhpANvm64gU84KRCRX6nP1xyfNYKRj8bLBYa6WdnMJbJZEst8YG5O
+M9hNy1VFGeqiYFY8Z5XZ8kT1q55fyDlZ5zFIe6IEOr/RyjbDe1usAGJs3gJsoEyv
+IZOYHAMlZk4YPNFPoaQhjjXLnVD/GqAlAxLwOyuMyMeNjf4hdXYzRO8Hgz7+yogJ
+Nj5mJNLD2xK5M2DZxwFf6mGQwEpKOrJyHnxJOcrkq2R28GdcNAzyJIyHFn8TaVo/
+kl/qMQDMpKREAr0L3gBRgwAaOhU7bbLP8MhLtwu3gxlY9Lc3Qqx33agouGgzQHIh
+u+OBFPjafgwBGdW/3e9xVnuQ6v8JqdbZvfqndrvfEMBBQR6GxOVP9vEjdTWUG2RR
+2Fl0eTkxYRboQ3wN2R5pNfkOIvnSVOYEaQS7cD8tWPpv1Q+oKBB1p9xGVQARAQAB
+tDRDw6lkcmljIERhbWlvbGkgKENPREUgU0lHTklORykgPGNkYW1pb2xpQGFwYWNo
+ZS5vcmc+iQI4BBMBAgAiBQJQtMmjAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIX
+gAAKCRAHv/NS3UeFcI1VEACCIcewO+UeWzncf1IDjhQL3eZpO6zcOpiQxjmFzImc
+I1WYywjHfssw1+MU4ROBiOsimJi9+ZFw25bgUvIUZiKhncYaW5QVWzx7DCJcfXE7
+q2N3yzw84G8XjA9Oa+WPcFBn3lSvDvpQoy63+Vm/W5edoGd6EtxjLhdBYPL+WCKp
+DnRhnvXdl6SoaYNFL9YcDvoXmOL81ttWwQD0WOON0cViSUAIzN+r044uQQoTykcd
+lJt7jQjjHUkN1lr/MNbwfWTNPJdeYJ/z/frPgkjQE7HLvWexjTl92fiViOeKl8Lb
+ForA6xfeLvzyu1qScsorfNX54vZuV+n3RteyOyovxpwSC4ZKc7sei3oZ/25MsVGG
+wPO1Q1U8S9efmOtQZELQEEtQTz3/pCPB7DKJiOxlCizbePQUXFADwswDx0x5ORB9
+iqBrv49quEKvaSArEfsL/JbQJyOfy3pfMlotXE/wVfupHMBW0akbIpJlWQJmU54T
+FPq4rrS3PWzlZs7GamxQ+hdu4GPQeD7cloWpfgGQU+yplFOCcaO/3yf8V2kM0UGC
+BXhYMRNDOEPeq3+uT2/fqqwW1a+84RT5Gp0U3AA5nZS0HEz4OB+H7zuWNB1CZ92x
+PZlJHj36lr3JzXUFBhFdl0yh/zsAUFFQCzYzz0DzuIFaoQVduBp6VebbfauX5cXY
+fbkCDQRQtMmjARAAsfXcDYNB1wzBtuajQwEdDWJE65EEhIchKXdAFB6dWmkWE5jt
+30v1bIXDcZ/uTpw94ZeOrqY1g1RkAITwsRYigafkRYoS6Pxm6BNGm12BvHkL5k4R
+EBJwKzIy3WYiaWyx1xSwn2+5x/r+0byjpoU+ZvU+QgQ7GVt+uCoRpsneYhKmo9uw
+yzK3qoDlwHDpNXgy61q3H8C2DluDyPM7VVN1bZQKoLKtocrqmf0JjiBoc8P/kTfC
+KDY2CEB8vUCYkNPHryShfjxsWlwSNWRhJ2pVXDh3UWzPm3Gf4IbN1HN03PfjCO12
+mcbKgaBLC7yRFebJZTmWff8cpHUeemcjHIPQl0ZRUgyg0hTc3fce8Ae+MzkJAOg9
+DgBaJC9FMH4sVqVm8LAHQvWWdStelyPuWOLqMxoTxVaHYUm44q3FqZaB5sTFTakY
+g9Fjx3DIFh6X/TXFgQr+a36Hf8AU0ApXSiJbuEW27QeTtti9MkZ+Qrka2/4g/UMD
+ba/q3/GlKyS4t/sYqKXOOZ9x7l8k2qDy8hsKZaivS5lst0syqNfFrnxciH/Tl7S6
+nyGKfJDqFg7QqXcHrMRyrfubJ9tMqu16uJ5wkrzcWHTfiWkrDE1s6lcbYC6LCsEJ
+yCQ8+mab4m86jOZb8ooXfvIWUnnqUa113Yp7u1w8cYbgakj6c7nT0jcKSCUAEQEA
+AYkCHwQYAQIACQUCULTJowIbDAAKCRAHv/NS3UeFcM97D/99vhpU9KEwQgwYOxYM
+ihS/ym9145HQcYEOTK72r/cZvr3GhBjTDRnGcD/IpVX0rKCMtpibgyonlt1C8v5Z
+jxG+qvRgTjNfJveOJ8G7NVNBoJLMw613qSCJZYAYr6QjHFKhOpwT33ycn+/V5/O3
+mV7UbFFBlHuAjr3hT4YmJI37xngTRMQXn2e9NtCcFbzAnmEn0UccKaFdNdRlXuJk
+AqJi7ekugcuqdLKFiENG5w5EbEPtOFDIQRObuvWbm2l5K0qIs37KXPh90GksiRac
+uJFM7F6HnMoK93yzENiWNLJxWEPYjOIEGNSdVNR+dlSsUopkD1VGcTVdTGUVwBcP
+Rbd5hOsA1yYsxtf1m8JooVvtlyg6ZGB8i6hM5sxvruEp8DUFjcWxo+8autkIbgKx
+608nEsj0GWEwY962K1NqWvdODxR8UJZ7nUC7iYI1ogdAjUUKMWrpjTMt/lNqsuXO
+SFukaT7BaxzhijIDUl9ebXKWlk2W4jscmrkVq6EKp8+RxIAAojytSWEse4AyXC4s
+eImCYzW2jL00ZxVqe3cXWdtcAbV6iH6aIfJpqFyLhpmHujSWEnTCFv6Ckfov41Ot
+lTevRgzzl1pmSmXEcV7v9dbeMuyA3aVQzokc+dPt1FYXUN+cR+ZbpOZr6agjWBMi
+5pz7ducD1Du5Kr3zCNFz0nCadw==
+=M19C
+-----END PGP PUBLIC KEY BLOCK-----

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/NOTICE.txt
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/NOTICE.txt?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/NOTICE.txt (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/NOTICE.txt Sat Mar  1 18:02:14 2014
@@ -1,5 +1,5 @@
 Apache Cocoon
-Copyright 1999-2007 The Apache Software Foundation.
+Copyright 1999-2013 The Apache Software Foundation.
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/README.txt
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/README.txt?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/README.txt (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/README.txt Sat Mar  1 18:02:14 2014
@@ -31,7 +31,7 @@
   Cocoon is implemented both as a Java servlet and a Java command line
   application. The following requirements exist for installing it:
 
-   o  A Java 1.3 or later compatible virtual machine for your operating system.
+   o  A Java 1.4.2 or later compatible virtual machine for your operating system.
 
    o  A Servlet API 2.2 compatible Servlet Engine or J2EE Application Server. 
       [not required for command line operation]

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/build.bat
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/build.bat?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/build.bat (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/build.bat Sat Mar  1 18:02:14 2014
@@ -29,6 +29,8 @@ rem ----- Use Ant shipped with Cocoon. I
 set OLD_ANT_HOME=%ANT_HOME%
 set ANT_HOME=tools
 
+if not exist "%ANT_HOME%\lib\ant.jar" goto noAntLib
+
 call %ANT_HOME%\bin\ant -Djava.endorsed.dirs=lib\endorsed -logger org.apache.tools.ant.NoBannerLogger -emacs %1 %2 %3 %4 %5 %6 %7 %8 %9
 
 rem ----- Restore ANT_HOME and ANT_OPTS
@@ -38,3 +40,15 @@ set OLD_ANT_HOME=
 rem ----- Restore CLASSPATH
 set CLASSPATH=%OLD_CLASSPATH%
 set OLD_CLASSPATH=
+goto end
+
+:noAntLib
+echo ====================================================================
+echo                WARNING : dependencies not found
+echo ====================================================================
+echo  Third party libraries must be present in order to build Cocoon.
+echo  You may download the cocoon-2.1.12-deps.zip and unzip
+echo  its content in this directory to get these libraries.
+echo ====================================================================
+
+:end

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/build.sh
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/build.sh?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/build.sh (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/build.sh Sat Mar  1 18:02:14 2014
@@ -38,6 +38,18 @@ OLD_ANT_OPTS="$ANT_OPTS"
 ANT_OPTS="-Xms32M -Xmx512M -Djava.endorsed.dirs=lib/endorsed"
 export ANT_HOME ANT_OPTS
 
+if [ ! -f "$ANT_HOME/lib/ant.jar" ]
+then
+    echo ====================================================================
+    echo                WARNING : dependencies not found
+    echo ====================================================================
+    echo  Third party libraries must be present in order to build Cocoon.
+    echo  You may download the cocoon-2.1.12-deps.zip and unzip
+    echo  its content in this directory to get these libraries.
+    echo ====================================================================
+    exit
+fi
+
 "$ANT_HOME/bin/ant" -logger org.apache.tools.ant.NoBannerLogger --noconfig -emacs "$@"
 ERR=$?
 

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/cocoon.bat
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/cocoon.bat?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/cocoon.bat (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/cocoon.bat Sat Mar  1 18:02:14 2014
@@ -137,7 +137,7 @@ goto cliLoop
 
 :cliLoopEnd
 
-"%JAVA_HOME%\bin\java.exe" %JAVA_OPTIONS% -classpath "%CP%" -Djava.endorsed.dirs=lib\endorsed "-Dloader.jar.repositories=%COCOON_LIB%" "-Dloader.class.path=lib\core\servlet_2_2.jar;%COCOON_HOME%\build\webapp\WEB-INF\classes" -Dloader.verbose=false -Dloader.main.class=org.apache.cocoon.Main Loader %param%
+"%JAVA_HOME%\bin\java.exe" %JAVA_OPTIONS% -classpath "%CP%" -Djava.endorsed.dirs=lib\endorsed "-Dloader.jar.repositories=%COCOON_LIB%" "-Dloader.class.path=lib\core\servlet-2.3.jar;%COCOON_HOME%\build\webapp\WEB-INF\classes" -Dloader.verbose=false -Dloader.main.class=org.apache.cocoon.Main Loader %param%
 goto end
 
 :: ----- Precompile ------------------------------------------------------------
@@ -153,13 +153,13 @@ goto PrecompileLoop
 
 :PrecompileLoopEnd
 
-"%JAVA_HOME%\bin\java.exe" %JAVA_OPTIONS% -classpath "%CP%" -Djava.endorsed.dirs=lib\endorsed "-Dloader.jar.repositories=%COCOON_LIB%" "-Dloader.class.path=lib\core\servlet_2_2.jar;%COCOON_HOME%\build\webapp\WEB-INF\classes" -Dloader.verbose=false -Dloader.main.class=org.apache.cocoon.bean.XSPPrecompileWrapper Loader %param%
+"%JAVA_HOME%\bin\java.exe" %JAVA_OPTIONS% -classpath "%CP%" -Djava.endorsed.dirs=lib\endorsed "-Dloader.jar.repositories=%COCOON_LIB%" "-Dloader.class.path=lib\core\servlet-2.3.jar;%COCOON_HOME%\build\webapp\WEB-INF\classes" -Dloader.verbose=false -Dloader.main.class=org.apache.cocoon.bean.XSPPrecompileWrapper Loader %param%
 goto end
 
 :: ----- Servlet ---------------------------------------------------------------
 
 :doServlet
-%EXEC% "%JAVA_HOME%\bin\java.exe" %JAVA_OPTIONS% -classpath "%CP%" "-Djava.endorsed.dirs=%COCOON_HOME%\lib\endorsed" "-Dwebapp=%JETTY_WEBAPP%" -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT% -Djetty.admin.port=%JETTY_ADMIN_PORT% "-Dhome=%COCOON_HOME%" "-Dloader.jar.repositories=%COCOON_HOME%\tools\jetty\lib;%COCOON_HOME%\lib\endorsed" -Dloader.main.class=org.mortbay.jetty.Server Loader "%COCOON_HOME%\tools\jetty\conf\main.xml"
+%EXEC% "%JAVA_HOME%\bin\java.exe" %JAVA_OPTIONS% -classpath "%CP%" "-Dloader.class.path=lib\core\servlet-2.3.jar" "-Djava.endorsed.dirs=%COCOON_HOME%\lib\endorsed" "-Dwebapp=%JETTY_WEBAPP%" -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT% -Djetty.admin.port=%JETTY_ADMIN_PORT% "-Dhome=%COCOON_HOME%" "-Dloader.jar.repositories=%COCOON_HOME%\tools\jetty\lib;%COCOON_HOME%\lib\endorsed" -Dloader.main.class=org.mortbay.jetty.Server Loader "%COCOON_HOME%\tools\jetty\conf\main.xml"
 goto end
 
 :: ----- Servlet with Administration Web Interface -----------------------------

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/cocoon.sh
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/cocoon.sh?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/cocoon.sh (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/cocoon.sh Sat Mar  1 18:02:14 2014
@@ -55,7 +55,7 @@
 #
 # CLI_CLASSPATH
 #   The additional classpath for cli and precompile, defaults to
-#   lib/core/servlet_2_2.jar:$COCOON_WEBAPP_HOME/WEB-INF/classes
+#   lib/core/servlet-2.3.jar:$COCOON_WEBAPP_HOME/WEB-INF/classes
 #
 
 
@@ -170,7 +170,7 @@ fi
 CLI="-Dloader.main.class=org.apache.cocoon.Main"
 CLI_LIBRARIES="-Dloader.jar.repositories=$COCOON_LIB"
 if [ "$CLI_CLASSPATH" = "" ] ; then
-	CLI_CLASSPATH="lib/core/servlet_2_2.jar:$COCOON_WEBAPP_HOME/WEB-INF/classes"
+	CLI_CLASSPATH="lib/core/servlet-2.3.jar:$COCOON_WEBAPP_HOME/WEB-INF/classes"
 fi
 CLI_VERBOSE="-Dloader.verbose=false"
 CLI_PROPERTIES="$CLI_LIBRARIES -Dloader.class.path=$CLI_CLASSPATH $CLI_VERBOSE"
@@ -185,7 +185,7 @@ JETTY_WEBAPP="-Dwebapp=$COCOON_WEBAPP_HO
 JETTY_HOME="-Dhome=$COCOON_HOME"
 JETTY_PORT_ARGS="-Djetty.port=$JETTY_PORT"
 JETTY_ADMIN_ARGS="-Djetty.admin.port=$JETTY_ADMIN_PORT"
-JETTY_LIBRARIES="-Dloader.jar.repositories=$COCOON_HOME/tools/jetty/lib${PATHSEP}${ENDORSED_LIBS}"
+JETTY_LIBRARIES="-Dloader.jar.repositories=$COCOON_HOME/tools/jetty/lib${PATHSEP}${ENDORSED_LIBS} -Dloader.class.path=lib/core/servlet-2.3.jar"
 
 # ----- Do the action ----------------------------------------------------------
 

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/forrest.properties
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/forrest.properties?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/forrest.properties (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/forrest.properties Sat Mar  1 18:02:14 2014
@@ -22,7 +22,7 @@
 #forrest.echo=true
 
 # Project name (used to name .war file)
-project.name=cocoon-2.1.12-dev
+project.name=cocoon-2.1.13-dev
 
 # Specifies name of Forrest skin to use
 #project.skin=tigris

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/gump.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/gump.xml?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/gump.xml (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/gump.xml Sat Mar  1 18:02:14 2014
@@ -141,8 +141,9 @@
     <depend project="xml-fop-maintenance"/>
     <depend project="cocoon-block-batik"/>
     <depend project="cocoon-block-xsp" type="samples"/>
-    
+
     <library name="fop"/>
+    <library name="xmlgraphics-commons"/>
 
     <work nested="tools/anttasks"/>
     <home nested="build/cocoon-@@DATE@@"/>

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/lib/jars.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/lib/jars.xml?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/lib/jars.xml (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/lib/jars.xml Sat Mar  1 18:02:14 2014
@@ -55,7 +55,7 @@
     </description>
     <used-by>Cocoon</used-by>
     <lib>core/commons-cli-1.0.jar</lib>
-    <homepage>http://jakarta.apache.org/commons/cli/</homepage>
+    <homepage>http://commons.apache.org/cli/</homepage>
   </file>
 
   <file>
@@ -250,7 +250,7 @@
     <description>Common implementations of collection classes.</description>
     <used-by>Cocoon, OJB</used-by>
     <lib>core/commons-collections-3.2.jar</lib>
-    <homepage>http://jakarta.apache.org/commons/collections/</homepage>
+    <homepage>http://commons.apache.org/collections/</homepage>
   </file>
 
   <file>
@@ -292,7 +292,7 @@
     <description>Xerces is an XML parser.</description>
     <used-by>Cocoon</used-by>
     <ant-target>jars</ant-target>
-    <lib>endorsed/xercesImpl-2.9.1.jar</lib>
+    <lib>endorsed/xercesImpl-2.11.0.jar</lib>
     <homepage>http://xerces.apache.org/xerces2-j/</homepage>
   </file>
 
@@ -304,7 +304,19 @@
     </description>
     <ant-target>external</ant-target>
     <used-by>Cocoon</used-by>
-    <lib>endorsed/xml-apis-1.3.04.jar</lib>
+    <lib>endorsed/xml-apis-1.4.01.jar</lib>
+    <homepage>http://xml.apache.org/commons/</homepage>
+  </file>
+
+  <file>
+    <title>The XML APIs - External component</title>
+    <description>
+      The External Components portion of xml-commons contains interfaces
+      that are defined by external standards organizations.
+    </description>
+    <ant-target>external</ant-target>
+    <used-by>Cocoon</used-by>
+    <lib>endorsed/xml-apis-ext-1.4.01.jar</lib>
     <homepage>http://xml.apache.org/commons/</homepage>
   </file>
 
@@ -315,8 +327,8 @@
       the Scalable Vector Graphics (SVG) format for various purposes, such as
       viewing, generation or manipulation.</description>
     <used-by>SVG serializer (batik block)</used-by>
-    <lib>optional/batik-all-1.6.jar</lib>
-    <homepage>http://xml.apache.org/batik/</homepage>
+    <lib>optional/batik-all-1.7.jar</lib>
+    <homepage>http://xmlgraphics.apache.org/batik/</homepage>
   </file>
 
   <file>
@@ -392,7 +404,7 @@
     </description>
     <used-by>Cocoon</used-by>
     <lib>core/commons-io-1.3.1.jar</lib>
-    <homepage>http://jakarta.apache.org/commons/io/</homepage>
+    <homepage>http://commons.apache.org/io/</homepage>
   </file>
 
   <file>
@@ -417,7 +429,7 @@
     </description>
     <used-by>Jakarta Commons HttpClient, Chaperon</used-by>
     <lib>core/commons-logging-1.0.4.jar</lib>
-    <homepage>http://jakarta.apache.org/commons/logging/</homepage>
+    <homepage>http://commons.apache.org/logging/</homepage>
   </file>
 
   <file>
@@ -435,11 +447,22 @@
       the XSL recommendation and then turns it into a PDF document.
     </description>
     <used-by>FOP serializer (fop block)</used-by>
-    <lib>optional/fop-0.20.5.jar</lib>
+    <lib>optional/fop-1.0.jar</lib>
     <homepage>http://xml.apache.org/fop/</homepage>
   </file>
 
   <file>
+    <title>XML Graphics Commons</title>
+    <description>
+      Apache XML Graphics Commons is a library that consists of several reusable components
+      used by Apache Batik and Apache FOP.
+    </description>
+    <used-by>FOP serializer (fop block)</used-by>
+    <lib>optional/xmlgraphics-commons-1.5.jar</lib>
+    <homepage>http://xmlgraphics.apache.org/commons/</homepage>
+  </file>
+
+  <file>
     <title>XSL-FO to RTF converter</title>
     <description>
       jfor is a Java application that reads XSL-FO documents
@@ -448,7 +471,7 @@
     </description>
     <used-by>RTF serializer (jfor block)</used-by>
     <lib>optional/jfor-0.7.1.jar</lib>
-    <homepage>http://www.jfor.org</homepage>
+    <homepage>http://sourceforge.net/projects/jfor/</homepage>
   </file>
 
   <file>
@@ -592,16 +615,16 @@
       entity sets, but can be used for other resources too.
     </description>
     <used-by>Cocoon Role entity-resolver</used-by>
-    <lib>core/xml-commons-resolver-1.1.jar</lib>
-    <homepage>http://xml.apache.org/commons/</homepage>
+    <lib>core/xml-commons-resolver-1.2.jar</lib>
+    <homepage>http://xerces.apache.org/xml-commons/</homepage>
   </file>
 
   <file>
     <title>Servlet API</title>
-    <description>Servlet API Version 2.2</description>
+    <description>Servlet API Version 2.3</description>
     <used-by>Cocoon</used-by>
-    <lib>core/servlet_2_2.jar</lib>
-    <homepage>http://tomcat.apache.org/</homepage>
+    <lib>core/servlet-2.3.jar</lib>
+    <homepage>http://jetty.codehaus.org/</homepage>
   </file>
 
   <file>
@@ -667,7 +690,7 @@
     <description>XPath interpreter. Work with JavaBeans and DOM nodes</description>
     <used-by>Flow, JXPath logicsheet</used-by>
     <lib>core/commons-jxpath-1.2.jar</lib>
-    <homepage>http://jakarta.apache.org/commons/jxpath/</homepage>
+    <homepage>http://commons.apache.org/jxpath/</homepage>
   </file>
 
   <file>
@@ -675,7 +698,7 @@
     <description>JSTL Expression Language</description>
     <used-by>JXTemplateGenerator</used-by>
     <lib>core/commons-jexl-1.0.jar</lib>
-    <homepage>http://jakarta.apache.org/commons/jexl/</homepage>
+    <homepage>http://commons.apache.org/jexl/</homepage>
   </file>
 
   <file>
@@ -807,7 +830,7 @@
     <description>Implementations of common encoders and decoders</description>
     <used-by>WebDAV block</used-by>
     <lib>optional/commons-codec-1.3.jar</lib>
-    <homepage>http://jakarta.apache.org/commons/codec/</homepage>
+    <homepage>http://commons.apache.org/codec/</homepage>
   </file>
 
   <file>
@@ -896,7 +919,7 @@
     </description>
     <used-by>Cocoon, OJB</used-by>
     <lib>core/commons-lang-2.4.jar</lib>
-    <homepage>http://jakarta.apache.org/commons/lang/</homepage>
+    <homepage>http://commons.apache.org/lang/</homepage>
   </file>
 
   <file>
@@ -989,7 +1012,7 @@
     </description>
     <used-by>OJB</used-by>
     <lib>optional/commons-dbcp-1.2.1.jar</lib>
-    <homepage>http://jakarta.apache.org/commons/dbcp/</homepage>
+    <homepage>http://commons.apache.org/dbcp/</homepage>
   </file>
 
   <file>
@@ -1224,4 +1247,14 @@
     <homepage>http://dojotoolkit.org/</homepage>
   </file>
 
+  <file>
+    <title>SLF4J</title>
+    <description>
+      Simple Logging Facade for Java
+    </description>
+    <used-by>Core</used-by>
+    <lib>core/slf4j-api-1.6.4.jar</lib>
+    <homepage>http://www.slf4j.org/</homepage>
+  </file>
+
 </jars>

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/auth/java/org/apache/cocoon/auth/ApplicationUtil.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/auth/java/org/apache/cocoon/auth/ApplicationUtil.java?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/auth/java/org/apache/cocoon/auth/ApplicationUtil.java (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/auth/java/org/apache/cocoon/auth/ApplicationUtil.java Sat Mar  1 18:02:14 2014
@@ -88,7 +88,10 @@ public class ApplicationUtil
      * @return This returns true, if the user has the role; otherwise false is returned.
      */
     public static boolean isUserInRole(final User user, final String role, final Map objectModel) {
-        boolean result = user.isUserInRole(role);
+        boolean result = false;
+        if (user != null) {
+            result = user.isUserInRole(role);
+        }
         if ( !result ) {
             final Request req = ObjectModelHelper.getRequest(objectModel);
             result = req.isUserInRole(role);

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/batik/java/org/apache/cocoon/serialization/SVGSerializer.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/batik/java/org/apache/cocoon/serialization/SVGSerializer.java?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/batik/java/org/apache/cocoon/serialization/SVGSerializer.java (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/batik/java/org/apache/cocoon/serialization/SVGSerializer.java Sat Mar  1 18:02:14 2014
@@ -17,9 +17,11 @@
 package org.apache.cocoon.serialization;
 
 import java.awt.Color;
-import java.io.OutputStream;
 import java.io.Serializable;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpUtils;
+
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -30,7 +32,6 @@ import org.apache.batik.transcoder.Trans
 import org.apache.batik.transcoder.TranscoderInput;
 import org.apache.batik.transcoder.TranscoderOutput;
 import org.apache.batik.transcoder.TranscodingHints;
-import org.apache.batik.transcoder.TranscoderException;
 import org.apache.batik.util.ParsedURL;
 import org.apache.cocoon.Constants;
 import org.apache.cocoon.caching.CacheableProcessingComponent;
@@ -38,23 +39,27 @@ import org.apache.cocoon.components.tran
 import org.apache.cocoon.components.transcoder.TranscoderFactory;
 import org.apache.cocoon.components.url.ParsedContextURLProtocolHandler;
 import org.apache.cocoon.components.url.ParsedResourceURLProtocolHandler;
+import org.apache.cocoon.environment.http.HttpEnvironment;
+import org.apache.cocoon.sitemap.SitemapModelComponent;
 import org.apache.cocoon.util.ClassUtils;
-import org.apache.cocoon.xml.dom.SVGBuilder;
 import org.apache.commons.lang.BooleanUtils;
 import org.apache.excalibur.source.SourceValidity;
 import org.apache.excalibur.source.impl.validity.NOPValidity;
 import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
 
 /**
  * A <a href="http://xml.apache.org/batik/">Batik</a> based Serializer for generating PNG/JPEG images
+ * 
+ * sitemap parameter: documentURL (by default httprequest.requestURL is used). The documentURI is used by Batik
+ * to select script interpreters.  If the URI is invalid script interpretation will fail.
+ * (See batik 1.7 BridgeContext.java line 96-100) 
  *
  * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
  * @author <a href="mailto:rossb@apache.org">Ross Burton</a>
  * @version $Id$
  */
-public class SVGSerializer extends SVGBuilder
-implements Serializer, Configurable, CacheableProcessingComponent, Contextualizable {
+public class SVGSerializer extends AbstractDOMSerializer 
+implements Serializer, Configurable, CacheableProcessingComponent, Contextualizable, SitemapModelComponent {
 
     /**
      * Get the context
@@ -65,10 +70,7 @@ implements Serializer, Configurable, Cac
         ParsedURL.registerHandler(new ParsedContextURLProtocolHandler());
         ParsedURL.registerHandler(new ParsedResourceURLProtocolHandler());
     }
-
-    /** The current <code>OutputStream</code>. */
-    private OutputStream output;
-
+    
     /** The current <code>mime-type</code>. */
     private String mimetype;
 
@@ -78,32 +80,9 @@ implements Serializer, Configurable, Cac
     /** The Transcoder Factory to use */
     TranscoderFactory factory = ExtendableTranscoderFactory.getTranscoderFactoryImplementation();
     
-//    private ServiceManager manager;
-
-//    private SourceResolver resolver;
-
-    /**
-     * Set the <code>OutputStream</code> where the XML should be serialized.
-     */
-    public void setOutputStream(OutputStream out) {
-        this.output = out;
-        
-        // Give the source resolver to Batik
-        //SourceProtocolHandler.setup(this.resolver);
-    }
-    
-/*    public void service(ServiceManager manager) throws ServiceException {
-        this.manager = manager;
-        this.resolver = (SourceResolver)this.manager.lookup(SourceResolver.ROLE);
-    }
-
-    public void dispose() {
-        this.manager.release(this.resolver);
-    }
-*/
     /**
-     * Set the configurations for this serializer.
-     */
+    * Set the configurations for this serializer.
+    */
     public void configure(Configuration conf) throws ConfigurationException {
         this.mimetype = conf.getAttribute("mime-type");
         if (getLogger().isDebugEnabled()) {
@@ -195,34 +174,18 @@ implements Serializer, Configurable, Cac
     }
 
     /**
-     * Receive notification of a successfully completed DOM tree generation.
+     * Receive DOM Document to transcode.
      */
-    public void notify(Document doc) throws SAXException {
-        
-        try {
-            TranscoderInput transInput = new TranscoderInput(doc);
-
-            // Buffering is done by the pipeline (See shouldSetContentLength)
-            TranscoderOutput transOutput = new TranscoderOutput(this.output);
-            transcoder.transcode(transInput, transOutput);
-        } catch (TranscoderException ex) {
-            if (ex.getException() != null) {
-                if (getLogger().isDebugEnabled()) {
-                    getLogger().debug("Got transcoder exception writing image, rethrowing nested exception", ex);
-                }
-                throw new SAXException("Exception writing image", ex.getException());
-            }
-
-            if (getLogger().isDebugEnabled()) {
-                getLogger().debug("Got transcoder exception writing image, rethrowing", ex);
-            }
-            throw new SAXException("Exception writing image", ex);
-        } catch (Exception ex) {
-            if (getLogger().isDebugEnabled()) {
-                getLogger().debug("Got exception writing image, rethrowing", ex);
-            }
-            throw new SAXException("Exception writing image", ex);
-        }
+    public void serialize(Document doc) throws Exception {
+        TranscoderInput transInput = new TranscoderInput(doc);
+        HttpServletRequest req = (HttpServletRequest) objectModel.get(HttpEnvironment.HTTP_REQUEST_OBJECT);
+        String documentUrl = parameters.getParameter("documentUrl", 
+                req == null ? null : HttpUtils.getRequestURL(req).toString());
+        transInput.setURI(documentUrl);
+
+        // Buffering is done by the pipeline (See shouldSetContentLength)
+        TranscoderOutput transOutput = new TranscoderOutput(this.output);
+        transcoder.transcode(transInput, transOutput);
     }
 
     /**
@@ -269,4 +232,4 @@ implements Serializer, Configurable, Cac
     public boolean shouldSetContentLength() {
         return true;
     }
-}
+}
\ No newline at end of file

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/batik/samples/samples.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/batik/samples/samples.xml?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/batik/samples/samples.xml (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/batik/samples/samples.xml Sat Mar  1 18:02:14 2014
@@ -79,7 +79,7 @@
     <sample name="SVG Specification" href="http://www.w3.org/TR/SVG/">
       Scalable Vector Graphics (SVG) 1.0 Specification
     </sample>
-    <sample name="Batik web site" href="http://xml.apache.org/batik">
+    <sample name="Apache Batik web site" href="http://xmlgraphics.apache.org/batik/">
       Links and reference information, SVG browser
     </sample>
     <sample name="Adobe SVG Viewer" href="http://www.adobe.com/svg/viewer/install/main.html">

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/captcha/java/org/apache/cocoon/reading/CaptchaReader.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/captcha/java/org/apache/cocoon/reading/CaptchaReader.java?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/captcha/java/org/apache/cocoon/reading/CaptchaReader.java (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/captcha/java/org/apache/cocoon/reading/CaptchaReader.java Sat Mar  1 18:02:14 2014
@@ -25,14 +25,15 @@ import java.awt.RenderingHints;
 import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.awt.image.WritableRaster;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.lang.reflect.Field;
+import java.util.Iterator;
 import java.util.Random;
 
-import com.sun.image.codec.jpeg.JPEGCodec;
-import com.sun.image.codec.jpeg.JPEGEncodeParam;
-import com.sun.image.codec.jpeg.JPEGImageEncoder;
+import javax.imageio.ImageIO;
+import javax.imageio.ImageWriteParam;
+import javax.imageio.ImageWriter;
+import javax.imageio.stream.ImageOutputStream;
 
 /**
  * <p>The {@link CaptchaReader} is a simple tool generating JPEG images for the text
@@ -297,14 +298,16 @@ public class CaptchaReader extends Abstr
         warped = null;
 
         /* Write the processed image as a JPEG image */
-        ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-        JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(buffer);
-        JPEGEncodeParam param = encoder.getDefaultJPEGEncodeParam(result);
-        param.setQuality(quality, true);
-        encoder.encode(result, param);
-        buffer.flush();
-        buffer.close();
-        this.out.write(buffer.toByteArray());
+        Iterator writers = ImageIO.getImageWritersByFormatName("jpeg");
+        ImageOutputStream ios = ImageIO.createImageOutputStream(out);
+        ImageWriter writer = (ImageWriter) writers.next();
+        writer.setOutput(ios);
+        ImageWriteParam p = writer.getDefaultWriteParam();
+        p.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
+        p.setCompressionQuality(quality);
+        writer.write(result);
+        
+        ios.flush();
         this.out.flush();
     }
 }

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/captcha/samples/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/captcha/samples/sitemap.xmap?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/captcha/samples/sitemap.xmap (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/captcha/samples/sitemap.xmap Sat Mar  1 18:02:14 2014
@@ -30,7 +30,9 @@
     </map:generators>
   </map:components>
   
-  <map:flow language="javascript" />
+  <map:flow language="javascript">
+    <map:script src="flow/captcha.js"/>
+  </map:flow>
 
   <map:pipelines>
     <map:pipeline type="caching">

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/cron/samples/docs.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/cron/samples/docs.xml?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/cron/samples/docs.xml (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/cron/samples/docs.xml Sat Mar  1 18:02:14 2014
@@ -23,7 +23,7 @@
         
             <p>
                 This implementation of the Java interface 
-                <link href="/api/java/org/apache/cocoon/components/cron/JobScheduler.html">
+                <link href="http://cocoon.apache.org/2.1/apidocs/org/apache/cocoon/components/cron/JobScheduler.html">
                 <code>JobScheduler</code></link> 
                 is based on the <link href="http://www.opensymphony.com/quartz/">Quartz</link>
                 job scheduling project and the 
@@ -31,13 +31,13 @@
             </p>
             
             <p style="background-color: yellow">
-                <strong>WARNING:</strong> Consider the <link href="/api/java/org/apache/cocoon/components/cron/JobScheduler.html">
+                <strong>WARNING:</strong> Consider the <link href="http://cocoon.apache.org/2.1/apidocs/org/apache/cocoon/components/cron/JobScheduler.html">
                 <code>JobScheduler</code></link> interface as beta in terms of defined functionality as it will be 
                 extended with additional requirements in the near future (i.e. getJobList). 
             </p>
         
             <p>
-                This <link href="/api/java/org/apache/cocoon/components/cron/QuartzJobScheduler.html">
+                This <link href="http://cocoon.apache.org/2.1/apidocs/org/apache/cocoon/components/cron/QuartzJobScheduler.html">
                 <code>QuartzJobScheduler</code></link> implementation is written as a standard 
                 <link href="http://excalibur.apache.org/framework/index.html">Avalon</link> component. So, its definition you'll find in the
                 <code>cocoon.xconf</code> file of Cocoon if you've included the cron-block in your build (see 
@@ -179,12 +179,12 @@
                 <title>Job Components</title>
                 <p>
                     The 
-                    <link href="/api/java/org/apache/cocoon/components/cron/CronJob.html"><code>CronJob</code></link> 
+                    <link href="http://cocoon.apache.org/2.1/apidocs/org/apache/cocoon/components/cron/CronJob.html"><code>CronJob</code></link> 
                     object doing your work can be defined in the <code>cocoon.xconf</code> 
                     file as a regular Avalon components. The <code>role</code> attribute given to this component is 
                     refered to by the <code>target</code> attribute in the <code>&lt;trigger&gt;</code> element above.
                     Below is the sample for the 
-                    <link href="/api/java/org/apache/cocoon/components/cron/TestCronJob.html">
+                    <link href="http://cocoon.apache.org/2.1/apidocs/org/apache/cocoon/components/cron/TestCronJob.html">
                     <code>TestCronJob</code></link> component.
                 </p>
                 <source>

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/java/org/apache/cocoon/databases/ibatis/ExcaliburDataSourceFactory.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/java/org/apache/cocoon/databases/ibatis/ExcaliburDataSourceFactory.java?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/java/org/apache/cocoon/databases/ibatis/ExcaliburDataSourceFactory.java (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/java/org/apache/cocoon/databases/ibatis/ExcaliburDataSourceFactory.java Sat Mar  1 18:02:14 2014
@@ -20,6 +20,7 @@ import java.io.PrintWriter;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.Map;
+import java.util.logging.Logger;
 
 import javax.sql.DataSource;
 
@@ -126,5 +127,12 @@ public class ExcaliburDataSourceFactory 
         public boolean isWrapperFor(Class iface) throws SQLException {
             return false;
         }
+
+        /**
+         * Required by JDK1.7.
+         */
+        public Logger getParentLogger() {
+	    throw new IllegalArgumentException("Feature not supported");
+	}
     }
 }

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/mod-db/edit-groups.xsp
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/mod-db/edit-groups.xsp?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/mod-db/edit-groups.xsp (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/mod-db/edit-groups.xsp Sat Mar  1 18:02:14 2014
@@ -29,8 +29,8 @@
     <resources>
        <resource type="file" href="database.xml?cocoon-view=pretty-content">Descriptor</resource>
        <resource type="file" href="../schema.sql">Schema</resource>
-       <resource type="doc" href="userdocs/actions/database-actions.html">Actions</resource>
-       <resource type="doc" href="userdocs/xsp/esql.html">ESQL</resource>
+       <resource type="doc" href="http://cocoon.apache.org/2.1/userdocs/database-actions.html">Actions</resource>
+       <resource type="doc" href="http://cocoon.apache.org/2.1/userdocs/logicsheets/esql.html">ESQL</resource>
     </resources>
 
     <title>edit-groups</title>

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/mod-db/file-upload-blob.xsp
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/mod-db/file-upload-blob.xsp?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/mod-db/file-upload-blob.xsp (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/mod-db/file-upload-blob.xsp Sat Mar  1 18:02:14 2014
@@ -30,8 +30,8 @@
     <resources>
        <resource type="file" href="database.xml?cocoon-view=pretty-content">Descriptor</resource>
        <resource type="file" href="../schema.sql">Schema</resource>
-       <resource type="doc" href="userdocs/actions/database-actions.html">Actions</resource>
-       <resource type="doc" href="userdocs/xsp/esql.html">ESQL</resource>
+       <resource type="doc" href="http://cocoon.apache.org/2.1/userdocs/database-actions.html">Actions</resource>
+       <resource type="doc" href="http://cocoon.apache.org/2.1/userdocs/logicsheets/esql.html">ESQL</resource>
     </resources>
 
     <title>file-upload-blob</title>

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/mod-db/user-list.xsp
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/mod-db/user-list.xsp?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/mod-db/user-list.xsp (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/mod-db/user-list.xsp Sat Mar  1 18:02:14 2014
@@ -29,8 +29,8 @@
     <resources>
        <resource type="file" href="database.xml?cocoon-view=pretty-content">Descriptor</resource>
        <resource type="file" href="../schema.sql">Schema</resource>
-       <resource type="doc" href="userdocs/actions/database-actions.html">Actions</resource>
-       <resource type="doc" href="userdocs/xsp/esql.html">ESQL</resource>
+       <resource type="doc" href="http://cocoon.apache.org/2.1/userdocs/database-actions.html">Actions</resource>
+       <resource type="doc" href="http://cocoon.apache.org/2.1/userdocs/logicsheets/esql.html">ESQL</resource>
     </resources>
 
     <title>user-list</title>

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/org-db/add-department.xsp
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/org-db/add-department.xsp?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/org-db/add-department.xsp (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/org-db/add-department.xsp Sat Mar  1 18:02:14 2014
@@ -22,8 +22,8 @@
     <resources>
       <resource type="file" href="employee.xml?cocoon-view=pretty-content">Descriptor</resource>
       <resource type="file" href="../schema.sql">Schema</resource>
-      <resource type="doc" href="userdocs/actions/database-actions.html">Actions</resource>
-      <resource type="doc" href="userdocs/xsp/esql.html">ESQL</resource>
+      <resource type="doc" href="http://cocoon.apache.org/2.1/userdocs/database-actions.html">Actions</resource>
+      <resource type="doc" href="http://cocoon.apache.org/2.1/userdocs/logicsheets/esql.html">ESQL</resource>
     </resources>
 
     <title>Add a Department</title>

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/org-db/add-employee.xsp
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/org-db/add-employee.xsp?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/org-db/add-employee.xsp (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/org-db/add-employee.xsp Sat Mar  1 18:02:14 2014
@@ -23,8 +23,8 @@
     <resources>
       <resource type="file" href="employee.xml?cocoon-view=pretty-content">Descriptor</resource>
       <resource type="file" href="../schema.sql">Schema</resource>
-      <resource type="doc" href="userdocs/actions/database-actions.html">Actions</resource>
-      <resource type="doc" href="userdocs/xsp/esql.html">ESQL</resource>
+      <resource type="doc" href="http://cocoon.apache.org/2.1/userdocs/database-actions.html">Actions</resource>
+      <resource type="doc" href="http://cocoon.apache.org/2.1/userdocs/logicsheets/esql.html">ESQL</resource>
     </resources>
 
     <title>Add an Employee</title>

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/org-db/employee.xsp
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/org-db/employee.xsp?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/org-db/employee.xsp (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/org-db/employee.xsp Sat Mar  1 18:02:14 2014
@@ -30,8 +30,8 @@
     <resources>
       <resource type="file" href="employee.xml?cocoon-view=pretty-content">Descriptor</resource>
       <resource type="file" href="../schema.sql">Schema</resource>
-      <resource type="doc" href="userdocs/actions/database-actions.html">Actions</resource>
-      <resource type="doc" href="userdocs/xsp/esql.html">ESQL</resource>
+      <resource type="doc" href="http://cocoon.apache.org/2.1/userdocs/database-actions.html">Actions</resource>
+      <resource type="doc" href="http://cocoon.apache.org/2.1/userdocs/logicsheets/esql.html">ESQL</resource>
     </resources>
 
     <title>Manage Employees</title>

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/org-db/process-department.xsp
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/org-db/process-department.xsp?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/org-db/process-department.xsp (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/org-db/process-department.xsp Sat Mar  1 18:02:14 2014
@@ -38,8 +38,8 @@
     <resources>
       <resource type="file" href="employee.xml?cocoon-view=pretty-content">Descriptor</resource>
       <resource type="file" href="../schema.sql">Schema</resource>
-      <resource type="doc" href="userdocs/actions/database-actions.html">Actions</resource>
-      <resource type="doc" href="userdocs/xsp/esql.html">ESQL</resource>
+      <resource type="doc" href="http://cocoon.apache.org/2.1/userdocs/database-actions.html">Actions</resource>
+      <resource type="doc" href="http://cocoon.apache.org/2.1/userdocs/logicsheets/esql.html">ESQL</resource>
     </resources>
 
     <title><xsp:expr>process</xsp:expr> Department Processed</title>

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/org-db/process-employee.xsp
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/org-db/process-employee.xsp?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/org-db/process-employee.xsp (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/org-db/process-employee.xsp Sat Mar  1 18:02:14 2014
@@ -38,8 +38,8 @@
     <resources>
       <resource type="file" href="employee.xml?cocoon-view=pretty-content">Descriptor</resource>
       <resource type="file" href="../schema.sql">Schema</resource>
-      <resource type="doc" href="userdocs/actions/database-actions.html">Actions</resource>
-      <resource type="doc" href="userdocs/xsp/esql.html">ESQL</resource>
+      <resource type="doc" href="http://cocoon.apache.org/2.1/userdocs/database-actions.html">Actions</resource>
+      <resource type="doc" href="http://cocoon.apache.org/2.1/userdocs/logicsheets/esql.html">ESQL</resource>
     </resources>
 
     <title><xsp:expr>process</xsp:expr> Employee Processed</title>

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/samples.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/samples.xml?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/samples.xml (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/samples.xml Sat Mar  1 18:02:14 2014
@@ -32,7 +32,7 @@
   </group>
 
   <group name="SQL Transformer">
-     <sample name="Documentation" href="../../../docs/userdocs/transformers/sql-transformer.html">
+     <sample name="Documentation" href="http://cocoon.apache.org/2.1/userdocs/sql-transformer.html">
        Documentation for this component.
      </sample>
      <sample name="SQL Transformer" href="transform/sql-page" xlink:role="dynamic">
@@ -48,7 +48,7 @@
   </group>
 
   <group name="XSP">
-     <sample name="Documentation" href="../../../docs/userdocs/xsp/esql.html">
+     <sample name="Documentation" href="http://cocoon.apache.org/2.1/userdocs/logicsheets/esql.html">
        Documentation for this component.
      </sample>
      <sample name="ESQL Logicsheet" href="xsp/esql" xlink:role="dynamic">
@@ -62,7 +62,7 @@
        are based on Cocoon's input and output modules to read and write data from
        and to many more places than request attributes and parameters.
      </note>
-     <sample name="Documentation" href="../../../docs/userdocs/actions/database-actions.html">
+     <sample name="Documentation" href="http://cocoon.apache.org/2.1/userdocs/database-actions.html">
        Documentation for this component.
      </sample>
      <sample name="Manage Users and Groups" href="mod-db/user-list">
@@ -80,7 +80,7 @@
        These examples are created around the original database actions and the
        use of ESQL.
      </note>
-     <sample name="Documentation" href="../../../docs/userdocs/actions/database-actions.html">
+     <sample name="Documentation" href="http://cocoon.apache.org/2.1/userdocs/database-actions.html">
        Documentation for this component.
      </sample>
      <sample name="Manage Employees" href="org-db/employee" xlink:role="dynamic">

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/transform/sql-page.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/transform/sql-page.xml?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/transform/sql-page.xml (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/transform/sql-page.xml Sat Mar  1 18:02:14 2014
@@ -21,7 +21,7 @@
 
   <resources>
     <resource type="file" href="../schema.sql">Schema</resource>
-    <resource type="doc" href="userdocs/transformers/sql-transformer.html">SQL Transformer</resource>
+    <resource type="doc" href="http://cocoon.apache.org/2.1/userdocs/sql-transformer.html">SQL Transformer</resource>
   </resources>
 
   <content>

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/transform/sql-page2.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/transform/sql-page2.xml?rev=1573205&r1=1573204&r2=1573205&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/transform/sql-page2.xml (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/databases/samples/transform/sql-page2.xml Sat Mar  1 18:02:14 2014
@@ -21,7 +21,7 @@
 
   <resources>
     <resource type="file" href="../schema.sql">Schema</resource>
-    <resource type="doc" href="userdocs/transformers/sql-transformer.html">SQL Transformer</resource>
+    <resource type="doc" href="http://cocoon.apache.org/2.1/userdocs/sql-transformer.html">SQL Transformer</resource>
   </resources>
 
   <content>



Mime
View raw message