forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject svn commit: r109950 - in forrest/trunk: lib/core main/webapp/WEB-INF
Date Mon, 06 Dec 2004 04:21:01 GMT
Author: antonio
Date: Sun Dec  5 20:21:01 2004
New Revision: 109950

URL: http://svn.apache.org/viewcvs?view=rev&rev=109950
Log:
Update commons-jxpath to 1.2 (Tested and is working).
Added:
   forrest/trunk/lib/core/commons-jxpath-1.2.jar   (contents, props changed)
   forrest/trunk/lib/core/commons-jxpath-1.2.jar.license.txt   (contents, props changed)
Removed:
   forrest/trunk/lib/core/commons-jxpath-20030909.jar
   forrest/trunk/lib/core/commons-jxpath-20030909.jar.license.txt
Modified:
   forrest/trunk/main/webapp/WEB-INF/cli.xconf

Added: forrest/trunk/lib/core/commons-jxpath-1.2.jar
Url: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/commons-jxpath-1.2.jar?view=auto&rev=109950
==============================================================================
Binary file. No diff available.

Added: forrest/trunk/lib/core/commons-jxpath-1.2.jar.license.txt
Url: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/commons-jxpath-1.2.jar.license.txt?view=auto&rev=109950
==============================================================================
--- (empty file)
+++ forrest/trunk/lib/core/commons-jxpath-1.2.jar.license.txt	Sun Dec  5 20:21:01 2004
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

Deleted: /forrest/trunk/lib/core/commons-jxpath-20030909.jar
Url: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/commons-jxpath-20030909.jar?view=auto&rev=109949
==============================================================================

Deleted: /forrest/trunk/lib/core/commons-jxpath-20030909.jar.license.txt
Url: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/commons-jxpath-20030909.jar.license.txt?view=auto&rev=109949
==============================================================================

Modified: forrest/trunk/main/webapp/WEB-INF/cli.xconf
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/WEB-INF/cli.xconf?view=diff&rev=109950&p1=forrest/trunk/main/webapp/WEB-INF/cli.xconf&r1=109949&p2=forrest/trunk/main/webapp/WEB-INF/cli.xconf&r2=109950
==============================================================================
--- forrest/trunk/main/webapp/WEB-INF/cli.xconf	(original)
+++ forrest/trunk/main/webapp/WEB-INF/cli.xconf	Sun Dec  5 20:21:01 2004
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <!--+
-    |  This is the Apache Cocoon command line configuration file. 
+    |  This is the Apache Cocoon command line configuration file.
     |  Here you give the command line interface details of where
     |  to find various aspects of your Cocoon installation.
     |
@@ -23,37 +23,37 @@
     |  that you wish to generate.
     |
     |  The current configuration information in this file is for
-    |  building the Cocoon documentation. Therefore, all links here 
-    |  are relative to the build context dir, which, in the build.xml 
-    |  file, is set to ${build.context} 
+    |  building the Cocoon documentation. Therefore, all links here
+    |  are relative to the build context dir, which, in the build.xml
+    |  file, is set to ${build.context}
     |
     |  Options:
     |    verbose:            increase amount of information presented
     |                        to standard output (default: false)
-    |    follow-links:       whether linked pages should also be 
+    |    follow-links:       whether linked pages should also be
     |                        generated (default: true)
-    |    precompile-only:    precompile sitemaps and XSP pages, but 
+    |    precompile-only:    precompile sitemaps and XSP pages, but
     |                        do not generate any pages (default: false)
     |    confirm-extensions: check the mime type for the generated page
     |                        and adjust filename and links extensions
-    |                        to match the mime type 
+    |                        to match the mime type
     |                        (e.g. text/html->.html)
     |
-    |  Note: Whilst using an xconf file to configure the Cocoon 
-    |        Command Line gives access to more features, the use of 
-    |        command line parameters is more stable, as there are 
-    |        currently plans to improve the xconf format to allow 
+    |  Note: Whilst using an xconf file to configure the Cocoon
+    |        Command Line gives access to more features, the use of
+    |        command line parameters is more stable, as there are
+    |        currently plans to improve the xconf format to allow
     |        greater flexibility. If you require a stable and
-    |        consistent method for accessing the CLI, it is recommended 
-    |        that you use the command line parameters to configure 
+    |        consistent method for accessing the CLI, it is recommended
+    |        that you use the command line parameters to configure
     |        the CLI. See documentation at:
     |        /userdocs/offline/index.html and Wiki:CommandLine
     |
     +-->
-    
-<cocoon verbose="true"  
-        follow-links="true" 
-        precompile-only="false" 
+
+<cocoon verbose="true"
+        follow-links="true"
+        precompile-only="false"
         confirm-extensions="false">
 
    <!--+
@@ -66,19 +66,19 @@
        |  files and cache files.
        |
        |  The destination directory is where generated pages will
