SLING-713 Refactor the launchpad infrastructure (see issue for details)
SLING-711 Enhance default sling.home for the web app (see SLingServlet and issue)

git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk@735999 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 9810ea4..18a85fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,6 +86,22 @@
         <plugins>
 
             <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>2.2</version>
+                <configuration>
+                    <filesets>
+                        <fileset>
+                            <directory>${basedir}</directory>
+                            <includes>
+                                <include>derby.log</include>
+                                <include>cachedir</include>
+                                <include>sling</include>
+                            </includes>
+                        </fileset>
+                    </filesets>
+                </configuration>
+            </plugin>
+            <plugin>
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>maven-jetty-plugin</artifactId>
                 <configuration>
@@ -99,6 +115,12 @@
                             <name>sling.home</name>
                             <value>${jetty.sling.home}</value>
                         </systemProperty>
+                        
+                        <!-- jython uses this to place various stuff -->
+                        <systemProperty>
+                            <name>python.home</name>
+                            <value>${jetty.sling.home}/python</value>
+                        </systemProperty>
                     </systemProperties>
 
                     <connectors>
@@ -130,11 +152,14 @@
                         </goals>
                         <configuration>
                             <includeArtifactIds>
-                                org.apache.sling.launchpad.app,servlet
+                                org.apache.sling.launchpad.bundles
                             </includeArtifactIds>
+                            <includes>
+                                resources/**
+                            </includes>
                             <excludeTransitive>true</excludeTransitive>
                             <outputDirectory>
-                                ${project.build.directory}/launchpad-app
+                                ${project.build.directory}/launchpad-bundles
                             </outputDirectory>
                             <overWriteReleases>false</overWriteReleases>
                             <overWriteSnapshots>
@@ -142,6 +167,28 @@
                             </overWriteSnapshots>
                         </configuration>
                     </execution>
+                    <!-- Launcher Jar -->                    
+                    <execution>
+                        <id>copy-launcher-jar</id>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.sling</groupId>
+                                    <artifactId>org.apache.sling.launchpad.base</artifactId>
+                                    <version>2.0.3-incubator-SNAPSHOT</version>
+                                </artifactItem>
+                            </artifactItems>
+                            <stripVersion>true</stripVersion>
+                            <excludeTransitive>true</excludeTransitive>
+                            <outputDirectory>
+                                ${project.build.directory}/launchpad-bundles/resources
+                            </outputDirectory>
+                        </configuration>
+                    </execution>
+
                     <execution>
                         <!-- 
                         	Copy bundles that must be initially installed to WEB-INF/resources/N
@@ -153,19 +200,12 @@
                         </goals>
                         <configuration>
                             <outputDirectory>
-                                ${project.build.directory}/${project.build.finalName}/WEB-INF/resources/0
+                                ${project.build.directory}/launchpad-bundles/resources/0
                             </outputDirectory>
                             <excludeTransitive>true</excludeTransitive>
-                            <includeGroupIds>
-                                org.apache.felix,org.apache.sling,org.apache.jackrabbit
-                            </includeGroupIds>
-                            <excludeArtifactIds>
-                              <!-- 
-                              The app and base bundles are not needed as bundles,
-                                we only extract some resources from them
-                              -->
-                              org.apache.sling.launchpad.app,org.apache.sling.launchpad.base
-                            </excludeArtifactIds>
+                            <includeArtifactIds>
+                                org.apache.sling.scripting.python
+                            </includeArtifactIds>
                             <includeScope>
                                 provided
                             </includeScope>
@@ -183,70 +223,12 @@
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
                     <webResources>
-                        <!-- the classes (except unneeded Main) -->
+                        <!-- the configuration resources -->
                         <resource>
                             <directory>
-                                ${basedir}/target/launchpad-app
-                            </directory>
-                            <targetPath>WEB-INF/classes</targetPath>
-                            <excludes>
-                                <exclude>
-                                    org/apache/sling/launcher/app/main/**
-                                </exclude>
-                                <exclude>
-                                    resources/*/org.apache.sling**
-                                </exclude>
-                                <exclude>
-                                    resources/*/org.apache.felix.http.jetty*.jar
-                                </exclude>
-                                <exclude>
-                                    resources/*/pax-web-service*.jar
-                                </exclude>
-                                <exclude>
-                                    resources/*/org.apache.felix.commons.servlet-api*.jar
-                                </exclude>
-                            </excludes>
-                            <includes>
-                                <include>org/**</include>
-                                <include>resources/*/org.apache.felix**</include>
-                            </includes>
-                        </resource>
-                        <!-- the configuration resources, but no Sling bundles -->
-                        <resource>
-                            <directory>
-                                ${basedir}/target/launchpad-app
+                                ${project.build.directory}/launchpad-bundles
                             </directory>
                             <targetPath>WEB-INF</targetPath>
