Permalink
Browse files

Merging 5.5 years - who said Subversion is antiquate?

  • Loading branch information...
2 parents c9d7551 + 47c6564 commit 34abcd701960bf5164b6d83b0f00ff1330e6ecf1 @ilgrosso ilgrosso committed Mar 1, 2014
Showing with 6,311 additions and 19,656 deletions.
  1. +0 −52 CREDITS.txt
  2. +1 −5 INSTALL.txt
  3. +60 −2 KEYS
  4. +1 −1 NOTICE.txt
  5. +1 −1 README.txt
  6. +14 −0 build.bat
  7. +12 −0 build.sh
  8. +3 −3 cocoon.bat
  9. +3 −3 cocoon.sh
  10. +1 −1 forrest.properties
  11. +2 −1 gump.xml
  12. +2,395 −0 legal/LICENSE.txt
  13. +58 −0 legal/NOTICE.txt
  14. +0 −47 legal/ant-contrib-0.6.jar.license.txt
  15. +0 −203 legal/ant-junit.jar.license.txt
  16. +0 −203 legal/ant-launcher.jar.license.txt
  17. +0 −203 legal/ant-trax.jar.license.txt
  18. +0 −203 legal/ant.jar.license.txt
  19. +0 −31 legal/antlr-2.7.6.jar.license.txt
  20. +0 −28 legal/asm-2.2.1.jar.license.txt
  21. +0 −28 legal/asm-util-2.2.1.jar.license.txt
  22. +0 −50 legal/avalon-framework-api-4.3.jar.license.txt
  23. +0 −50 legal/avalon-framework-impl-4.3.jar.license.txt
  24. +0 −202 legal/avalon-logkit-2.1.jar.license.txt
  25. +0 −203 legal/axis-1.4.jar.license.txt
  26. +0 −203 legal/axis-jaxrpc-1.4.jar.license.txt
  27. +0 −203 legal/axis-saaj-1.4.jar.license.txt
  28. +0 −201 legal/batik-all-1.6.jar.license.txt
  29. +0 −202 legal/bsf-2.4.0.jar.license.txt
  30. +0 −38 legal/castor-0.9.6-xml.jar.license.txt
  31. +0 −48 legal/chaperon-20040205.jar.license.txt
  32. +0 −202 legal/commons-beanutils-core-1.7.0.jar.license.txt
  33. +0 −60 legal/commons-cli-1.0.jar.license.txt
  34. +0 −202 legal/commons-codec-1.3.jar.license.txt
  35. +0 −202 legal/commons-collections-3.2.jar.license.txt
  36. +0 −202 legal/commons-dbcp-1.2.1.jar.license.txt
  37. +0 −202 legal/commons-digester-1.7.jar.license.txt
  38. +0 −54 legal/commons-discovery-0.2.jar.license.txt
  39. +0 −202 legal/commons-el-1.0.jar.license.txt
  40. +0 −176 legal/commons-httpclient-2.0.2.jar.license.txt
  41. +0 −202 legal/commons-io-1.3.1.jar.license.txt
  42. +0 −202 legal/commons-jexl-1.0.jar.license.txt
  43. +0 −202 legal/commons-jxpath-1.2.jar.license.txt
  44. +0 −202 legal/commons-lang-2.4.jar.license.txt
  45. +0 −202 legal/commons-logging-1.0.4.jar.license.txt
  46. +0 −202 legal/commons-pool-1.2.jar.license.txt
  47. +0 −202 legal/commons-transaction-1.0.1.jar.license.txt
  48. +0 −3 legal/concurrent-1.3.4.jar.license.txt
  49. +0 −201 legal/daisy-htmlcleaner-1.4.1.jar.license.txt
  50. +0 −201 legal/daisy-util-1.4.1.jar.license.txt
  51. +0 −201 legal/db-ojb-1.0.4.jar.license.txt
  52. +0 −60 legal/deli-x050330.jar.license.txt
  53. +0 −195 legal/dojo-rsrc-0.4.3.jar.license.txt
  54. +0 −30 legal/easymock-1.1.jar.license.html
  55. +0 −15 legal/ehcache-1.2.3.jar.license.txt
  56. +0 −176 legal/excalibur-component-2.1.jar.license.txt
  57. +0 −176 legal/excalibur-datasource-2.1.jar.license.txt
  58. +0 −50 legal/excalibur-i18n-1.1.jar.license.txt
  59. +0 −176 legal/excalibur-instrument-api-2.1.jar.license.txt
  60. +0 −176 legal/excalibur-instrument-client-2.1.jar.license.txt
  61. +0 −176 legal/excalibur-instrument-mgr-api-2.1.jar.license.txt
  62. +0 −176 legal/excalibur-instrument-mgr-http-2.1.jar.license.txt
  63. +0 −176 legal/excalibur-instrument-mgr-impl-2.1.jar.license.txt
  64. +0 −176 legal/excalibur-logger-2.1.jar.license.txt
  65. +0 −50 legal/excalibur-naming-1.0.jar.license.txt
  66. +0 −176 legal/excalibur-pool-api-2.1.jar.license.txt
  67. +0 −176 legal/excalibur-pool-impl-2.1.jar.license.txt
  68. +0 −176 legal/excalibur-pool-instrumented-2.1.jar.license.txt
  69. +0 −176 legal/excalibur-sourceresolve-2.2.3.jar.license.txt
  70. +0 −176 legal/excalibur-store-2.1.jar.license.txt
  71. +0 −176 legal/excalibur-xmlutil-2.1.jar.license.txt
  72. +0 −48 legal/fop-0.20.5.jar.license.txt
  73. +0 −202 legal/geronimo-spec-activation-1.0.2-rc4.jar.license.txt
  74. +0 −202 legal/geronimo-spec-javamail-1.3.1-rc5.jar.license.txt
  75. +0 −202 legal/geronimo-spec-jms-1.1-rc3.jar.license.txt
  76. +0 −202 legal/geronimo-spec-jta-1.0.1B-rc3.jar.license.txt
  77. +0 −47 legal/groovy-1.0-jsr-05.jar.license.txt
  78. +0 −31 legal/hsqldb-1.8.0.7.jar.license.txt
  79. +0 −30 legal/htmlarea.license.txt
  80. +0 −34 legal/icu4j-2.8.jar.license.txt
  81. +0 −470 legal/itext-1.1.jar.license.txt
  82. +0 −202 legal/jackrabbit-core-1.0.1.jar.license.txt
  83. +0 −53 legal/jakarta-bcel-20040329.jar.license.txt
  84. +0 −57 legal/jakarta-oro-2.0.8.jar.license.txt
  85. +0 −202 legal/jakarta-regexp-1.5.jar.license.txt
  86. +0 −202 legal/jakarta-slide-webdavlib-2.1.jar.license.txt
  87. +0 −202 legal/jcs-1.2.5-dev-20050313.jar.license.txt
  88. +0 −201 legal/jdbi-1.3.1.jar.licence.txt
  89. +0 −56 legal/jdom-1.0.jar.license.txt
  90. +0 −35 legal/jdtcore-3.0.2.jar.license.html
  91. +0 −30 legal/jena-2.1.jar.license.txt
  92. +0 −159 legal/jetty-4.2.23.jar.license.html
  93. +0 −43 legal/jfor-0.7.1.jar.license.txt
  94. +0 −31 legal/jing-20030619.jar.license.txt
  95. +0 −470 legal/joost-20040330.jar.license.txt
  96. +0 −470 legal/js-1.6R5.jar.license.txt
  97. +0 −202 legal/jsp-api-2.0.jar.license.txt
  98. +0 −49 legal/jtidy-04aug2000r7-dev.jar.license.txt
  99. +0 −125 legal/junit-3.8.2.jar.license.html
  100. +0 −202 legal/log4j-1.2.14.jar.license.txt
  101. +0 −15 legal/lucene-1.4.3.jar.license.txt
  102. +0 −6 legal/midi-license.txt
  103. +0 −202 legal/myfaces-api-r233484.jar.license.txt
  104. +0 −202 legal/myfaces-impl-r233484.jar.license.txt
  105. +0 −47 legal/nekodtd-0.1.11.jar.license.txt
  106. +0 −47 legal/nekohtml-0.9.5.jar.license.txt
  107. +0 −114 legal/pizza-1.1.jar.license.txt
  108. +0 −201 legal/pluto-1.0.1.jar.license.txt
  109. +0 −202 legal/poi-2.5.1-final-20040804.jar.license.txt
  110. +0 −190 legal/portals-bridges-common-1.0.jar.license.txt
  111. +0 −201 legal/portlet-api-1.0.jar.license.txt
  112. +0 −50 legal/qdox-1.5.jar.license.txt
  113. +0 −23 legal/quartz-1.5.2.jar.license.txt
  114. +0 −59 legal/servlet-2.3.jar.license.txt
  115. +0 −59 legal/servlet_2_2.jar.license.txt
  116. +0 −202 legal/slide-kernel-2.1.jar.license.txt
  117. +0 −202 legal/slide-stores-2.1.jar.license.txt
  118. +0 −202 legal/slide-webdavservlet-2.1.jar.license.txt
  119. +0 −73 legal/spark.fpl.license.txt
  120. +0 −378 legal/spark.opl.license.txt
  121. +0 −202 legal/velocity-1.4.jar.license.txt
  122. +0 −90 legal/wsdl4j-1.5.1.jar.license.txt
  123. +0 −684 legal/xalan-2.7.1.jar.license.txt
  124. +0 −202 legal/xercesImpl-2.9.1.jar.license.txt
  125. +0 −201 legal/xindice-1.1b4.jar.license.txt
  126. +0 −202 legal/xml-apis-1.3.04.jar.license.txt
  127. +0 −53 legal/xml-commons-resolver-1.1.jar.license.txt
  128. +0 −52 legal/xmldb-api-20030701.jar.license.txt
  129. +0 −52 legal/xmldb-common-20030701.jar.license.txt
  130. +0 −52 legal/xmldb-xupdate-20040205.jar.license.txt
  131. +0 −54 legal/xmlrpc-1.1.jar.license.txt
  132. +0 −35 legal/xmlunit1.0.jar.license.txt
  133. +0 −48 legal/xreporter-expression-20040701.jar.license.txt
  134. BIN {tools/jetty/lib → lib/core}/servlet-2.3.jar
  135. BIN lib/core/servlet_2_2.jar
  136. BIN lib/core/slf4j-api-1.6.4.jar
  137. BIN lib/core/xml-commons-resolver-1.1.jar
  138. BIN lib/core/xml-commons-resolver-1.2.jar
  139. BIN lib/endorsed/xercesImpl-2.11.0.jar
  140. BIN lib/endorsed/xercesImpl-2.9.1.jar
  141. BIN lib/endorsed/{xml-apis-1.3.04.jar → xml-apis-1.4.01.jar}
  142. BIN lib/endorsed/xml-apis-ext-1.4.01.jar
  143. +53 −20 lib/jars.xml
  144. BIN lib/optional/batik-all-1.6.jar
  145. BIN lib/optional/batik-all-1.7.jar
  146. BIN lib/optional/fop-0.20.5.jar
  147. BIN lib/optional/fop-1.0.jar
  148. BIN lib/optional/xmlgraphics-commons-1.5.jar
  149. +437 −0 misc/notes/review-jars.txt
  150. +4 −1 src/blocks/auth/java/org/apache/cocoon/auth/ApplicationUtil.java
  151. +238 −0 src/blocks/batik/java/org/apache/cocoon/serialization/AbstractDOMSerializer.java
  152. +26 −63 src/blocks/batik/java/org/apache/cocoon/serialization/SVGSerializer.java
  153. +1 −1 src/blocks/batik/samples/samples.xml
  154. +15 −12 src/blocks/captcha/java/org/apache/cocoon/reading/CaptchaReader.java
  155. +3 −1 src/blocks/captcha/samples/sitemap.xmap
  156. +5 −5 src/blocks/cron/samples/docs.xml
  157. +8 −0 src/blocks/databases/java/org/apache/cocoon/databases/ibatis/ExcaliburDataSourceFactory.java
  158. +2 −2 src/blocks/databases/samples/mod-db/edit-groups.xsp
  159. +2 −2 src/blocks/databases/samples/mod-db/file-upload-blob.xsp
  160. +2 −2 src/blocks/databases/samples/mod-db/user-list.xsp
  161. +2 −2 src/blocks/databases/samples/org-db/add-department.xsp
  162. +2 −2 src/blocks/databases/samples/org-db/add-employee.xsp
  163. +2 −2 src/blocks/databases/samples/org-db/employee.xsp
  164. +2 −2 src/blocks/databases/samples/org-db/process-department.xsp
  165. +2 −2 src/blocks/databases/samples/org-db/process-employee.xsp
  166. +4 −4 src/blocks/databases/samples/samples.xml
  167. +1 −1 src/blocks/databases/samples/transform/sql-page.xml
  168. +1 −1 src/blocks/databases/samples/transform/sql-page2.xml
  169. +1 −1 src/blocks/databases/samples/transform/sql-page3.xml
  170. +1 −1 src/blocks/databases/samples/xsp/esql.xsp
  171. +193 −155 src/blocks/fop/java/org/apache/cocoon/serialization/FOPSerializer.java
  172. +1 −1 src/blocks/fop/samples/misc/samples.xml
  173. +10 −9 src/blocks/forms/java/org/apache/cocoon/forms/binding/RepeaterAdapter.java
  174. +163 −154 src/blocks/forms/java/org/apache/cocoon/forms/binding/RepeaterJXPathAdapter.java
  175. +144 −129 src/blocks/forms/java/org/apache/cocoon/forms/binding/RepeaterJXPathCollection.java
  176. +16 −0 src/blocks/forms/java/org/apache/cocoon/forms/binding/TreeModelJXPath.java
  177. +125 −121 src/blocks/forms/java/org/apache/cocoon/forms/formmodel/EnhancedRepeater.java
  178. +5 −0 src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Messages.java
  179. +35 −36 src/blocks/forms/java/org/apache/cocoon/forms/formmodel/RepeaterActionDefinition.java
  180. +8 −10 src/blocks/forms/resources/org/apache/cocoon/forms/resources/forms-advanced-field-styling.xsl
  181. +3 −0 src/blocks/forms/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl
  182. +13 −13 src/blocks/forms/resources/org/apache/cocoon/forms/resources/js/DropdownDateTimePicker.js
  183. +8 −1 src/blocks/forms/resources/org/apache/cocoon/forms/resources/js/MultiValueEditorWithSuggestion.js
  184. +16 −0 src/blocks/forms/resources/org/apache/cocoon/forms/resources/js/templates/InfoPopup.html
  185. +16 −0 src/blocks/forms/resources/org/apache/cocoon/forms/resources/js/templates/MultiValueDoubleList.html
  186. +16 −0 src/blocks/forms/resources/org/apache/cocoon/forms/resources/js/templates/MultiValueEditor.html
  187. +18 −2 ...orms/resources/org/apache/cocoon/forms/resources/js/templates/MultiValueEditorWithSuggestion.html
  188. +16 −0 src/blocks/forms/samples/forms/contactsjson.xml
  189. +1 −1 src/blocks/html/java/org/apache/cocoon/transformation/HTMLTransformer.java
  190. +2 −3 src/blocks/imageop/samples/dir2page.xsl
  191. +17 −1 src/blocks/jcr/samples/repotest/versions/data/dead/beef/facebabecafebabecafebabe/.node.xml
  192. +17 −1 ...es/repotest/versions/data/dead/beef/facebabecafebabecafebabe/672388333465d36a71297afb5d46001f.xml
  193. +17 −1 src/blocks/jcr/samples/repotest/workspaces/default/data/cafe/babe/cafebabecafebabecafebabe/.node.xml
  194. +17 −1 ...t/workspaces/default/data/cafe/babe/cafebabecafebabecafebabe/672388333465d36a71297afb5d46001f.xml
  195. +17 −1 src/blocks/jcr/samples/repotest/workspaces/default/data/dead/beef/cafebabecafebabecafebabe/.node.xml
  196. +17 −1 ...t/workspaces/default/data/dead/beef/cafebabecafebabecafebabe/672388333465d36a71297afb5d46001f.xml
  197. +17 −1 src/blocks/jcr/samples/repotest/workspaces/default/data/dead/beef/cafecafecafebabecafebabe/.node.xml
  198. +17 −1 ...t/workspaces/default/data/dead/beef/cafecafecafebabecafebabe/672388333465d36a71297afb5d46001f.xml
  199. +17 −1 src/blocks/jcr/samples/repotest/workspaces/default/data/dead/beef/facebabecafebabecafebabe/.node.xml
  200. +17 −1 ...t/workspaces/default/data/dead/beef/facebabecafebabecafebabe/672388333465d36a71297afb5d46001f.xml
  201. +1 −1 src/blocks/mail/java/org/apache/cocoon/mail/transformation/SendMailTransformer.java
  202. +1 −1 src/blocks/mail/samples/mail/docs/mid-col-2/asciiart-generator.xml
  203. +2 −2 src/blocks/mail/samples/samples.xml
  204. +2 −2 src/blocks/mail/samples/sendmail/done.xml
  205. +2 −2 src/blocks/mail/samples/sendmail/form.xml
  206. +2 −2 src/blocks/mail/samples/sendmail/sendmail_xsp.xml
  207. +153 −1 src/blocks/naming/samples/forms/person-model.xml
  208. +56 −1 src/blocks/naming/samples/xslt/forms.xsl
  209. +1 −1 src/blocks/ojb/build.xml
  210. +0 −96 src/blocks/portal/conf/portal.samplesxconf
  211. +109 −0 src/blocks/portal/conf/portal.xconf
  212. +13 −0 src/blocks/portal/mocks/javax/servlet/http/HttpServletRequestWrapper.java
  213. +3 −0 src/blocks/portal/mocks/javax/servlet/http/HttpServletResponseWrapper.java
  214. +1 −1 src/blocks/repository/java/org/apache/cocoon/components/repository/SourceRepositoryImpl.java
  215. +11 −1 src/blocks/serializers/java/org/apache/cocoon/components/serializers/EncodingSerializer.java
  216. +0 −21 src/blocks/serializers/java/org/apache/cocoon/components/serializers/HTMLSerializer.java
  217. +43 −3 src/blocks/serializers/java/org/apache/cocoon/components/serializers/XHTMLSerializer.java
  218. +4 −0 src/blocks/serializers/java/org/apache/cocoon/components/serializers/encoding/CharsetFactory.java
  219. +1 −1 src/blocks/serializers/java/org/apache/cocoon/components/serializers/encoding/XHTMLEncoder.java
  220. +1 −1 src/blocks/web3/samples/samples.xml
  221. +1 −1 src/blocks/webdav/samples/samples.xml
  222. +4 −2 src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/SOAPHelper.java
  223. +1 −1 src/java/org/apache/cocoon/bean/CocoonBean.java
  224. +3 −3 src/java/org/apache/cocoon/cocoon.properties
  225. +32 −32 src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
  226. +530 −514 src/java/org/apache/cocoon/components/modules/input/XPathXMLFileModule.java
  227. +8 −0 src/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java
  228. +13 −3 src/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java
  229. +32 −3 src/java/org/apache/cocoon/environment/commandline/AbstractCommandLineEnvironment.java
  230. +1 −8 src/java/org/apache/cocoon/environment/commandline/FileSavingEnvironment.java
  231. +1 −8 src/java/org/apache/cocoon/environment/commandline/LinkSamplingEnvironment.java
  232. +8 −2 src/java/org/apache/cocoon/environment/http/HttpEnvironment.java
  233. +5 −11 src/java/org/apache/cocoon/environment/http/HttpRequest.java
  234. +34 −2 src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java
  235. +17 −50 src/java/org/apache/cocoon/reading/ImageReader.java
  236. +2 −0 src/java/org/apache/cocoon/reading/ResourceReader.java
  237. +4 −3 src/java/org/apache/cocoon/selection/HostSelector.java
  238. +27 −9 src/java/org/apache/cocoon/selection/NamedPatternsSelector.java
  239. +25 −17 src/java/org/apache/cocoon/servlet/CocoonServlet.java
  240. +30 −0 src/java/org/apache/cocoon/transformation/I18nTransformer.java
  241. +16 −2 src/java/org/apache/cocoon/transformation/StripNameSpacesTransformer.java
  242. +61 −3 src/java/org/apache/cocoon/transformation/XIncludeTransformer.java
  243. +107 −0 src/java/org/apache/cocoon/util/log/SLF4JLoggerAdapter.java
  244. +50 −0 src/java/org/apache/cocoon/util/log/SLF4JLoggerManager.java
  245. +4 −1 src/java/org/apache/cocoon/xml/XMLBaseSupport.java
  246. +54 −0 src/test/org/apache/cocoon/SitemapComponentTestCase.java
  247. +39 −39 src/test/org/apache/cocoon/components/source/impl/ZipSourceTestCase.xtest
  248. +27 −0 src/test/org/apache/cocoon/selection/HostSelectorTestCase.java
  249. +1 −0 src/test/org/apache/cocoon/selection/HostSelectorTestCase.xtest
  250. +2 −2 src/test/org/apache/cocoon/transformation/xinclude-result-1.xml
  251. +2 −2 src/webapp/samples/catalog/catalog-demo.xml
  252. +1 −1 src/webapp/samples/common/style/xsl/html/simple-page2html.xsl
  253. +1 −1 src/webapp/samples/hello-world/style/xsl/page2fo.xsl
  254. +2 −3 src/webapp/samples/imagereader/dir2page.xsl
  255. +1 −1 src/webapp/samples/protected/docs/protected.xml
  256. +1 −1 src/webapp/samples/simpleform/one/ERROR.xsp
  257. +1 −1 src/webapp/samples/simpleform/one/OK.xsp
  258. +62 −1 status.xml
  259. +45 −19 tools/bin/ant
  260. +118 −19 tools/bin/ant.bat
  261. +14 −14 tools/bin/ant.cmd
  262. +13 −16 tools/bin/antRun
  263. +16 −14 tools/bin/antRun.bat
  264. +5 −5 tools/bin/antRun.pl
  265. +13 −15 tools/bin/antenv.cmd
  266. +6 −6 tools/bin/complete-ant-cmd.pl
  267. +14 −14 tools/bin/envset.cmd
  268. +9 −9 tools/bin/lcp.bat
  269. +5 −5 tools/bin/runant.pl
  270. +6 −5 tools/bin/runant.py
  271. +17 −17 tools/bin/runrc.cmd
  272. BIN tools/lib/ant-junit.jar
  273. BIN tools/lib/ant-launcher.jar
  274. BIN tools/lib/ant-trax.jar
  275. BIN tools/lib/ant.jar
  276. +10 −0 tools/src/blocks-build.xsl
  277. +43 −0 tools/targets/dist-build.xml
  278. +17 −0 tools/targets/init-build.xml
View
@@ -45,58 +45,6 @@ The initial code of the official Cocoon authentication block (CAuth)
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/
View
@@ -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"
View
62 KEYS
@@ -442,7 +442,7 @@ sig 3 2C312D2F 2005-07-21 Rodent of Unusual Size <coar@OpenSource.Org>
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 of Unusual Size <coar@OpenSource.Org>
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 @@ EQIACQUCSE4y6gIbDAAKCRDIyQiPQGZBQdtoAJ9V0VRezudWbtt6uANzXdbWDcBc
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)
+
+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
+5pz7ducD1Du5Kr3zCNFz0nCadw==
+=M19C
+-----END PGP PUBLIC KEY BLOCK-----
View
@@ -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/).
View
@@ -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]
View
@@ -29,6 +29,8 @@ rem ----- Use Ant shipped with Cocoon. Ignore installed in the system Ant
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
View
@@ -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=$?
View
@@ -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 -----------------------------
View
@@ -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_HOME"
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 ----------------------------------------------------------
View
@@ -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
View
@@ -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@@"/>
Oops, something went wrong.

0 comments on commit 34abcd7

Please sign in to comment.