-       |  be written (assuming the 'simple' mapper is used, see 
+       |  be written (assuming the 'simple' mapper is used, see
        |  below)
        +-->
    <context-dir>.</context-dir>
    <config-file>WEB-INF/cocoon.xconf</config-file>
    <work-dir>../tmp/cocoon-work</work-dir>
    <dest-dir>../site</dest-dir>
-   
+
    <!--+
        |  A checksum file can be used to store checksums for pages
-       |  as they are generated. When the site is next generated, 
+       |  as they are generated. When the site is next generated,
        |  files will not be written if their checksum has not changed.
-       |  This means that it will be easier to detect which files 
+       |  This means that it will be easier to detect which files
        |  need to be uploaded to a server, using the timestamp.
        +-->
    <!--   <checksums-uri>build/work/checksums</checksums-uri>-->
@@ -93,7 +93,7 @@
        |     <broken-links type="none"/>
        |
        |   Two attributes to this node specify whether a page should
-       |   be generated when an error has occured. 'generate' specifies 
+       |   be generated when an error has occured. 'generate' specifies
        |   whether a page should be generated (default: true) and
        |   extension specifies an extension that should be appended
        |   to the generated page's filename (default: none)
@@ -101,7 +101,7 @@
        |   Using this, a quick scan through the destination directory
        |   will show broken links, by their filename extension.
        +-->
-   <broken-links type="xml" 
+   <broken-links type="xml"
                  file="../brokenlinks.xml"
                  generate="false"
                  extension=".error"
@@ -118,20 +118,20 @@
    -->
 
    <!--+
-       |  Configures logging. 
-       |  The 'log-kit' parameter specifies the location of the log kit 
-       |  configuration file (usually called logkit.xconf. 
-       | 
-       |  Logger specifies the logging category (for all logging prior 
+       |  Configures logging.
+       |  The 'log-kit' parameter specifies the location of the log kit
+       |  configuration file (usually called logkit.xconf.
+       |
+       |  Logger specifies the logging category (for all logging prior
        |  to other Cocoon logging categories taking over)
        |
        |  Available log levels are:
        |    DEBUG:        prints all level of log messages.
-       |    INFO:         prints all level of log messages except DEBUG 
+       |    INFO:         prints all level of log messages except DEBUG
        |                  ones.
-       |    WARN:         prints all level of log messages except DEBUG 
+       |    WARN:         prints all level of log messages except DEBUG
        |                  and INFO ones.
-       |    ERROR:        prints all level of log messages except DEBUG, 
+       |    ERROR:        prints all level of log messages except DEBUG,
        |                  INFO and WARN ones.
        |    FATAL_ERROR:  prints only log messages of this level
        +-->
@@ -147,7 +147,7 @@
        |  Specifies a user agent string to the sitemap when
        |  generating the site.
        |
-       |  A generic term for a web browser is "user agent". Any 
+       |  A generic term for a web browser is "user agent". Any
        |  user agent, when connecting to a web server, will provide
        |  a string to identify itself (e.g. as Internet Explorer or
        |  Mozilla). It is possible to have Cocoon serve different
@@ -156,7 +156,7 @@
        |  use this <user-agent> entry to provide a 'fake' user agent
        |  to Cocoon, so that it generates the correct version of your
        |  site.
-       | 
+       |
        |  For most sites, this can be ignored.
        +-->
    <!--
@@ -167,8 +167,8 @@
        |  Specifies an accept string to the sitemap when generating
        |  the site.
        |  User agents can specify to an HTTP server what types of content
-       |  (by mime-type) they are able to receive. E.g. a browser may be 
-       |  able to handle jpegs, but not pngs. The HTTP accept header 
+       |  (by mime-type) they are able to receive. E.g. a browser may be
+       |  able to handle jpegs, but not pngs. The HTTP accept header
        |  allows the server to take the browser's capabilities into account,
        |  and only send back content that it can handle.
        |
@@ -176,30 +176,30 @@
        +-->
 
    <accept>*/*</accept>
-   
+
    <!--+
        | Specifies which URIs should be included or excluded, according
-       | to wildcard patterns. 
-       | 
+       | to wildcard patterns.
+       |
        | These includes/excludes are only relevant when you are following
-       | links. A link URI must match an include pattern (if one is given) 
+       | links. A link URI must match an include pattern (if one is given)
        | and not match an exclude pattern, if it is to be followed by
        | Cocoon. It can be useful, for example, where there are links in
-       | your site to pages that are not generated by Cocoon, such as 
+       | your site to pages that are not generated by Cocoon, such as
        | references to api-documentation.
-       | 
+       |
        | By default, all URIs are included. If both include and exclude
-       | patterns are specified, a URI is first checked against the 
+       | patterns are specified, a URI is first checked against the
        | include patterns, and then against the exclude patterns.
-       | 
+       |
        | Multiple patterns can be given, using muliple include or exclude
-       | nodes. 
-       | 
-       | The order of the elements is not significant, as only the first 
+       | nodes.
+       |
+       | The order of the elements is not significant, as only the first
        | successful match of each category is used.
-       | 
+       |
        | Currently, only the complete source URI can be matched (including
-       | any URI prefix). Future plans include destination URI matching 
+       | any URI prefix). Future plans include destination URI matching
        | and regexp matching. If you have requirements for these, contact
        | dev@cocoon.apache.org.
        +-->
@@ -207,18 +207,18 @@
    <exclude pattern="**/"/>
    <exclude pattern="**apidocs**"/>
    <exclude pattern="api/**"/>
-   
-   <exclude pattern="site:**"/>
-   <exclude pattern="ext:**"/>
-      
+
+   <exclude pattern="**site:**"/>
+   <exclude pattern="**ext:**"/>
+
    <!-- Exclude tokens used in URLs to ASF mirrors (interpreted by a CGI) -->
    <exclude pattern="[preferred]/**"/>
    <exclude pattern="[location]"/>
-   
+
    <!--   <include-links extension=".html"/>-->
-   
+
    <!--+
-       |  <uri> nodes specify the URIs that should be generated, and 
+       |  <uri> nodes specify the URIs that should be generated, and
        |  where required, what should be done with the generated pages.
        |  They describe the way the URI of the generated file is created
        |  from the source page's URI. There are three ways that a generated
@@ -232,68 +232,68 @@
        |   <uri type="append" src-prefix="documents/" src="index.html"
        |   dest="build/dest/"/>
        |
-       |  This means that 
+       |  This means that
        |   (1) the "documents/index.html" page is generated
        |   (2) the file will be written to "build/dest/documents/index.html"
        |
        |  replace:
-       |  Completely ignore the generated page's URI - just 
+       |  Completely ignore the generated page's URI - just
        |  use the destination URI:
        |
-       |   <uri type="replace" src-prefix="documents/" src="index.html" 
+       |   <uri type="replace" src-prefix="documents/" src="index.html"
        |   dest="build/dest/docs.html"/>
-       |  
-       |  This means that 
+       |
+       |  This means that
        |   (1) the "documents/index.html" page is generated
        |   (2) the result is written to "build/dest/docs.html"
        |   (3) this works only for "single" pages - and not when links
        |       are followed
        |
        |  insert:
-       |  Insert generated page's URI into the destination 
-       |  URI at the point marked with a * (example uses fictional 
+       |  Insert generated page's URI into the destination
+       |  URI at the point marked with a * (example uses fictional
        |  zip protocol)
        |
-       |   <uri type="insert" src-prefix="documents/" src="index.html" 
+       |   <uri type="insert" src-prefix="documents/" src="index.html"
        |   dest="zip://*.zip/page.html"/>
        |
-       |  This means that 
+       |  This means that
        |   (1)
        |
        |  In any of these scenarios, if the dest attribute is omitted,
-       |  the value provided globally using the <dest-dir> node will 
+       |  the value provided globally using the <dest-dir> node will
        |  be used instead.
        +-->
    <!--
-   <uri type="replace" 
-        src-prefix="samples/" 
+   <uri type="replace"
+        src-prefix="samples/"
         src="hello-world/hello.html"
         dest="build/dest/hello-world.html"/>
    -->
 
    <!--+
-       | <uri> nodes can be grouped together in a <uris> node. This 
+       | <uri> nodes can be grouped together in a <uris> node. This
        | enables a group of URIs to share properties. The following
        | properties can be set for a group of URIs:
        |   * follow-links:       should pages be crawled for links
        |   * confirm-extensions: should file extensions be checked
        |                         for the correct mime type
-       |   * src-prefix:         all source URIs should be 
+       |   * src-prefix:         all source URIs should be
        |                         pre-pended with this prefix before
-       |                         generation. The prefix is not 
-       |                         included when calculating the 
+       |                         generation. The prefix is not
+       |                         included when calculating the
        |                         destination URI
        |   * dest:               the base destination URI to be
        |                         shared by all pages in this group
        |   * type:               the method to be used to calculate
-       |                         the destination URI. See above 
+       |                         the destination URI. See above
        |                         section on <uri> node for details.
-       | 
+       |
        | Each <uris> node can have a name attribute. When a name
        | attribute has been specified, the -n switch on the command
        | line can be used to tell Cocoon to only process the URIs
-       | within this URI group. When no -n switch is given, all 
-       | <uris> nodes are processed. Thus, one xconf file can be 
+       | within this URI group. When no -n switch is given, all
+       | <uris> nodes are processed. Thus, one xconf file can be
        | used to manage multiple sites.
        +-->
    <!--

Mime
View raw message