-                            <includes>
-                                <include>resources/**</include>
-                                <include>sling.properties</include>
-                                <include>sling_install.properties</include>
-                                <include>jre-*.properties</include>
-                            </includes>
-                            <excludes>
-                                <exclude>
-                                    resources/*/org.apache.sling**
-                                </exclude>
-                                <exclude>
-                                    resources/*/org.apache.felix.http.jetty*.jar
-                                </exclude>
-                                <exclude>
-                                    resources/*/pax-web-service*.jar
-                                </exclude>
-                                <exclude>
-                                    resources/*/org.apache.felix.commons.servlet-api*.jar
-                                </exclude>
-                            </excludes>
-                        </resource>
-                        <!-- selected WEB-INF resources -->
-                        <resource>
-                            <directory>
-                                ${basedir}/target/launchpad-app
-                            </directory>
-                            <targetPath>/</targetPath>
-                            <includes>
-                                <include>WEB-INF/jcr-client.properties</include>
-                            </includes>
                         </resource>
                         <!-- Legal stuff -->
                         <resource>
@@ -453,271 +435,45 @@
     </profiles>
 
     <dependencies>
+    
+        <!--  The basic Sling WebApp -->
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.launchpad.base</artifactId>
             <version>2.0.3-incubator-SNAPSHOT</version>
-            <scope>provided</scope>
+            <classifier>webapp</classifier>
+            <type>war</type>
+            <scope>runtime</scope>
         </dependency>
+        
+        <!-- The basic Sling Bundles -->
         <dependency>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.commons.log</artifactId>
-            <version>2.0.3-incubator-SNAPSHOT</version>
+            <artifactId>org.apache.sling.launchpad.bundles</artifactId>
+            <version>5-incubator-SNAPSHOT</version>
             <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.commons.json</artifactId>
-            <version>2.0.3-incubator-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.api</artifactId>
-            <version>2.0.3-incubator-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.engine</artifactId>
-            <version>2.0.3-incubator-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.httpauth</artifactId>
-            <version>2.0.3-incubator-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.adapter</artifactId>
-            <version>2.0.3-incubator-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.servlets.resolver</artifactId>
-            <version>2.0.5-incubator-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.servlets.get</artifactId>
-            <version>2.0.3-incubator-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.servlets.post</artifactId>
-            <version>2.0.3-incubator-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling.samples</groupId>
-            <artifactId>org.apache.sling.samples.path-based.rtp</artifactId>
-            <version>2.0.3-incubator-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.commons.osgi</artifactId>
-            <version>2.0.3-incubator-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.commons.mime</artifactId>
-            <version>2.0.3-incubator-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.jcr.api</artifactId>
-            <version>2.0.3-incubator-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.jcr.base</artifactId>
-            <version>2.0.3-incubator-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.jcr.contentloader</artifactId>
-            <version>2.0.3-incubator-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.jcr.resource</artifactId>
-            <version>2.0.3-incubator-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.jcr.ocm</artifactId>
-            <version>2.0.3-incubator-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.jackrabbit</groupId>
-            <artifactId>jackrabbit-api</artifactId>
-            <version>1.5.0</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.jcr.jackrabbit.server</artifactId>
-            <version>2.0.3-incubator-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.jackrabbit</groupId>
-            <artifactId>jackrabbit-jcr-commons</artifactId>
-            <version>1.5.0</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.jcr.webdav</artifactId>
-            <version>2.0.3-incubator-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.jcr.classloader</artifactId>
-            <version>2.0.3-incubator-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.bundleresource.impl</artifactId>
-            <version>2.0.3-incubator-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.launchpad.content</artifactId>
-            <version>2.0.3-incubator-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.scripting.api</artifactId>
-            <version>2.0.3-incubator-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.scripting.core</artifactId>
-            <version>2.0.3-incubator-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.scripting.javascript</artifactId>
-            <version>2.0.3-incubator-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
+
+        <!-- additional bundles for integration tests -->
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.scripting.python</artifactId>
             <version>2.0.3-incubator-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.scripting.jsp</artifactId>
-            <version>2.0.3-incubator-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.scripting.jsp.taglib</artifactId>
-            <version>2.0.3-incubator-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.extensions.apt.servlet</artifactId>
-            <version>2.0.3-incubator-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.commons.json</artifactId>
-            <version>2.0.3-incubator-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.extensions.apt.parser</artifactId>
-            <version>2.0.3-incubator-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
+
+        <!-- Dependencies for the Test Build and Run -->
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.commons.testing</artifactId>
             <version>2.0.3-incubator-SNAPSHOT</version>
-            <scope>provided</scope>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.servlets.post</artifactId>
-            <version>2.0.3-incubator-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.scripting.javascript</artifactId>
-            <version>2.0.3-incubator-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>1.4</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>3.2.1</version>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.launchpad.app</artifactId>
-            <version>5-incubator-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.equinox.http</groupId>
-            <artifactId>servlet</artifactId>
-            <version>1.0.0-v20070606</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-            <version>3.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.5.2</version>
+            <version>2.0.2-incubator</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -726,11 +482,16 @@
             <version>1.5.2</version>
             <scope>test</scope>
         </dependency>
-
-        <!-- The servlet container will have to provide these API classes -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>1.5.2</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 </project>
diff --git a/src/main/webapp/WEB-INF/DISCLAIMER b/src/main/webapp/WEB-INF/DISCLAIMER
deleted file mode 100644
index 90850c2..0000000
--- a/src/main/webapp/WEB-INF/DISCLAIMER
+++ /dev/null
@@ -1,7 +0,0 @@
-Apache Sling is an effort undergoing incubation at The Apache Software Foundation (ASF),
-sponsored by the Apache Jackrabbit PMC. Incubation is required of all newly accepted
-projects until a further review indicates that the infrastructure, communications,
-and decision making process have stabilized in a manner consistent with other
-successful ASF projects. While incubation status is not necessarily a reflection of
-the completeness or stability of the code, it does indicate that the project has yet
-to be fully endorsed by the ASF.
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/LICENSE b/src/main/webapp/WEB-INF/LICENSE
deleted file mode 100644
index 86c3f2f..0000000
--- a/src/main/webapp/WEB-INF/LICENSE
+++ /dev/null
@@ -1,1291 +0,0 @@
-
-                                 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.
-
-
-APACHE SLING SUBCOMPONENTS:
-
-Apache Sling includes subcomponents with separate copyright notices and
-license terms. Your use of these subcomponents is subject to the terms
-and conditions of the following licenses.
-
-JSON in Java
-
-   Copyright (c) 2002 JSON.org
-
-   Permission is hereby granted, free of charge, to any person obtaining
-   a copy of this software and associated documentation files (the
-   "Software"), to deal in the Software without restriction, including
-   without limitation the rights to use, copy, modify, merge, publish,
-   distribute, sublicense, and/or sell copies of the Software, and to
-   permit persons to whom the Software is furnished to do so, subject to
-   the following conditions:
-
-   The above copyright notice and this permission notice shall be included
-   in all copies or substantial portions of the Software.
-
-   The Software shall be used for Good, not Evil.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-   DEALINGS IN THE SOFTWARE.
-
-SLF4J logging libraries
-
-   Copyright (c) 2004-2007 QOS.ch
-   All rights reserved.
-
-   Permission is hereby granted, free of charge, to any person obtaining
-   a copy of this software and associated documentation files (the
-   "Software"), to deal in the Software without restriction, including
-   without limitation the rights to use, copy, modify, merge, publish,
-   distribute, sublicense, and/or sell copies of the Software, and to
-   permit persons to whom the Software is furnished to do so, subject to
-   the following conditions:
-
-   The above copyright notice and this permission notice shall be
-   included in all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-   LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-   OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-JCR 1.0 API
-
-   Day Management AG ("Licensor") is willing to license this specification
-   to you ONLY UPON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS CONTAINED
-   IN THIS LICENSE AGREEMENT ("Agreement"). Please read the terms and
-   conditions of this Agreement carefully.
-
-   Content Repository for JavaTM Technology API Specification ("Specification")
-   Version: 1.0
-   Status: FCS
-   Release: 11 May 2005
-
-   Copyright 2005 Day Management AG
-   Barfusserplatz 6, 4001 Basel, Switzerland.
-   All rights reserved.
-
-   NOTICE; LIMITED LICENSE GRANTS
-
-   1. License for Purposes of Evaluation and Developing Applications. Licensor
-   hereby grants you a fully-paid, non-exclusive, non-transferable, worldwide,
-   limited license (without the right to sublicense), under Licensor's
-   applicable intellectual property rights to view, download, use and
-   reproduce the Specification only for the purpose of internal evaluation.
-   This includes developing applications intended to run on an implementation
-   of the Specification provided that such applications do not themselves
-   implement any portion(s) of the Specification.
-
-   2. License for the Distribution of Compliant Implementations. Licensor also
-   grants you a perpetual, non-exclusive, non-transferable, worldwide, fully
-   paid-up, royalty free, limited license (without the right to sublicense)
-   under any applicable copyrights or, subject to the provisions of subsection
-   4 below, patent rights it may have covering the Specification to create
-   and/or distribute an Independent Implementation of the Specification that:
-   (a) fully implements the Specification including all its required
-   interfaces and functionality; (b) does not modify, subset, superset or
-   otherwise extend the Licensor Name Space, or include any public or
-   protected packages, classes, Java interfaces, fields or methods within
-   the Licensor Name Space other than those required/authorized by the
-   Specification or Specifications being implemented; and (c) passes the
-   Technology Compatibility Kit (including satisfying the requirements of the
-   applicable TCK Users Guide) for such Specification ("Compliant
-   Implementation"). In addition, the foregoing license is expressly
-   conditioned on your not acting outside its scope. No license is granted
-   hereunder for any other purpose (including, for example, modifying the
-   Specification, other than to the extent of your fair use rights, or
-   distributing the Specification to third parties).
-
-   3. Pass-through Conditions. You need not include limitations (a)-(c) from
-   the previous paragraph or any other particular "pass through" requirements
-   in any license You grant concerning the use of your Independent
-   Implementation or products derived from it. However, except with respect
-   to Independent Implementations (and products derived from them) that
-   satisfy limitations (a)-(c) from the previous paragraph, You may neither:
-   (a) grant or otherwise pass through to your licensees any licenses under
-   Licensor's applicable intellectual property rights; nor (b) authorize your
-   licensees to make any claims concerning their implementation's compliance
-   with the Specification.
-
-   4. Reciprocity Concerning Patent Licenses. With respect to any patent
-   claims covered by the license granted under subparagraph 2 above that
-   would be infringed by all technically feasible implementations of the
-   Specification, such license is conditioned upon your offering on fair,
-   reasonable and non-discriminatory terms, to any party seeking it from You,
-   a perpetual, non-exclusive, non-transferable, worldwide license under Your
-   patent rights that are or would be infringed by all technically feasible
-   implementations of the Specification to develop, distribute and use a
-   Compliant Implementation.
-
-   5. Definitions. For the purposes of this Agreement: "Independent
-   Implementation" shall mean an implementation of the Specification that
-   neither derives from any of Licensor's source code or binary code materials
-   nor, except with an appropriate and separate license from Licensor,
-   includes any of Licensor's source code or binary code materials; "Licensor
-   Name Space" shall mean the public class or interface declarations whose
-   names begin with "java", "javax", "javax.jcr" or their equivalents in any
-   subsequent naming convention adopted by Licensor through the Java Community
-   Process, or any recognized successors or replacements thereof; and
-   "Technology Compatibility Kit" or "TCK" shall mean the test suite and
-   accompanying TCK User's Guide provided by Licensor which corresponds to
-   the particular version of the Specification being tested.
-
-   6. Termination. This Agreement will terminate immediately without notice
-   from Licensor if you fail to comply with any material provision of or act
-   outside the scope of the licenses granted above.
-
-   7. Trademarks. No right, title, or interest in or to any trademarks,
-   service marks, or trade names of Licensor is granted hereunder. Java is
-   a registered trademark of Sun Microsystems, Inc. in the United States and
-   other countries.
-
-   8. Disclaimer of Warranties. The Specification is provided "AS IS".
-   LICENSOR MAKES NO REPRESENTATIONS OR WARRANTIES, EITHER EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT (INCLUDING AS A
-   CONSEQUENCE OF ANY PRACTICE OR IMPLEMENTATION OF THE SPECIFICATION),
-   OR THAT THE CONTENTS OF THE SPECIFICATION ARE SUITABLE FOR ANY PURPOSE.
-   This document does not represent any commitment to release or implement
-   any portion of the Specification in any product.
-
-   The Specification could include technical inaccuracies or typographical
-   errors. Changes are periodically added to the information therein; these
-   changes will be incorporated into new versions of the Specification, if
-   any. Licensor may make improvements and/or changes to the product(s)
-   and/or the program(s) described in the Specification at any time. Any use
-   of such changes in the Specification will be governed by the then-current
-   license for the applicable version of the Specification.
-
-   9. Limitation of Liability. TO THE EXTENT NOT PROHIBITED BY LAW, IN NO
-   EVENT WILL LICENSOR BE LIABLE FOR ANY DAMAGES, INCLUDING WITHOUT
-   LIMITATION, LOST REVENUE, PROFITS OR DATA, OR FOR SPECIAL, INDIRECT,
-   CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND
-   REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED TO ANY
-   FURNISHING, PRACTICING, MODIFYING OR ANY USE OF THE SPECIFICATION, EVEN
-   IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-   10. Report. If you provide Licensor with any comments or suggestions in
-   connection with your use of the Specification ("Feedback"), you hereby:
-   (i) agree that such Feedback is provided on a non-proprietary and
-   non-confidential basis, and (ii) grant Licensor a perpetual, non-exclusive,
-   worldwide, fully paid-up, irrevocable license, with the right to sublicense
-   through multiple levels of sublicensees, to incorporate, disclose, and use
-   without limitation the Feedback for any purpose related to the
-   Specification and future versions, implementations, and test suites thereof.
-
-kXML parser
-
-   Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany
-
-   Permission is hereby granted, free of charge, to any person obtaining
-   a copy of this software and associated documentation files (the
-   "Software"), to deal in the Software without restriction, including
-   without limitation the rights to use, copy, modify, merge, publish,
-   distribute, sublicense, and/or sell copies of the Software, and to permit
-   persons to whom the Software is furnished to do so, subject to the
-   following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-   IN THE SOFTWARE. 
-
-Rhino
-
-                          MOZILLA PUBLIC LICENSE
-                                Version 1.1
-
-                              ---------------
-
-   1. Definitions.
-
-     1.0.1. "Commercial Use" means distribution or otherwise making the
-     Covered Code available to a third party.
-
-     1.1. "Contributor" means each entity that creates or contributes to
-     the creation of Modifications.
-
-     1.2. "Contributor Version" means the combination of the Original
-     Code, prior Modifications used by a Contributor, and the Modifications
-     made by that particular Contributor.
-
-     1.3. "Covered Code" means the Original Code or Modifications or the
-     combination of the Original Code and Modifications, in each case
-     including portions thereof.
-
-     1.4. "Electronic Distribution Mechanism" means a mechanism generally
-     accepted in the software development community for the electronic
-     transfer of data.
-
-     1.5. "Executable" means Covered Code in any form other than Source
-     Code.
-
-     1.6. "Initial Developer" means the individual or entity identified
-     as the Initial Developer in the Source Code notice required by Exhibit
-     A.
-
-     1.7. "Larger Work" means a work which combines Covered Code or
-     portions thereof with code not governed by the terms of this License.
-
-     1.8. "License" means this document.
-
-     1.8.1. "Licensable" means having the right to grant, to the maximum
-     extent possible, whether at the time of the initial grant or
-     subsequently acquired, any and all of the rights conveyed herein.
-
-     1.9. "Modifications" means any addition to or deletion from the
-     substance or structure of either the Original Code or any previous
-     Modifications. When Covered Code is released as a series of files, a
-     Modification is:
-          A. Any addition to or deletion from the contents of a file
-          containing Original Code or previous Modifications.
-
-          B. Any new file that contains any part of the Original Code or
-          previous Modifications.
-
-     1.10. "Original Code" means Source Code of computer software code
-     which is described in the Source Code notice required by Exhibit A as
-     Original Code, and which, at the time of its release under this
-     License is not already Covered Code governed by this License.
-
-     1.10.1. "Patent Claims" means any patent claim(s), now owned or
-     hereafter acquired, including without limitation,  method, process,
-     and apparatus claims, in any patent Licensable by grantor.
-
-     1.11. "Source Code" means the preferred form of the Covered Code for
-     making modifications to it, including all modules it contains, plus
-     any associated interface definition files, scripts used to control
-     compilation and installation of an Executable, or source code
-     differential comparisons against either the Original Code or another
-     well known, available Covered Code of the Contributor's choice. The
-     Source Code can be in a compressed or archival form, provided the
-     appropriate decompression or de-archiving software is widely available
-     for no charge.
-
-     1.12. "You" (or "Your")  means an individual or a legal entity
-     exercising rights under, and complying with all of the terms of, this
-     License or a future version of this License issued under Section 6.1.
-     For legal entities, "You" includes any entity which controls, is
-     controlled by, or is under common control with You. For purposes of
-     this definition, "control" means (a) the power, direct or indirect,
-     to cause the direction or management of such entity, whether by
-     contract or otherwise, or (b) ownership of more than fifty percent
-     (50%) of the outstanding shares or beneficial ownership of such
-     entity.
-
-   2. Source Code License.
-
-     2.1. The Initial Developer Grant.
-     The Initial Developer hereby grants You a world-wide, royalty-free,
-     non-exclusive license, subject to third party intellectual property
-     claims:
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Initial Developer to use, reproduce,
-          modify, display, perform, sublicense and distribute the Original
-          Code (or portions thereof) with or without Modifications, and/or
-          as part of a Larger Work; and
-
-          (b) under Patents Claims infringed by the making, using or
-          selling of Original Code, to make, have made, use, practice,
-          sell, and offer for sale, and/or otherwise dispose of the
-          Original Code (or portions thereof).
-
-          (c) the licenses granted in this Section 2.1(a) and (b) are
-          effective on the date Initial Developer first distributes
-          Original Code under the terms of this License.
-
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-          granted: 1) for code that You delete from the Original Code; 2)
-          separate from the Original Code;  or 3) for infringements caused
-          by: i) the modification of the Original Code or ii) the
-          combination of the Original Code with other software or devices.
-
-     2.2. Contributor Grant.
-     Subject to third party intellectual property claims, each Contributor
-     hereby grants You a world-wide, royalty-free, non-exclusive license
-
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Contributor, to use, reproduce, modify,
-          display, perform, sublicense and distribute the Modifications
-          created by such Contributor (or portions thereof) either on an
-          unmodified basis, with other Modifications, as Covered Code
-          and/or as part of a Larger Work; and
-
-          (b) under Patent Claims infringed by the making, using, or
-          selling of  Modifications made by that Contributor either alone
-          and/or in combination with its Contributor Version (or portions
-          of such combination), to make, use, sell, offer for sale, have
-          made, and/or otherwise dispose of: 1) Modifications made by that
-          Contributor (or portions thereof); and 2) the combination of
-          Modifications made by that Contributor with its Contributor
-          Version (or portions of such combination).
-
-          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-          effective on the date Contributor first makes Commercial Use of
-          the Covered Code.
-
-          (d)    Notwithstanding Section 2.2(b) above, no patent license is
-          granted: 1) for any code that Contributor has deleted from the
-          Contributor Version; 2)  separate from the Contributor Version;
-          3)  for infringements caused by: i) third party modifications of
-          Contributor Version or ii)  the combination of Modifications made
-          by that Contributor with other software  (except as part of the
-          Contributor Version) or other devices; or 4) under Patent Claims
-          infringed by Covered Code in the absence of Modifications made by
-          that Contributor.
-
-   3. Distribution Obligations.
-
-     3.1. Application of License.
-     The Modifications which You create or to which You contribute are
-     governed by the terms of this License, including without limitation
-     Section 2.2. The Source Code version of Covered Code may be
-     distributed only under the terms of this License or a future version
-     of this License released under Section 6.1, and You must include a
-     copy of this License with every copy of the Source Code You
-     distribute. You may not offer or impose any terms on any Source Code
-     version that alters or restricts the applicable version of this
-     License or the recipients' rights hereunder. However, You may include
-     an additional document offering the additional rights described in
-     Section 3.5.
-
-     3.2. Availability of Source Code.
-     Any Modification which You create or to which You contribute must be
-     made available in Source Code form under the terms of this License
-     either on the same media as an Executable version or via an accepted
-     Electronic Distribution Mechanism to anyone to whom you made an
-     Executable version available; and if made available via Electronic
-     Distribution Mechanism, must remain available for at least twelve (12)
-     months after the date it initially became available, or at least six
-     (6) months after a subsequent version of that particular Modification
-     has been made available to such recipients. You are responsible for
-     ensuring that the Source Code version remains available even if the
-     Electronic Distribution Mechanism is maintained by a third party.
-
-     3.3. Description of Modifications.
-     You must cause all Covered Code to which You contribute to contain a
-     file documenting the changes You made to create that Covered Code and
-     the date of any change. You must include a prominent statement that
-     the Modification is derived, directly or indirectly, from Original
-     Code provided by the Initial Developer and including the name of the
-     Initial Developer in (a) the Source Code, and (b) in any notice in an
-     Executable version or related documentation in which You describe the
-     origin or ownership of the Covered Code.
-
-     3.4. Intellectual Property Matters
-          (a) Third Party Claims.
-          If Contributor has knowledge that a license under a third party's
-          intellectual property rights is required to exercise the rights
-          granted by such Contributor under Sections 2.1 or 2.2,
-          Contributor must include a text file with the Source Code
-          distribution titled "LEGAL" which describes the claim and the
-          party making the claim in sufficient detail that a recipient will
-          know whom to contact. If Contributor obtains such knowledge after
-          the Modification is made available as described in Section 3.2,
-          Contributor shall promptly modify the LEGAL file in all copies
-          Contributor makes available thereafter and shall take other steps
-          (such as notifying appropriate mailing lists or newsgroups)
-          reasonably calculated to inform those who received the Covered
-          Code that new knowledge has been obtained.
-
-          (b) Contributor APIs.
-          If Contributor's Modifications include an application programming
-          interface and Contributor has knowledge of patent licenses which
-          are reasonably necessary to implement that API, Contributor must
-          also include this information in the LEGAL file.
-
-               (c)    Representations.
-          Contributor represents that, except as disclosed pursuant to
-          Section 3.4(a) above, Contributor believes that Contributor's
-          Modifications are Contributor's original creation(s) and/or
-          Contributor has sufficient rights to grant the rights conveyed by
-          this License.
-
-     3.5. Required Notices.
-     You must duplicate the notice in Exhibit A in each file of the Source
-     Code.  If it is not possible to put such notice in a particular Source
-     Code file due to its structure, then You must include such notice in a
-     location (such as a relevant directory) where a user would be likely
-     to look for such a notice.  If You created one or more Modification(s)
-     You may add your name as a Contributor to the notice described in
-     Exhibit A.  You must also duplicate this License in any documentation
-     for the Source Code where You describe recipients' rights or ownership
-     rights relating to Covered Code.  You may choose to offer, and to
-     charge a fee for, warranty, support, indemnity or liability
-     obligations to one or more recipients of Covered Code. However, You
-     may do so only on Your own behalf, and not on behalf of the Initial
-     Developer or any Contributor. You must make it absolutely clear than
-     any such warranty, support, indemnity or liability obligation is
-     offered by You alone, and You hereby agree to indemnify the Initial
-     Developer and every Contributor for any liability incurred by the
-     Initial Developer or such Contributor as a result of warranty,
-     support, indemnity or liability terms You offer.
-
-     3.6. Distribution of Executable Versions.
-     You may distribute Covered Code in Executable form only if the
-     requirements of Section 3.1-3.5 have been met for that Covered Code,
-     and if You include a notice stating that the Source Code version of
-     the Covered Code is available under the terms of this License,
-     including a description of how and where You have fulfilled the
-     obligations of Section 3.2. The notice must be conspicuously included
-     in any notice in an Executable version, related documentation or
-     collateral in which You describe recipients' rights relating to the
-     Covered Code. You may distribute the Executable version of Covered
-     Code or ownership rights under a license of Your choice, which may
-     contain terms different from this License, provided that You are in
-     compliance with the terms of this License and that the license for the
-     Executable version does not attempt to limit or alter the recipient's
-     rights in the Source Code version from the rights set forth in this
-     License. If You distribute the Executable version under a different
-     license You must make it absolutely clear that any terms which differ
-     from this License are offered by You alone, not by the Initial
-     Developer or any Contributor. You hereby agree to indemnify the
-     Initial Developer and every Contributor for any liability incurred by
-     the Initial Developer or such Contributor as a result of any such
-     terms You offer.
-
-     3.7. Larger Works.
-     You may create a Larger Work by combining Covered Code with other code
-     not governed by the terms of this License and distribute the Larger
-     Work as a single product. In such a case, You must make sure the
-     requirements of this License are fulfilled for the Covered Code.
-
-   4. Inability to Comply Due to Statute or Regulation.
-
-     If it is impossible for You to comply with any of the terms of this
-     License with respect to some or all of the Covered Code due to
-     statute, judicial order, or regulation then You must: (a) comply with
-     the terms of this License to the maximum extent possible; and (b)
-     describe the limitations and the code they affect. Such description
-     must be included in the LEGAL file described in Section 3.4 and must
-     be included with all distributions of the Source Code. Except to the
-     extent prohibited by statute or regulation, such description must be
-     sufficiently detailed for a recipient of ordinary skill to be able to
-     understand it.
-
-   5. Application of this License.
-
-     This License applies to code to which the Initial Developer has
-     attached the notice in Exhibit A and to related Covered Code.
-
-   6. Versions of the License.
-
-     6.1. New Versions.
-     Netscape Communications Corporation ("Netscape") may publish revised
-     and/or new versions of the License from time to time. Each version
-     will be given a distinguishing version number.
-
-     6.2. Effect of New Versions.
-     Once Covered Code has been published under a particular version of the
-     License, You may always continue to use it under the terms of that
-     version. You may also choose to use such Covered Code under the terms
-     of any subsequent version of the License published by Netscape. No one
-     other than Netscape has the right to modify the terms applicable to
-     Covered Code created under this License.
-
-     6.3. Derivative Works.
-     If You create or use a modified version of this License (which you may
-     only do in order to apply it to code which is not already Covered Code
-     governed by this License), You must (a) rename Your license so that
-     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
-     "MPL", "NPL" or any confusingly similar phrase do not appear in your
-     license (except to note that your license differs from this License)
-     and (b) otherwise make it clear that Your version of the license
-     contains terms which differ from the Mozilla Public License and
-     Netscape Public License. (Filling in the name of the Initial
-     Developer, Original Code or Contributor in the notice described in
-     Exhibit A shall not of themselves be deemed to be modifications of
-     this License.)
-
-   7. DISCLAIMER OF WARRANTY.
-
-     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
-     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
-     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
-     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-   8. TERMINATION.
-
-     8.1.  This License and the rights granted hereunder will terminate
-     automatically if You fail to comply with terms herein and fail to cure
-     such breach within 30 days of becoming aware of the breach. All
-     sublicenses to the Covered Code which are properly granted shall
-     survive any termination of this License. Provisions which, by their
-     nature, must remain in effect beyond the termination of this License
-     shall survive.
-
-     8.2.  If You initiate litigation by asserting a patent infringement
-     claim (excluding declatory judgment actions) against Initial Developer
-     or a Contributor (the Initial Developer or Contributor against whom
-     You file such action is referred to as "Participant")  alleging that:
-
-     (a)  such Participant's Contributor Version directly or indirectly
-     infringes any patent, then any and all rights granted by such
-     Participant to You under Sections 2.1 and/or 2.2 of this License
-     shall, upon 60 days notice from Participant terminate prospectively,
-     unless if within 60 days after receipt of notice You either: (i)
-     agree in writing to pay Participant a mutually agreeable reasonable
-     royalty for Your past and future use of Modifications made by such
-     Participant, or (ii) withdraw Your litigation claim with respect to
-     the Contributor Version against such Participant.  If within 60 days
-     of notice, a reasonable royalty and payment arrangement are not
-     mutually agreed upon in writing by the parties or the litigation claim
-     is not withdrawn, the rights granted by Participant to You under
-     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
-     the 60 day notice period specified above.
-
-     (b)  any software, hardware, or device, other than such Participant's
-     Contributor Version, directly or indirectly infringes any patent, then
-     any rights granted to You by such Participant under Sections 2.1(b)
-     and 2.2(b) are revoked effective as of the date You first made, used,
-     sold, distributed, or had made, Modifications made by that
-     Participant.
-
-     8.3.  If You assert a patent infringement claim against Participant
-     alleging that such Participant's Contributor Version directly or
-     indirectly infringes any patent where such claim is resolved (such as
-     by license or settlement) prior to the initiation of patent
-     infringement litigation, then the reasonable value of the licenses
-     granted by such Participant under Sections 2.1 or 2.2 shall be taken
-     into account in determining the amount or value of any payment or
-     license.
-
-     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
-     all end user license agreements (excluding distributors and resellers)
-     which have been validly granted by You or any distributor hereunder
-     prior to termination shall survive termination.
-
-   9. LIMITATION OF LIABILITY.
-
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
-     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-   10. U.S. GOVERNMENT END USERS.
-
-     The Covered Code is a "commercial item," as that term is defined in
-     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
-     software" and "commercial computer software documentation," as such
-     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
-     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
-     all U.S. Government End Users acquire Covered Code with only those
-     rights set forth herein.
-
-   11. MISCELLANEOUS.
-
-     This License represents the complete agreement concerning subject
-     matter hereof. If any provision of this License is held to be
-     unenforceable, such provision shall be reformed only to the extent
-     necessary to make it enforceable. This License shall be governed by
-     California law provisions (except to the extent applicable law, if
-     any, provides otherwise), excluding its conflict-of-law provisions.
-     With respect to disputes in which at least one party is a citizen of,
-     or an entity chartered or registered to do business in the United
-     States of America, any litigation relating to this License shall be
-     subject to the jurisdiction of the Federal Courts of the Northern
-     District of California, with venue lying in Santa Clara County,
-     California, with the losing party responsible for costs, including
-     without limitation, court costs and reasonable attorneys' fees and
-     expenses. The application of the United Nations Convention on
-     Contracts for the International Sale of Goods is expressly excluded.
-     Any law or regulation which provides that the language of a contract
-     shall be construed against the drafter shall not apply to this
-     License.
-
-   12. RESPONSIBILITY FOR CLAIMS.
-
-     As between Initial Developer and the Contributors, each party is
-     responsible for claims and damages arising, directly or indirectly,
-     out of its utilization of rights under this License and You agree to
-     work with Initial Developer and Contributors to distribute such
-     responsibility on an equitable basis. Nothing herein is intended or
-     shall be deemed to constitute any admission of liability.
-
-   13. MULTIPLE-LICENSED CODE.
-
-     Initial Developer may designate portions of the Covered Code as
-     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
-     Developer permits you to utilize portions of the Covered Code under
-     Your choice of the NPL or the alternative licenses, if any, specified
-     by the Initial Developer in the file described in Exhibit A.
-
-   EXHIBIT A -Mozilla Public License.
-
-     ``The contents of this file are subject to the Mozilla Public License
-     Version 1.1 (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.mozilla.org/MPL/
-
-     Software distributed under the License is distributed on an "AS IS"
-     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-     License for the specific language governing rights and limitations
-     under the License.
-
-     The Original Code is ______________________________________.
-
-     The Initial Developer of the Original Code is ________________________.
-     Portions created by ______________________ are Copyright (C) ______
-     _______________________. All Rights Reserved.
-
-     Contributor(s): ______________________________________.
-
-     Alternatively, the contents of this file may be used under the terms
-     of the _____ license (the  "[___] License"), in which case the
-     provisions of [______] License are applicable instead of those
-     above.  If you wish to allow use of your version of this file only
-     under the terms of the [____] License and not to allow others to use
-     your version of this file under the MPL, indicate your decision by
-     deleting  the provisions above and replace  them with the notice and
-     other provisions required by the [___] License.  If you do not delete
-     the provisions above, a recipient may use your version of this file
-     under either the MPL or the [___] License."
-
-     [NOTE: The text of this Exhibit A may differ slightly from the text of
-     the notices in the Source Code files of the Original Code. You should
-     use the text of this Exhibit A rather than the text found in the
-     Original Code Source Code for Your Modifications.]
-
-W3C XPath parser
-
-   XPath 2.0/XQuery 1.0 Parser:
-   http://www.w3.org/2002/11/xquery-xpath-applets/xgrammar.zip
-
-   Copyright (C) 2002 World Wide Web Consortium, (Massachusetts Institute of
-   Technology, European Research Consortium for Informatics and Mathematics,
-   Keio University). All Rights Reserved.
-
-   This work is distributed under the W3C(R) Software License in the hope
-   that it will be useful, but WITHOUT ANY WARRANTY; without even the
-   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-   W3C(R) SOFTWARE NOTICE AND LICENSE
-   http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-   This work (and included software, documentation such as READMEs, or
-   other related items) is being provided by the copyright holders under
-   the following license. By obtaining, using and/or copying this work,
-   you (the licensee) agree that you have read, understood, and will comply
-   with the following terms and conditions.
-
-   Permission to copy, modify, and distribute this software and its
-   documentation, with or without modification, for any purpose and
-   without fee or royalty is hereby granted, provided that you include
-   the following on ALL copies of the software and documentation or
-   portions thereof, including modifications:
-
-      1. The full text of this NOTICE in a location viewable to users
-         of the redistributed or derivative work.
-
-      2. Any pre-existing intellectual property disclaimers, notices,
-         or terms and conditions. If none exist, the W3C Software Short
-         Notice should be included (hypertext is preferred, text is
-         permitted) within the body of any redistributed or derivative code.
-
-      3. Notice of any changes or modifications to the files, including
-         the date changes were made. (We recommend you provide URIs to the
-         location from which the code is derived.)
-
-   THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT
-   HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
-   INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS
-   FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR
-   DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
-   TRADEMARKS OR OTHER RIGHTS.
-
-   COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL
-   OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
-   DOCUMENTATION.
-
-   The name and trademarks of copyright holders may NOT be used in
-   advertising or publicity pertaining to the software without specific,
-   written prior permission. Title to copyright in this software and
-   any associated documentation will at all times remain with
-   copyright holders.
-
-Concurrent
-
-   http://g.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html
-
-   All classes are released to the public domain and may be used for any
-   purpose whatsoever without permission or acknowledgment. Portions of
-   the CopyOnWriteArrayList and ConcurrentReaderHashMap classes are adapted
-   from Sun JDK source code. These are copyright of Sun Microsystems, Inc,
-   and are used with their kind permission, as described in this license:
-
-   TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. TO DOUG LEA
-
-   Whereas Doug Lea desires to utlized certain Java Software technologies
-   in the util.concurrent technology; and Whereas Sun Microsystems, Inc.
-   ("Sun") desires that Doug Lea utilize certain Java Software technologies
-   in the util.concurrent technology;
-
-   Therefore the parties agree as follows, effective May 31, 2002:
-
-   "Java Software technologies" means
-
-       classes/java/util/ArrayList.java, and
-       classes/java/util/HashMap.java.
-
-   The Java Software technologies are Copyright (c) 1994-2000 Sun
-   Microsystems, Inc. All rights reserved.
-
-   Sun hereby grants Doug Lea a non-exclusive, worldwide, non-transferrable
-   license to use, reproduce, create derivate works of, and distribute the
-   Java Software and derivative works thereof in source and binary forms
-   as part of a larger work, and to sublicense the right to use, reproduce
-   and distribute the Java Software and Doug Lea's derivative works as the
-   part of larger works through multiple tiers of sublicensees provided that
-   the following conditions are met:
-
-   -Neither the name of or trademarks of Sun may be used to endorse or
-   promote products including or derived from the Java Software technology
-   without specific prior written permission; and
-   -Redistributions of source or binary code must contain the above
-   copyright notice, this notice and and the following disclaimers:
-
-   This software is provided "AS IS," without a warranty of any kind.
-   ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
-   INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
-   PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
-   MICROSYSTEMS, INC. AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES
-   SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR DISTRIBUTING
-   THE SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN MICROSYSTEMS, INC.
-   OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
-   DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES,
-   HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF
-   THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN MICROSYSTEMS, INC.
-   HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-   You acknowledge that Software is not designed,licensed or intended for
-   use in the design, construction, operation or maintenance of any nuclear
-   facility.
-
-PDFBox
-
-   Copyright (c) 2003-2005, www.pdfbox.org
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are met:
-
-   1. Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-   2. Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-   3. Neither the name of pdfbox; nor the names of its contributors may be
-      used to endorse or promote products derived from this software without
-      specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-   ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-   FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-   OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-   OF SUCH DAMAGE.
-
-CyberNeko HTML Parser
-
-   The CyberNeko Software License, Version 1.0
-
-   (C) Copyright 2002-2005, Andy Clark.  All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in
-      the documentation and/or other materials provided with the
-      distribution.
-
-   3. The end-user documentation included with the redistribution,
-      if any, must include the following acknowledgment:
-        "This product includes software developed by Andy Clark."
-      Alternately, this acknowledgment may appear in the software itself,
-      if and wherever such third-party acknowledgments normally appear.
-
-   4. The names "CyberNeko" and "NekoHTML" must not be used to endorse
-      or promote products derived from this software without prior
-      written permission. For written permission, please contact
-      andyc@cyberneko.net.
-
-   5. Products derived from this software may not be called "CyberNeko",
-      nor may "CyberNeko" appear in their name, without prior written
-      permission of the author.
-
-   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-   WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-   DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR OTHER CONTRIBUTORS
-   BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-   OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-   OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-   BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-   OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-   EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-   ====================================================================
-
-   This license is based on the Apache Software License, version 1.1.
-
-Equinox
-
-   Eclipse Public License - v 1.0
-
-   THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
-   LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
-   CONSTITUTES RECIPIENTÕS ACCEPTANCE OF THIS AGREEMENT.
-
-   1. DEFINITIONS
-
-   "Contribution" means:
-
-      a) in the case of the initial Contributor, the initial code and
-         documentation distributed under this Agreement, and
-      b) in the case of each subsequent Contributor:
-      i) changes to the Program, and
-      ii) additions to the Program;
-      where such changes and/or additions to the Program originate from and
-      are distributed by that particular Contributor. A Contribution
-      'originates' from a Contributor if it was added to the Program by such
-      Contributor itself or anyone acting on such Contributor's behalf.
-      Contributions do not include additions to the Program which: (i) are
-      separate modules of software distributed in conjunction with the Program
-      under their own license agreement, and (ii) are not derivative works of
-      the Program.
-
-   "Contributor" means any person or entity that distributes the Program.
-
-   "Licensed Patents " mean patent claims licensable by a Contributor which
-   are necessarily infringed by the use or sale of its Contribution alone or
-   when combined with the Program.
-
-   "Program" means the Contributions distributed in accordance with this
-   Agreement.
-
-   "Recipient" means anyone who receives the Program under this Agreement,
-   including all Contributors.
-
-   2. GRANT OF RIGHTS
-
-      a) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free copyright
-      license to reproduce, prepare derivative works of, publicly display,
-      publicly perform, distribute and sublicense the Contribution of such
-      Contributor, if any, and such derivative works, in source code and
-      object code form.
-
-      b) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free patent license
-      under Licensed Patents to make, use, sell, offer to sell, import and
-      otherwise transfer the Contribution of such Contributor, if any, in
-      source code and object code form. This patent license shall apply to the
-      combination of the Contribution and the Program if, at the time the
-      Contribution is added by the Contributor, such addition of the
-      Contribution causes such combination to be covered by the Licensed
-      Patents. The patent license shall not apply to any other combinations
-      which include the Contribution. No hardware per se is licensed hereunder.
-
-      c) Recipient understands that although each Contributor grants the
-      licenses to its Contributions set forth herein, no assurances are
-      provided by any Contributor that the Program does not infringe the
-      patent or other intellectual property rights of any other entity. Each
-      Contributor disclaims any liability to Recipient for claims brought by
-      any other entity based on infringement of intellectual property rights
-      or otherwise. As a condition to exercising the rights and licenses
-      granted hereunder, each Recipient hereby assumes sole responsibility to
-      secure any other intellectual property rights needed, if any. For
-      example, if a third party patent license is required to allow Recipient
-      to distribute the Program, it is Recipient's responsibility to acquire
-      that license before distributing the Program.
-
-      d) Each Contributor represents that to its knowledge it has sufficient
-      copyright rights in its Contribution, if any, to grant the copyright
-      license set forth in this Agreement.
-
-   3. REQUIREMENTS
-
-   A Contributor may choose to distribute the Program in object code form
-   under its own license agreement, provided that:
-
-      a) it complies with the terms and conditions of this Agreement; and
-
-      b) its license agreement:
-
-      i) effectively disclaims on behalf of all Contributors all warranties
-      and conditions, express and implied, including warranties or conditions
-      of title and non-infringement, and implied warranties or conditions of
-      merchantability and fitness for a particular purpose;
-
-      ii) effectively excludes on behalf of all Contributors all liability
-      for damages, including direct, indirect, special, incidental and
-      consequential damages, such as lost profits;
-
-      iii) states that any provisions which differ from this Agreement are
-      offered by that Contributor alone and not by any other party; and
-
-      iv) states that source code for the Program is available from such
-      Contributor, and informs licensees how to obtain it in a reasonable
-      manner on or through a medium customarily used for software exchange.
-
-   When the Program is made available in source code form:
-
-      a) it must be made available under this Agreement; and
-
-      b) a copy of this Agreement must be included with each copy of the
-      Program.
-
-   Contributors may not remove or alter any copyright notices contained within
-   the Program.
-
-   Each Contributor must identify itself as the originator of its
-   Contribution, if any, in a manner that reasonably allows subsequent
-   Recipients to identify the originator of the Contribution.
-
-   4. COMMERCIAL DISTRIBUTION
-
-   Commercial distributors of software may accept certain responsibilities
-   with respect to end users, business partners and the like. While this
-   license is intended to facilitate the commercial use of the Program, the
-   Contributor who includes the Program in a commercial product offering
-   should do so in a manner which does not create potential liability for
-   other Contributors. Therefore, if a Contributor includes the Program in
-   a commercial product offering, such Contributor ("Commercial Contributor")
-   hereby agrees to defend and indemnify every other Contributor ("Indemnified
-   Contributor") against any losses, damages and costs (collectively "Losses")
-   arising from claims, lawsuits and other legal actions brought by a third
-   party against the Indemnified Contributor to the extent caused by the acts
-   or omissions of such Commercial Contributor in connection with its
-   distribution of the Program in a commercial product offering. The
-   obligations in this section do not apply to any claims or Losses relating
-   to any actual or alleged intellectual property infringement. In order to
-   qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-   Contributor in writing of such claim, and b) allow the Commercial
-   Contributor to control, and cooperate with the Commercial Contributor in,
-   the defense and any related settlement negotiations. The Indemnified
-   Contributor may participate in any such claim at its own expense.
-
-   For example, a Contributor might include the Program in a commercial
-   product offering, Product X. That Contributor is then a Commercial
-   Contributor. If that Commercial Contributor then makes performance claims,
-   or offers warranties related to Product X, those performance claims and
-   warranties are such Commercial ContributorÕs responsibility alone. Under
-   this section, the Commercial Contributor would have to defend claims
-   against the other Contributors related to those performance claims and
-   warranties, and if a court requires any other Contributor to pay any
-   damages as a result, the Commercial Contributor must pay those damages.
-
-   5. NO WARRANTY
-
-   EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED
-   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. Each Recipient is solely responsible for determining
-   the appropriateness of using and distributing the Program and assumes all
-   risks associated with its exercise of rights under this Agreement,
-   including but not limited to the risks and costs of program errors,
-   compliance with applicable laws, damage to or loss of data, programs or
-   equipment, and unavailability or interruption of operations.
-
-   6. DISCLAIMER OF LIABILITY
-
-   EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
-   CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
-   LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-   ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-   EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGES.
-
-   7. GENERAL
-
-   If any provision of this Agreement is invalid or unenforceable under
-   applicable law, it shall not affect the validity or enforceability of the
-   remainder of the terms of this Agreement, and without further action by the
-   parties hereto, such provision shall be reformed to the minimum extent
-   necessary to make such provision valid and enforceable.
-
-   If Recipient institutes patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Program itself
-   (excluding combinations of the Program with other software or hardware)
-   infringes such RecipientÕs patent(s), then such RecipientÕs rights granted
-   under Section 2(b) shall terminate as of the date such litigation is filed.
-
-   All RecipientÕs rights under this Agreement shall terminate if it fails to
-   comply with any of the material terms or conditions of this Agreement and
-   does not cure such failure in a reasonable period of time after becoming
-   aware of such noncompliance. If all RecipientÕs rights under this Agreement
-   terminate, Recipient agrees to cease use and distribution of the Program as
-   soon as reasonably practicable. However, Recipient's obligations under this
-   Agreement and any licenses granted by Recipient relating to the Program
-   shall continue and survive.
-
-   Everyone is permitted to copy and distribute copies of this Agreement, but
-   in order to avoid inconsistency the Agreement is copyrighted and may only
-   be modified in the following manner. The Agreement Steward reserves the
-   right to publish new versions (including revisions) of this Agreement from
-   time to time. No one other than the Agreement Steward has the right to
-   modify this Agreement. The Eclipse Foundation is the initial Agreement
-   Steward. The Eclipse Foundation may assign the responsibility to serve as
-   the Agreement Steward to a suitable separate entity. Each new version of
-   the Agreement will be given a distinguishing version number. The Program
-   (including Contributions) may always be distributed subject to the version
-   of the Agreement under which it was received. In addition, after a new
-   version of the Agreement is published, Contributor may elect to distribute
-   the Program (including its Contributions) under the new version. Except as
-   expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-   rights or licenses to the intellectual property of any Contributor under
-   this Agreement, whether expressly, by implication, estoppel or otherwise.
-   All rights in the Program not expressly granted under this Agreement are
-   reserved.
-
-   This Agreement is governed by the laws of the State of New York and the
-   intellectual property laws of the United States of America. No party to
-   this Agreement will bring a legal action under this Agreement more than one
-   year after the cause of action arose. Each party waives its rights to a
-   jury trial in any resulting litigation. 
diff --git a/src/main/webapp/WEB-INF/NOTICE b/src/main/webapp/WEB-INF/NOTICE
deleted file mode 100644
index 81641c8..0000000
--- a/src/main/webapp/WEB-INF/NOTICE
+++ /dev/null
@@ -1,61 +0,0 @@
-Apache Sling Launchpad Testing
-Copyright 2008-2009 The Apache Software Foundation
-
-Apache Sling is based on source code originally developed 
-by Day Software (http://www.day.com/).
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product contains code derived from JSON in Java code from JSON.org.
-Copyright (c) 2002 JSON.org
-
-This product includes SLF4J logging libraries (http://www.slf4j.org/).
-Copyright (c) 2004-2007 QOS.ch.
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright 2006 The OSGi Alliance.
-Licensed under the Apache License 2.0.
-
-This product includes software from http://kxml.sourceforge.net.
-Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany.
-Licensed under BSD License.
-
-This product includes software developed under the JCP from http://www.jcp.org.
-Copyright 2005 Day Management AG
-
-This product contains an XPath parser from the World Wide Web Consortium.
-Copyright (c) 2002 World Wide Web Consortium, (Massachusetts Institute of
-Technology, European Research Consortium for Informatics and Mathematics,
-Keio University).
-
-This product includes software developed at pdfbox.org.
-Copyright (c) 2003-2005, www.pdfbox.org
-
-This product includes the CyberNeko HTML Parser
-(C) Copyright 2002-2005, Andy Clark.
-
-This software contains code written by Ryan Ackley.
-Please go to http://www.textmining.org for the latest version.
-
-This product includes software developed at
-mozilla.org (http://www.mozilla.org/).
-
-This product includes software developed at
-eclipse.org (http://www.eclipse.org/equinox).
-Licensed under the Eclipse Public License (EPL).
-
-This product includes Apache Xerces, portions of which were
-originally based on the following:
-- software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
-- software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
-- voluntary contributions made by Paul Eng on behalf of the
-  Apache Software Foundation that were originally developed at iClick, Inc.,
-  software copyright (c) 1999.
-
-This product includes Apache Derby, which is based on source code originally
-developed at the International Business Machines Corporation.
-(C) Copyright 1997,2004 International Business Machines Corporation.
-All rights reserved.
-(C) Copyright IBM Corp. 2003.
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index c04be60..0000000
--- a/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you 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.
--->
-<web-app version="2.4"
-         xmlns="http://java.sun.com/xml/ns/j2ee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-    <display-name>Sling Launchpad Testing Module</display-name>
-
-    <servlet>
-        <display-name>Sling Servlet</display-name>
-        <servlet-name>sling</servlet-name>
-        <servlet-class>
-            org.apache.sling.launcher.webapp.SlingServlet
-        </servlet-class>
-        <load-on-startup>100</load-on-startup>
-    </servlet>
-
-    <!-- Default Mapping for the Context -->
-    <servlet-mapping>
-        <servlet-name>sling</servlet-name>
-        <url-pattern>/*</url-pattern>
-    </servlet-mapping>
-
-    <!-- Overwrite Mappings which may be present in default web.xml files -->
-    <servlet-mapping>
-        <servlet-name>sling</servlet-name>
-        <url-pattern>*.jsp</url-pattern>
-    </servlet-mapping>
-    
-      <!-- ====================================================================== -->
-  <!-- M I M E T Y P E   M A P P I N G                                          -->
-  <!-- ====================================================================== -->
-  <mime-mapping>
-    <extension>doc</extension>
-    <mime-type>application/msword</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>bin</extension>
-    <mime-type>application/octet-stream</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>pdf</extension>
-    <mime-type>application/pdf</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ai</extension>
-    <mime-type>application/postscript</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>eps</extension>
-    <mime-type>application/postscript</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ps</extension>
-    <mime-type>application/postscript</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>rtf</extension>
-    <mime-type>application/rtf</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mif</extension>
-    <mime-type>application/vnd.mif</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ppt</extension>
-    <mime-type>application/vnd.ms-powerpoint</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>xls</extension>
-    <mime-type>application/vnd.ms-excel</mime-type>
-  </mime-mapping>  
-  <mime-mapping>
-    <extension>vcd</extension>
-    <mime-type>application/x-cdlink</mime-type>
-  </mime-mapping>
-    <mime-mapping>
-    <extension>js</extension>
-    <mime-type>application/x-javascript</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mp3</extension>
-    <mime-type>audio/mpeg</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ram</extension>
-    <mime-type>audio/x-pn-realaudio</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>rm</extension>
-    <mime-type>audio/x-pn-realaudio</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ra</extension>
-    <mime-type>audio/x-realaudio</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>gif</extension>
-    <mime-type>image/gif</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>jpeg</extension>
-    <mime-type>image/jpeg</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>jpg</extension>
-    <mime-type>image/jpeg</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>png</extension>
-    <mime-type>image/png</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>tiff</extension>
-    <mime-type>image/tiff</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>tif</extension>
-    <mime-type>image/tiff</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>css</extension>
-    <mime-type>text/css</mime-type>
-  </mime-mapping>
-    <mime-mapping>
-    <extension>asc</extension>
-    <mime-type>text/plain</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>txt</extension>
-    <mime-type>text/plain</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>xml</extension>
-    <mime-type>text/xml</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>html</extension>
-    <mime-type>text/html</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>htm</extension>
-    <mime-type>text/html</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>json</extension>
-    <mime-type>application/json</mime-type>
-  </mime-mapping>
-
-</web-app>