You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2014/01/20 08:14:54 UTC

[1/4] git commit: MAMOTTA-423: cosmetic changes

Updated Branches:
  refs/heads/develop 79613510c -> 6b4fc9dd4


MAMOTTA-423: cosmetic changes


Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/80bb2222
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/80bb2222
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/80bb2222

Branch: refs/heads/develop
Commit: 80bb22229e902c438b52092975e67b354ba14af1
Parents: 7961351
Author: Sergio Fernández <wi...@apache.org>
Authored: Sat Jan 18 12:02:44 2014 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Sat Jan 18 12:02:44 2014 +0100

----------------------------------------------------------------------
 .../com/github/vigsterkr/freebase/fix/FreebaseFixit.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/80bb2222/libraries/ldclient/ldclient-provider-freebase/src/ext/java/com/github/vigsterkr/freebase/fix/FreebaseFixit.java
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-freebase/src/ext/java/com/github/vigsterkr/freebase/fix/FreebaseFixit.java b/libraries/ldclient/ldclient-provider-freebase/src/ext/java/com/github/vigsterkr/freebase/fix/FreebaseFixit.java
index 60c2f89..166ff46 100644
--- a/libraries/ldclient/ldclient-provider-freebase/src/ext/java/com/github/vigsterkr/freebase/fix/FreebaseFixit.java
+++ b/libraries/ldclient/ldclient-provider-freebase/src/ext/java/com/github/vigsterkr/freebase/fix/FreebaseFixit.java
@@ -48,7 +48,7 @@ public class FreebaseFixit {
     private final static String FREEBASE_ESCAPE_CHAR = Pattern.quote("$");
 
     private final static Pattern freebaseEscape =
-            Pattern.compile(FREEBASE_ESCAPE_CHAR+"([0-9A-Fa-f]{2})([0-9A-Fa-f]{2})");
+            Pattern.compile(FREEBASE_ESCAPE_CHAR + "([0-9A-Fa-f]{2})([0-9A-Fa-f]{2})");
 
     private final static Pattern tripletPattern =
             Pattern.compile("^(\\S+)\\s+(\\S+)\\s+(.*)$");
@@ -118,7 +118,7 @@ public class FreebaseFixit {
 
         fixedObject = fixURI(fixedObject);
 
-        if(isLiteral(fixedObject)) {
+        if (isLiteral(fixedObject)) {
             fixedObject = removeNullChar(fixedObject);
         }
 
@@ -167,14 +167,14 @@ public class FreebaseFixit {
     public static void fix(BufferedReader br, PrintStream out) {
         try {
             String input;
-            while((input=br.readLine())!=null){
+            while ((input = br.readLine()) != null) {
                 try {
                     out.println(fixTriplet(input));
-                } catch(Exception e) {
+                } catch (Exception e) {
                     log.error(e.getMessage());
                 }
             }
-        } catch(IOException io) {
+        } catch (IOException io) {
             io.printStackTrace();
         }
     }


[3/4] MARMOTTA-422: remove deprecared marmotta-webapp-bigdata launcher

Posted by wi...@apache.org.
http://git-wip-us.apache.org/repos/asf/marmotta/blob/6b4fc9dd/launchers/marmotta-webapp-bigdata/src/main/webapp/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp-bigdata/src/main/webapp/META-INF/LICENSE b/launchers/marmotta-webapp-bigdata/src/main/webapp/META-INF/LICENSE
deleted file mode 100644
index fc3920b..0000000
--- a/launchers/marmotta-webapp-bigdata/src/main/webapp/META-INF/LICENSE
+++ /dev/null
@@ -1,2821 +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.
-
-
-The Apache License, Version 2.0, also applies to the following subcomponents:
-
- * Guava, http://guava-libraries.googlecode.com
- * Jackson, http://jackson.codehaus.org
- * MimeUtil, http://mime-util.sourceforge.net
- * OpenCSV, http://opencsv.sourceforge.net
- * Scannotation, http://scannotation.sourceforge.net
- * Semargl, http://semarglproject.org
- * Java Injection, http://atinject.googlecode.com
- * Javassist, http://www.jboss.org/javassist
- * EHCache, http://ehcache.org
- * CDI, http://github.com/jboss/cdi
- * Weld, http://github.com/weld
- * Bean Validation, http://github.com/hibernate/hibernate-validator
- * JBoss EJB Common Interceptor, http://github.com/jbossinterceptors/jbossinterceptors
- * RESTEasy, http://www.jboss.org/resteasy
- * Apache Xerces, http://xerces.apache.org
- 
-
-Apache Marmotta subcomponents:
-=============================
-
-The Apache Marmotta project includes unmodified binaries of a number of subcomponents 
-(libraries) from external projects with separate copyright notices and license 
-terms. Your use of the code for the these subcomponents is subject to the terms 
-and conditions of the following licenses.
-
-For the H2 component,
-
-    Copyright (c) 2013 H2 Group, http://www.h2database.com
-
-    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.
-
-
-For the Logback component,
-
-    Copyright (C) 2012 QOS.ch, http://logback.qos.ch
-
-    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.
-
-
-For the JDOM component,
-
-    Copyright (c) 2012 Jason Hunter & Brett McLaughlin, http://www.jdom.org
-
-    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 disclaimer that follows 
-        these conditions in the documentation and/or other materials 
-        provided with the distribution.
-
-    3. The name "JDOM" must not be used to endorse or promote products
-        derived from this software without prior written permission.  For
-        written permission, please contact <request_AT_jdom_DOT_org>.
-
-    4. Products derived from this software may not be called "JDOM", nor
-        may "JDOM" appear in their name, without prior written permission
-        from the JDOM Project Management <request_AT_jdom_DOT_org>.
-
-    In addition, we request (but do not require) that you include in the 
-    end-user documentation provided with the redistribution and/or in the 
-    software itself an acknowledgement equivalent to the following:
-     "This product includes software developed by the
-      JDOM Project (http://www.jdom.org/)."
-    Alternatively, the acknowledgment may be graphical using the logos 
-    available at http://www.jdom.org/images/logos.
-
-    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 JDOM AUTHORS OR THE PROJECT
-    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 software consists of voluntary contributions made by many 
-    individuals on behalf of the JDOM Project and was originally 
-    created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
-    Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
-    on the JDOM Project, please see <http://www.jdom.org/>.
-
-For the Freemarker component,
-
-    Copyright (c) 2003 The Visigoth Software Society, http://freemarker.org
-
-    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.  The end-user documentation included with the redistribution, if any, must
-        include the following acknowlegement:
-          "This product includes software developed by the 
-          Visigoth Software Society (http://www.visigoths.org/)."
-        Alternately, this acknowlegement may appear in the software itself, if and
-        wherever such third-party acknowlegements normally appear.
-
-    3.  Neither the name "FreeMarker", "Visigoth", nor any of the names of the
-        project contributors may be used to endorse or promote products derived
-        from this software without prior written permission. For written
-        permission, please contact visigoths@visigoths.org.
-
-    4.  Products derived from this software may not be called "FreeMarker" or
-        "Visigoth" nor may "FreeMarker" or "Visigoth" appear in their names
-        without prior written permission of the Visigoth Software Society.
-
-    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
-    VISIGOTH SOFTWARE SOCIETY OR ITS 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.
-
-
-For the CAL10N component,
-
-    Copyright (c) 2009 QOS.ch, http://cal10n.qos.ch
-
-    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.
-
-
-For the OpenRDF Sesame component,
-
-    Copyright (c) 2013 Aduna, http://www.openrdf.org
-
-    Redistribution and use in source and binary forms, with or without modification,
-    are permitted provided that the following conditions are met:
-
-        * Redistributions of source code must retain the above copyright notice,
-          this list of conditions and the following disclaimer.
-        * 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.
-        * Neither the name of the copyright holder 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 COPYRIGHT OWNER 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.
-
-
-For the PostgreSQL JDBC component,
-
-    Copyright (c) 2011 PostgreSQL Global Development Group, http://jdbc.postgresql.org
-
-    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 the PostgreSQL Global Development Group 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 COPYRIGHT OWNER 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.
-
-
-For the SLF4J component,
-
-    Copyright (c) 2013 QOS.ch, http://www.slf4j.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 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.
-
-
-For the Janino component,
-
-    Copyright (c) 2010 Arno Unkrig, http://janino.codehaus.org
-
-    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 name of the author may not be used to endorse or promote
-          products derived from this software without specific prior
-          written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-
-    
-For the Jaxen component, 
-
-    Copyright (c) 2006 The Werken Company, http://jaxen.codehaus.org
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-
-     * Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-
-     * 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.
-
-     * Neither the name of the Jaxen Project 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 COPYRIGHT OWNER
-    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.
-
-
-For the JSoup component,
-
-    Copyright (c) 2013 Jonathan Hedley, http://jsoup.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 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.
-
-
-For the Java Activation component,
-
-    Copyright (c) Oracle Corporation, http://www.oracle.com
-
-      1. Definitions.
-            1.1. "Contributor" means each individual or entity that
-            creates or contributes to the creation of Modifications.
-            1.2. "Contributor Version" means the combination of the
-            Original Software, prior Modifications used by a
-            Contributor (if any), and the Modifications made by that
-            particular Contributor.
-            1.3. "Covered Software" means (a) the Original Software, or
-            (b) Modifications, or (c) the combination of files
-            containing Original Software with files containing
-            Modifications, in each case including portions thereof.
-            1.4. "Executable" means the Covered Software in any form
-            other than Source Code. 
-            1.5. "Initial Developer" means the individual or entity
-            that first makes Original Software available under this
-            License. 
-            1.6. "Larger Work" means a work which combines Covered
-            Software or portions thereof with code not governed by the
-            terms of this License.
-            1.7. "License" means this document.
-            1.8. "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 the Source Code and Executable
-            form of any of the following: 
-                  A. Any file that results from an addition to,
-                  deletion from or modification of the contents of a
-                  file containing Original Software or previous
-                  Modifications; 
-                  B. Any new file that contains any part of the
-                  Original Software or previous Modification; or 
-                  C. Any new file that is contributed or otherwise made
-                  available under the terms of this License.
-            1.10. "Original Software" means the Source Code and
-            Executable form of computer software code that is
-            originally released under this License. 
-            1.11. "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.12. "Source Code" means (a) the common form of computer
-            software code in which modifications are made and (b)
-            associated documentation included in or with such code.
-            1.13. "You" (or "Your") means an individual or a legal
-            entity exercising rights under, and complying with all of
-            the terms of, this License. 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. License Grants. 
-            2.1. The Initial Developer Grant.
-            Conditioned upon Your compliance with Section 3.1 below and
-            subject to third party intellectual property claims, the
-            Initial Developer hereby grants You a world-wide,
-            royalty-free, non-exclusive license: 
-                  (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 Software (or
-                  portions thereof), with or without Modifications,
-                  and/or as part of a Larger Work; and 
-                  (b) under Patent Claims infringed by the making,
-                  using or selling of Original Software, to make, have
-                  made, use, practice, sell, and offer for sale, and/or
-                  otherwise dispose of the Original Software (or
-                  portions thereof). 
-                  (c) The licenses granted in Sections 2.1(a) and (b)
-                  are effective on the date Initial Developer first
-                  distributes or otherwise makes the Original Software
-                  available to a third party 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 Software, or (2) for infringements
-                  caused by: (i) the modification of the Original
-                  Software, or (ii) the combination of the Original
-                  Software with other software or devices. 
-            2.2. Contributor Grant.
-            Conditioned upon Your compliance with Section 3.1 below and
-            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 Software 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
-                  distributes or otherwise makes the Modifications
-                  available to a third party. 
-                  (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) 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 (3) under
-                  Patent Claims infringed by Covered Software in the
-                  absence of Modifications made by that Contributor. 
-
-      3. Distribution Obligations.
-            3.1. Availability of Source Code.
-            Any Covered Software that You distribute or otherwise make
-            available in Executable form must also be made available in
-            Source Code form and that Source Code form must be
-            distributed only under the terms of this License. You must
-            include a copy of this License with every copy of the
-            Source Code form of the Covered Software You distribute or
-            otherwise make available. You must inform recipients of any
-            such Covered Software in Executable form as to how they can
-            obtain such Covered Software in Source Code form in a
-            reasonable manner on or through a medium customarily used
-            for software exchange.
-            3.2. Modifications.
-            The Modifications that You create or to which You
-            contribute are governed by the terms of this License. You
-            represent that You believe Your Modifications are Your
-            original creation(s) and/or You have sufficient rights to
-            grant the rights conveyed by this License.
-            3.3. Required Notices.
-            You must include a notice in each of Your Modifications
-            that identifies You as the Contributor of the Modification.
-            You may not remove or alter any copyright, patent or
-            trademark notices contained within the Covered Software, or
-            any notices of licensing or any descriptive text giving
-            attribution to any Contributor or the Initial Developer.
-            3.4. Application of Additional Terms.
-            You may not offer or impose any terms on any Covered
-            Software in Source Code form that alters or restricts the
-            applicable version of this License or the recipients'
-            rights hereunder. You may choose to offer, and to charge a
-            fee for, warranty, support, indemnity or liability
-            obligations to one or more recipients of Covered Software.
-            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 that 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.5. Distribution of Executable Versions.
-            You may distribute the Executable form of the Covered
-            Software under the terms of this License or under the terms
-            of 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 form does not attempt to limit
-            or alter the recipient's rights in the Source Code form
-            from the rights set forth in this License. If You
-            distribute the Covered Software in Executable form 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 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.6. Larger Works.
-            You may create a Larger Work by combining Covered Software
-            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 Software. 
-
-      4. Versions of the License. 
-            4.1. New Versions.
-            Sun Microsystems, Inc. is the initial license steward and
-            may publish revised and/or new versions of this License
-            from time to time. Each version will be given a
-            distinguishing version number. Except as provided in
-            Section 4.3, no one other than the license steward has the
-            right to modify this License. 
-            4.2. Effect of New Versions.
-            You may always continue to use, distribute or otherwise
-            make the Covered Software available under the terms of the
-            version of the License under which You originally received
-            the Covered Software. If the Initial Developer includes a
-            notice in the Original Software prohibiting it from being
-            distributed or otherwise made available under any
-            subsequent version of the License, You must distribute and
-            make the Covered Software available under the terms of the
-            version of the License under which You originally received
-            the Covered Software. Otherwise, You may also choose to
-            use, distribute or otherwise make the Covered Software
-            available under the terms of any subsequent version of the
-            License published by the license steward. 
-            4.3. Modified Versions.
-            When You are an Initial Developer and You want to create a
-            new license for Your Original Software, You may create and
-            use a modified version of this License if You: (a) rename
-            the license and remove any references to the name of the
-            license steward (except to note that the license differs
-            from this License); and (b) otherwise make it clear that
-            the license contains terms which differ from this License.
-
-      5. DISCLAIMER OF WARRANTY.
-      COVERED SOFTWARE 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
-      SOFTWARE 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 SOFTWARE IS WITH YOU. SHOULD ANY
-      COVERED SOFTWARE 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 SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
-      DISCLAIMER. 
-
-      6. TERMINATION. 
-            6.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. Provisions which, by their
-            nature, must remain in effect beyond the termination of
-            this License shall survive.
-            6.2. If You assert a patent infringement claim (excluding
-            declaratory judgment actions) against Initial Developer or
-            a Contributor (the Initial Developer or Contributor against
-            whom You assert such claim is referred to as "Participant")
-            alleging that the Participant Software (meaning the
-            Contributor Version where the Participant is a Contributor
-            or the Original Software where the Participant is the
-            Initial Developer) directly or indirectly infringes any
-            patent, then any and all rights granted directly or
-            indirectly to You by such Participant, the Initial
-            Developer (if the Initial Developer is not the Participant)
-            and all Contributors under Sections 2.1 and/or 2.2 of this
-            License shall, upon 60 days notice from Participant
-            terminate prospectively and automatically at the expiration
-            of such 60 day notice period, unless if within such 60 day
-            period You withdraw Your claim with respect to the
-            Participant Software against such Participant either
-            unilaterally or pursuant to a written agreement with
-            Participant.
-            6.3. In the event of termination under Sections 6.1 or 6.2
-            above, all end user licenses that have been validly granted
-            by You or any distributor hereunder prior to termination
-            (excluding licenses granted to You by any distributor)
-            shall survive termination.
-
-      7. 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 SOFTWARE, 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 LOST PROFITS, 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.
-
-      8. U.S. GOVERNMENT END USERS.
-      The Covered Software is a "commercial item," as that term is
-      defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
-      computer software" (as that term is defined at 48 C.F.R. ¤
-      252.227-7014(a)(1)) 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 Software with only those rights set forth herein.
-      This U.S. Government Rights clause is in lieu of, and supersedes,
-      any other FAR, DFAR, or other clause or provision that addresses
-      Government rights in computer software under this License.
-
-      9. 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 the law of the jurisdiction specified in a notice
-      contained within the Original Software (except to the extent
-      applicable law, if any, provides otherwise), excluding such
-      jurisdiction's conflict-of-law provisions. Any litigation
-      relating to this License shall be subject to the jurisdiction of
-      the courts located in the jurisdiction and venue specified in a
-      notice contained within the Original Software, 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.
-      You agree that You alone are responsible for compliance with the
-      United States export administration regulations (and the export
-      control laws and regulation of any other countries) when You use,
-      distribute or otherwise make available any Covered Software.
-
-      10. 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.
-
-For the Java Servlet API component,
-
-    Copyright (c) Oracle Corporation, http://www.oracle.com
-
-      1. Definitions.
-            1.1. "Contributor" means each individual or entity that
-            creates or contributes to the creation of Modifications.
-            1.2. "Contributor Version" means the combination of the
-            Original Software, prior Modifications used by a
-            Contributor (if any), and the Modifications made by that
-            particular Contributor.
-            1.3. "Covered Software" means (a) the Original Software, or
-            (b) Modifications, or (c) the combination of files
-            containing Original Software with files containing
-            Modifications, in each case including portions thereof.
-            1.4. "Executable" means the Covered Software in any form
-            other than Source Code. 
-            1.5. "Initial Developer" means the individual or entity
-            that first makes Original Software available under this
-            License. 
-            1.6. "Larger Work" means a work which combines Covered
-            Software or portions thereof with code not governed by the
-            terms of this License.
-            1.7. "License" means this document.
-            1.8. "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 the Source Code and Executable
-            form of any of the following: 
-                  A. Any file that results from an addition to,
-                  deletion from or modification of the contents of a
-                  file containing Original Software or previous
-                  Modifications; 
-                  B. Any new file that contains any part of the
-                  Original Software or previous Modification; or 
-                  C. Any new file that is contributed or otherwise made
-                  available under the terms of this License.
-            1.10. "Original Software" means the Source Code and
-            Executable form of computer software code that is
-            originally released under this License. 
-            1.11. "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.12. "Source Code" means (a) the common form of computer
-            software code in which modifications are made and (b)
-            associated documentation included in or with such code.
-            1.13. "You" (or "Your") means an individual or a legal
-            entity exercising rights under, and complying with all of
-            the terms of, this License. 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. License Grants. 
-            2.1. The Initial Developer Grant.
-            Conditioned upon Your compliance with Section 3.1 below and
-            subject to third party intellectual property claims, the
-            Initial Developer hereby grants You a world-wide,
-            royalty-free, non-exclusive license: 
-                  (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 Software (or
-                  portions thereof), with or without Modifications,
-                  and/or as part of a Larger Work; and 
-                  (b) under Patent Claims infringed by the making,
-                  using or selling of Original Software, to make, have
-                  made, use, practice, sell, and offer for sale, and/or
-                  otherwise dispose of the Original Software (or
-                  portions thereof). 
-                  (c) The licenses granted in Sections 2.1(a) and (b)
-                  are effective on the date Initial Developer first
-                  distributes or otherwise makes the Original Software
-                  available to a third party 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 Software, or (2) for infringements
-                  caused by: (i) the modification of the Original
-                  Software, or (ii) the combination of the Original
-                  Software with other software or devices. 
-            2.2. Contributor Grant.
-            Conditioned upon Your compliance with Section 3.1 below and
-            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 Software 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
-                  distributes or otherwise makes the Modifications
-                  available to a third party. 
-                  (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) 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 (3) under
-                  Patent Claims infringed by Covered Software in the
-                  absence of Modifications made by that Contributor. 
-
-      3. Distribution Obligations.
-            3.1. Availability of Source Code.
-            Any Covered Software that You distribute or otherwise make
-            available in Executable form must also be made available in
-            Source Code form and that Source Code form must be
-            distributed only under the terms of this License. You must
-            include a copy of this License with every copy of the
-            Source Code form of the Covered Software You distribute or
-            otherwise make available. You must inform recipients of any
-            such Covered Software in Executable form as to how they can
-            obtain such Covered Software in Source Code form in a
-            reasonable manner on or through a medium customarily used
-            for software exchange.
-            3.2. Modifications.
-            The Modifications that You create or to which You
-            contribute are governed by the terms of this License. You
-            represent that You believe Your Modifications are Your
-            original creation(s) and/or You have sufficient rights to
-            grant the rights conveyed by this License.
-            3.3. Required Notices.
-            You must include a notice in each of Your Modifications
-            that identifies You as the Contributor of the Modification.
-            You may not remove or alter any copyright, patent or
-            trademark notices contained within the Covered Software, or
-            any notices of licensing or any descriptive text giving
-            attribution to any Contributor or the Initial Developer.
-            3.4. Application of Additional Terms.
-            You may not offer or impose any terms on any Covered
-            Software in Source Code form that alters or restricts the
-            applicable version of this License or the recipients'
-            rights hereunder. You may choose to offer, and to charge a
-            fee for, warranty, support, indemnity or liability
-            obligations to one or more recipients of Covered Software.
-            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 that 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.5. Distribution of Executable Versions.
-            You may distribute the Executable form of the Covered
-            Software under the terms of this License or under the terms
-            of 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 form does not attempt to limit
-            or alter the recipient's rights in the Source Code form
-            from the rights set forth in this License. If You
-            distribute the Covered Software in Executable form 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 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.6. Larger Works.
-            You may create a Larger Work by combining Covered Software
-            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 Software. 
-
-      4. Versions of the License. 
-            4.1. New Versions.
-            Sun Microsystems, Inc. is the initial license steward and
-            may publish revised and/or new versions of this License
-            from time to time. Each version will be given a
-            distinguishing version number. Except as provided in
-            Section 4.3, no one other than the license steward has the
-            right to modify this License. 
-            4.2. Effect of New Versions.
-            You may always continue to use, distribute or otherwise
-            make the Covered Software available under the terms of the
-            version of the License under which You originally received
-            the Covered Software. If the Initial Developer includes a
-            notice in the Original Software prohibiting it from being
-            distributed or otherwise made available under any
-            subsequent version of the License, You must distribute and
-            make the Covered Software available under the terms of the
-            version of the License under which You originally received
-            the Covered Software. Otherwise, You may also choose to
-            use, distribute or otherwise make the Covered Software
-            available under the terms of any subsequent version of the
-            License published by the license steward. 
-            4.3. Modified Versions.
-            When You are an Initial Developer and You want to create a
-            new license for Your Original Software, You may create and
-            use a modified version of this License if You: (a) rename
-            the license and remove any references to the name of the
-            license steward (except to note that the license differs
-            from this License); and (b) otherwise make it clear that
-            the license contains terms which differ from this License.
-
-      5. DISCLAIMER OF WARRANTY.
-      COVERED SOFTWARE 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
-      SOFTWARE 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 SOFTWARE IS WITH YOU. SHOULD ANY
-      COVERED SOFTWARE 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 SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
-      DISCLAIMER. 
-
-      6. TERMINATION. 
-            6.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. Provisions which, by their
-            nature, must remain in effect beyond the termination of
-            this License shall survive.
-            6.2. If You assert a patent infringement claim (excluding
-            declaratory judgment actions) against Initial Developer or
-            a Contributor (the Initial Developer or Contributor against
-            whom You assert such claim is referred to as "Participant")
-            alleging that the Participant Software (meaning the
-            Contributor Version where the Participant is a Contributor
-            or the Original Software where the Participant is the
-            Initial Developer) directly or indirectly infringes any
-            patent, then any and all rights granted directly or
-            indirectly to You by such Participant, the Initial
-            Developer (if the Initial Developer is not the Participant)
-            and all Contributors under Sections 2.1 and/or 2.2 of this
-            License shall, upon 60 days notice from Participant
-            terminate prospectively and automatically at the expiration
-            of such 60 day notice period, unless if within such 60 day
-            period You withdraw Your claim with respect to the
-            Participant Software against such Participant either
-            unilaterally or pursuant to a written agreement with
-            

<TRUNCATED>

[2/4] MARMOTTA-422: remove deprecared marmotta-webapp-bigdata launcher

Posted by wi...@apache.org.
http://git-wip-us.apache.org/repos/asf/marmotta/blob/6b4fc9dd/launchers/marmotta-webapp-bigdata/src/main/webapp/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp-bigdata/src/main/webapp/META-INF/NOTICE b/launchers/marmotta-webapp-bigdata/src/main/webapp/META-INF/NOTICE
deleted file mode 100644
index f2b7b92..0000000
--- a/launchers/marmotta-webapp-bigdata/src/main/webapp/META-INF/NOTICE
+++ /dev/null
@@ -1,42 +0,0 @@
-Apache Marmotta Webapp
-Copyright 2012-2013 The Apache Software Foundation
-
-This product includes software developed at 
-The Apache Software Foundation (http://www.apache.org).
-
-Portions of this software were originally based on the following:
-
-    Copyright 2008-2012 Salzburg Research Forschungsgesellschaft mbH
-
-These have been licensed to the Apache Software Foundation under a software grant.
-
-This product also includes some third-party binary components:
-
- * H2 Database, Copyright (c) 2013 H2 Group, is licensed under the Eclipse Public 
-   License (EPL) 1.0. The original software is available from http://www.h2database.com
-
- * Logback, Copyright (C) 2012 QOS.ch, is licensed under the Eclipse Public 
-   License (EPL) 1.0. The original software is available from http://logback.qos.ch
-
- * Javassist, Copyright (c) 2013 Shigeru Chiba, is licensed under the Mozilla 
-   Public License (MPL) 1.1. The original software is available from 
-   http://www.jboss.org/javassist
-
- * Java Activation, Copyright (c) 2012 Oracle Corporation, is licensed under the
-   Common Development and Distribution License (CDDL) v1.0. The original software 
-   is available from http://www.oracle.com
-
- * Java Servlet API, Copyright (c) 2012 Oracle Corporation, is licensed under the
-   Common Development and Distribution License (CDDL) v1.0. The original software 
-   is available from http://www.oracle.com
-
- * Common Annotations (JSR-250), Copyright (c) 2012 Oracle Corporation, is licensed 
-   under the Common Development and Distribution License (CDDL) v1.0. The original 
-   software is available from http://www.oracle.com
-
- * Expression Language, Copyright (c) 2012 Oracle Corporation, is licensed under
-   the Common Development and Distribution License (CDDL) v1.0. The original 
-   software is available from http://www.oracle.com
-
- * Javolution, Copyright (c) 2012 Javolution, is licensed under BSD license. The
-   original source code is available from http://javolution.org

http://git-wip-us.apache.org/repos/asf/marmotta/blob/6b4fc9dd/launchers/marmotta-webapp-bigdata/src/main/webapp/META-INF/jetty-web.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp-bigdata/src/main/webapp/META-INF/jetty-web.xml b/launchers/marmotta-webapp-bigdata/src/main/webapp/META-INF/jetty-web.xml
deleted file mode 100644
index db9e86e..0000000
--- a/launchers/marmotta-webapp-bigdata/src/main/webapp/META-INF/jetty-web.xml
+++ /dev/null
@@ -1,27 +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.
-
--->
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
-
-<Configure id="webAppCtx" class="org.mortbay.jetty.webapp.WebAppContext">
-   <Call class="org.jboss.weld.environment.jetty.WeldServletHandler" name="process">
-      <Arg><Ref id="webAppCtx"/></Arg>
-   </Call>
-</Configure>

http://git-wip-us.apache.org/repos/asf/marmotta/blob/6b4fc9dd/launchers/marmotta-webapp-bigdata/src/main/webapp/WEB-INF/jetty-web.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp-bigdata/src/main/webapp/WEB-INF/jetty-web.xml b/launchers/marmotta-webapp-bigdata/src/main/webapp/WEB-INF/jetty-web.xml
deleted file mode 100644
index df4c63e..0000000
--- a/launchers/marmotta-webapp-bigdata/src/main/webapp/WEB-INF/jetty-web.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-
-    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.
-
--->
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN"
-   "http://jetty.mortbay.org/configure.dtd">
-
-<Configure id="webAppCtx" class="org.mortbay.jetty.webapp.WebAppContext">
-
-    <Array id="annotationConfig" type="java.lang.String">
-      <Item>org.mortbay.jetty.webapp.WebInfConfiguration</Item>
-      <Item>org.mortbay.jetty.plus.webapp.EnvConfiguration</Item>
-      <Item>org.mortbay.jetty.annotations.Configuration</Item> <!-- Enables annotation support -->
-      <Item>org.mortbay.jetty.webapp.JettyWebXmlConfiguration</Item>
-      <Item>org.mortbay.jetty.webapp.TagLibConfiguration</Item>
-    </Array>
-
-   <Call class="org.jboss.weld.environment.jetty.MortbayWeldServletHandler" name="process">
-      <Arg><Ref id="webAppCtx"/></Arg>
-   </Call>
-</Configure>

http://git-wip-us.apache.org/repos/asf/marmotta/blob/6b4fc9dd/launchers/marmotta-webapp-bigdata/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp-bigdata/src/main/webapp/WEB-INF/web.xml b/launchers/marmotta-webapp-bigdata/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index e057134..0000000
--- a/launchers/marmotta-webapp-bigdata/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,159 +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="3.0"
-         xmlns="http://java.sun.com/xml/ns/javaee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
-
-    <!-- enable custom JNDI implementation -->
-    <listener>
-        <listener-class>org.apache.marmotta.platform.core.jndi.MarmottaJndiListener</listener-class>
-    </listener>
-
-    <!-- enable CDI / Weld for dependency injection -->
-    <listener>
-        <listener-class>org.jboss.weld.environment.servlet.Listener</listener-class>
-    </listener>
-
-    <!-- Initialise the KiWi system -->
-    <listener>
-        <listener-class>org.apache.marmotta.platform.core.servlet.MarmottaPreStartupListener</listener-class>
-    </listener>
-
-    <!-- RESTeasy Webservices -->
-    <listener>
-        <listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class>
-    </listener>
-
-    <!-- specifies the home directory; overridden by environment variable MARMOTTA_HOME or system property marmotta.home -->
-    <context-param>
-        <param-name>marmotta.home</param-name>
-        <param-value>/tmp/marmotta</param-value>
-    </context-param>
-
-    <!-- handle OPTIONS requests -->
-    <filter>
-        <filter-name>MarmottaOptionsFilter</filter-name>
-        <filter-class>org.apache.marmotta.platform.core.servlet.MarmottaOptionsFilter</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>MarmottaOptionsFilter</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-    <!-- enables a CORS filter and maps it to any request -->
-    <!-- for more fine grained configuration have a look at http://software.dzhuvinov.com/cors-filter-configuration.html -->
-    <filter>
-        <!-- The CORS filter with parameters -->
-        <filter-name>CORS</filter-name>
-        <filter-class>com.thetransactioncompany.cors.CORSFilter</filter-class>
-
-        <init-param>
-            <param-name>cors.supportedMethods</param-name>
-            <param-value>GET, HEAD, POST, PUT, DELETE, OPTIONS</param-value>
-        </init-param>
-
-        <init-param>
-            <param-name>cors.supportedHeaders</param-name>
-            <param-value>Origin, Accept, Content-Type</param-value>
-        </init-param>
-
-    </filter>
-    <filter-mapping>
-        <filter-name>CORS</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-    <!-- this filter performs startup configurations for first installation -->
-    <filter>
-        <filter-name>MarmottaPreStartupFilter</filter-name>
-        <filter-class>org.apache.marmotta.platform.core.servlet.MarmottaPreStartupFilter</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>MarmottaPreStartupFilter</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-    <!-- Serve static resources from file system and from .jar files of the respective modules -->
-    <filter>
-        <filter-name>MarmottaResourceFilter</filter-name>
-        <filter-class>org.apache.marmotta.platform.core.servlet.MarmottaResourceFilter</filter-class>
-        <init-param>
-            <!-- cache resources loaded from module jar files? -->
-            <param-name>kiwi.resourceCaching</param-name>
-            <param-value>true</param-value>
-        </init-param>
-    </filter>
-    <filter-mapping>
-        <filter-name>MarmottaResourceFilter</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-
-    <mime-mapping>
-        <!-- per http://www.w3.org/TR/2006/PR-xslt20-20061121/ -->
-        <extension>.xsl</extension>
-        <mime-type>application/xslt+xml</mime-type>
-    </mime-mapping>
-
-    <servlet>
-        <servlet-name>ViewStatusMessages</servlet-name>
-        <servlet-class>ch.qos.logback.classic.ViewStatusMessagesServlet</servlet-class>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>ViewStatusMessages</servlet-name>
-        <url-pattern>/logging/status</url-pattern>
-    </servlet-mapping>
-
-    <filter>
-        <filter-name>MarmottaWebservices</filter-name>
-        <filter-class>
-            org.jboss.resteasy.plugins.server.servlet.FilterDispatcher
-        </filter-class>
-        <init-param>
-            <param-name>javax.ws.rs.Application</param-name>
-            <param-value>org.apache.marmotta.platform.core.webservices.CoreApplication</param-value>
-        </init-param>
-    </filter>
-
-    <filter-mapping>
-        <filter-name>MarmottaWebservices</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-    <context-param>
-        <param-name>resteasy.injector.factory</param-name>
-        <param-value>org.jboss.resteasy.cdi.CdiInjectorFactory</param-value>
-    </context-param>
-
-    <filter>
-        <filter-name>MarmottaPostStartupFilter</filter-name>
-        <filter-class>
-            org.apache.marmotta.platform.core.servlet.MarmottaPostStartupFilter
-        </filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>MarmottaPostStartupFilter</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-</web-app>

http://git-wip-us.apache.org/repos/asf/marmotta/blob/6b4fc9dd/launchers/marmotta-webapp-bigdata/src/main/webapp/index.jsp
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp-bigdata/src/main/webapp/index.jsp b/launchers/marmotta-webapp-bigdata/src/main/webapp/index.jsp
deleted file mode 100644
index a25f4f6..0000000
--- a/launchers/marmotta-webapp-bigdata/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,25 +0,0 @@
-<%--
-
-    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.
-
---%>
-<%@ page import="org.apache.marmotta.platform.core.api.config.ConfigurationService" %>
-<%@ page import="org.apache.marmotta.platform.core.util.CDIContext" %>
-<%
-    ConfigurationService configurationService = CDIContext.getInstance(ConfigurationService.class);
-    response.sendRedirect(configurationService.getServerUri()+configurationService.getStringConfiguration("kiwi.pages.startup"));
-%>

http://git-wip-us.apache.org/repos/asf/marmotta/blob/6b4fc9dd/launchers/marmotta-webapp-bigdata/src/test/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp-bigdata/src/test/resources/META-INF/beans.xml b/launchers/marmotta-webapp-bigdata/src/test/resources/META-INF/beans.xml
deleted file mode 100644
index 6504987..0000000
--- a/launchers/marmotta-webapp-bigdata/src/test/resources/META-INF/beans.xml
+++ /dev/null
@@ -1,26 +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.
--->
-
-<beans
-   xmlns="http://java.sun.com/xml/ns/javaee"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="
-      http://java.sun.com/xml/ns/javaee
-      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
-
-</beans>

http://git-wip-us.apache.org/repos/asf/marmotta/blob/6b4fc9dd/launchers/marmotta-webapp-bigdata/src/test/resources/META-INF/test-persistence.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp-bigdata/src/test/resources/META-INF/test-persistence.xml b/launchers/marmotta-webapp-bigdata/src/test/resources/META-INF/test-persistence.xml
deleted file mode 100644
index 1043848..0000000
--- a/launchers/marmotta-webapp-bigdata/src/test/resources/META-INF/test-persistence.xml
+++ /dev/null
@@ -1,83 +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.
--->
-
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
-             version="2.0">
-
-    <!--
-
-            resources/META-INF/persistence.xml.tmpl should be the only place you change anything
-            any of persistence.*.xml. After changing it, "ant configure"
-            copies it to all places it is needed.
-
-    -->
-
-    <persistence-unit name="KiWi" transaction-type="RESOURCE_LOCAL">
-
-        <class>org.apache.marmotta.platform.core.model.rdf.KiWiNode</class>
-        <class>org.apache.marmotta.platform.core.model.rdf.KiWiResource</class>
-        <class>org.apache.marmotta.platform.core.model.rdf.KiWiUriResource</class>
-        <class>org.apache.marmotta.platform.core.model.rdf.KiWiAnonResource</class>
-        <class>org.apache.marmotta.platform.core.model.rdf.KiWiLiteral</class>
-        <class>org.apache.marmotta.platform.core.model.rdf.KiWiStringLiteral</class>
-        <class>org.apache.marmotta.platform.core.model.rdf.KiWiIntLiteral</class>
-        <class>org.apache.marmotta.platform.core.model.rdf.KiWiDoubleLiteral</class>
-        <class>org.apache.marmotta.platform.core.model.rdf.KiWiTextContentLiteral</class>
-        <class>org.apache.marmotta.platform.core.model.rdf.KiWiMediaContentLiteral</class>
-
-        <class>org.apache.marmotta.platform.core.model.rdf.KiWiNamespace</class>
-        <class>org.apache.marmotta.platform.core.model.rdf.KiWiTriple</class>
-
-        <class>org.apache.marmotta.platform.user.model.UserAccount</class>
-        <!--<class>kiwi.core.model.user.KiWiUser</class>-->
-        <!--<class>kiwi.core.model.user.KiWiGroup</class>-->
-        <!--<class>kiwi.core.model.user.Role</class>-->
-
-        <class>org.apache.marmotta.platform.versioning.model.Version</class>
-
-        <properties>
-            <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
-            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
-            <property name="javax.persistence.jdbc.user" value="sa"/>
-            <property name="javax.persistence.jdbc.password" value="sa"/>
-            <property name="javax.persistence.jdbc.url" value="jdbc:h2:/tmp/kiwi-test/db/kiwi2;MVCC=true;DB_CLOSE_ON_EXIT=FALSE"/>
-
-
-            <!-- valid values are validate, update, create, create-drop -->
-            <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-            <property name="hibernate.show_sql" value="false"/>
-            <property name="hibernate.format_sql" value="true"/>
-            <property name="hibernate.jdbc.fetch_size" value="30"/>
-            <property name="hibernate.jdbc.batch_size" value="30"/>
-            <property name="hibernate.default_batch_fetch_size" value="16" />
-            <property name="hibernate.max_fetch_depth" value="3" />
-
-            <!-- Without this statement seem Hibernate to come to "Cannot open connection" state at peak times (e.g. test) -->
-            <property name="hibernate.connection.release_mode" value="after_statement" />
-
-            <!--  caching -->
-            <property name="hibernate.cache.region.factory_class"
-                      value="net.sf.ehcache.hibernate.EhCacheRegionFactory"/>
-            <property name="hibernate.cache.use_query_cache" value="true" />
-            <property name="hibernate.cache.use_second_level_cache" value="true"/>
-            <property name="hibernate.cache.region_prefix" value=""/>
-        </properties>
-    </persistence-unit>
-</persistence>

http://git-wip-us.apache.org/repos/asf/marmotta/blob/6b4fc9dd/launchers/marmotta-webapp-bigdata/src/test/resources/WEB-INF/test-web.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp-bigdata/src/test/resources/WEB-INF/test-web.xml b/launchers/marmotta-webapp-bigdata/src/test/resources/WEB-INF/test-web.xml
deleted file mode 100644
index 7c88ab0..0000000
--- a/launchers/marmotta-webapp-bigdata/src/test/resources/WEB-INF/test-web.xml
+++ /dev/null
@@ -1,188 +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.5"
-         xmlns="http://java.sun.com/xml/ns/javaee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-
-
-
-    <resource-env-ref>
-       <resource-env-ref-name>BeanManager</resource-env-ref-name>
-       <resource-env-ref-type>
-          javax.enterprise.inject.spi.BeanManager
-       </resource-env-ref-type>
-    </resource-env-ref>
-
-    <filter>
-        <filter-name>KiWiInitFilter</filter-name>
-        <filter-class>org.apache.marmotta.platform.core.servlet.KiWiResourceFilter</filter-class>
-        <init-param>
-            <param-name>kiwi.home</param-name>
-            <param-value>/tmp/kiwi-test</param-value>
-        </init-param>
-    </filter>
-    <filter-mapping>
-        <filter-name>KiWiInitFilter</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-
-	<!-- enable CDI / Weld for dependency injection -->
-	<listener>
-	   <listener-class>org.jboss.weld.environment.servlet.Listener</listener-class>
-	</listener>
-		 
-
-	
-	<!--  
-	  RESTeasy Webservices 
-      
-      Every service in the package kiwi.core.webservices is offered automatically as REST webservice; add additional packages as required
-	-->
-	<listener>
-      <listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class>
-    </listener>
-	
-	<!-- Startup the H2 database -->
-	<context-param>
-		<param-name>db.url</param-name>
-		<param-value>jdbc:h2:/tmp/kiwi-test/db/kiwi2;MVCC=true;DB_CLOSE_ON_EXIT=FALSE</param-value>
-	</context-param>
-	<context-param>
-		<param-name>db.user</param-name>
-		<param-value>sa</param-value>
-	</context-param>
-	<context-param>
-		<param-name>db.password</param-name>
-		<param-value>sa</param-value>
-	</context-param>
-	<context-param>
-		<param-name>db.tcpServer</param-name>
-		<param-value>-tcpAllowOthers</param-value>
-	</context-param>
-	<listener>
-	    <listener-class>org.h2.server.web.DbStarter</listener-class>
-	</listener>
-	<servlet>
-		<servlet-name>H2Console</servlet-name>
-		<servlet-class>org.h2.server.web.WebServlet</servlet-class>
-		<!-- <init-param> <param-name>webAllowOthers</param-name> <param-value></param-value> </init-param> 
-			<init-param> <param-name>trace</param-name> <param-value></param-value> </init-param> -->
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>H2Console</servlet-name>
-		<url-pattern>/h2/*</url-pattern>
-	</servlet-mapping>
-	
-
-     <!-- *************************************************************************************************** -->
-     <!-- Apache SOLR                                                                                         -->
-     <!-- *************************************************************************************************** -->
-
-
-
-     <!-- Any path (name) registered in solrconfig.xml will be sent to that filter -->
-     <filter>
-       <filter-name>SolrRequestFilter</filter-name>
-       <filter-class>org.apache.solr.servlet.SolrDispatchFilter</filter-class>
-       <init-param>
-         <param-name>path-prefix</param-name>
-         <param-value>/solr</param-value>
-       </init-param>
-     </filter>
-
-     <filter-mapping>
-       <!--
-         NOTE: When using multicore, /admin JSP URLs with a core specified
-         such as /solr/coreName/admin/stats.jsp get forwarded by a
-         RequestDispatcher to /solr/admin/stats.jsp with the specified core
-         put into request scope keyed as "org.apache.solr.SolrCore".
-
-         It is unnecessary, and potentially problematic, to have the SolrDispatchFilter
-         configured to also filter on forwards.  Do not configure
-         this dispatcher as <dispatcher>FORWARD</dispatcher>.
-       -->
-       <filter-name>SolrRequestFilter</filter-name>
-       <url-pattern>/solr/*</url-pattern>
-     </filter-mapping>
-
-
-     <mime-mapping>
-       <extension>.xsl</extension>
-       <!-- per http://www.w3.org/TR/2006/PR-xslt20-20061121/ -->
-       <mime-type>application/xslt+xml</mime-type>
-     </mime-mapping>
-
-
-
-
-	
-	<!-- EHCache Web Cache -->
-    <filter>
-            <filter-name>SimpleCachingHeadersPageCachingFilter</filter-name>
-            <filter-class>net.sf.ehcache.constructs.web.filter.SimpleCachingHeadersPageCachingFilter</filter-class>
-            <init-param>
-                    <param-name>suppressStackTraces</param-name>
-                    <param-value>false</param-value>
-            </init-param>
-            <init-param>
-                    <param-name>cacheName</param-name>
-                    <param-value>PageCache</param-value>
-            </init-param>
-
-    </filter>
-
-
-
-    <filter>
-        <filter-name>KiWi Webservices</filter-name>
-        <filter-class>
-            org.jboss.resteasy.plugins.server.servlet.FilterDispatcher
-        </filter-class>
-        <init-param>
-            <param-name>javax.ws.rs.Application</param-name>
-            <param-value>org.apache.marmotta.platform.core.webservices.CoreApplication</param-value>
-        </init-param>
-    </filter>
-
-    <filter-mapping>
-        <filter-name>KiWi Webservices</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-    <context-param>
-		<param-name>resteasy.injector.factory</param-name>
-		<param-value>org.jboss.resteasy.cdi.CdiInjectorFactory</param-value>
-	</context-param>
-
-
-    <servlet>
-       <servlet-name>ServletTestRunner</servlet-name>
-       <servlet-class>org.jboss.arquillian.protocol.servlet_3.ServletTestRunner</servlet-class>
-    </servlet>
-
-
-    <servlet-mapping>
-       <servlet-name>ServletTestRunner</servlet-name>
-       <url-pattern>/ArquillianServletRunner</url-pattern>
-    </servlet-mapping>
-
-</web-app>

http://git-wip-us.apache.org/repos/asf/marmotta/blob/6b4fc9dd/launchers/marmotta-webapp-bigdata/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp-bigdata/src/test/resources/arquillian.xml b/launchers/marmotta-webapp-bigdata/src/test/resources/arquillian.xml
deleted file mode 100644
index 379bb29..0000000
--- a/launchers/marmotta-webapp-bigdata/src/test/resources/arquillian.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-   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.
--->
-
-<arquillian xmlns="http://jboss.com/arquillian"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xmlns:tomcat6="urn:arq:org.jboss.arquillian.container.tomcat.embedded_6"
-            xsi:schemaLocation="http://jboss.com/arquillian ">
-
-    <tomcat6:container>
-        <tomcat6:unpackArchive>true</tomcat6:unpackArchive>
-    </tomcat6:container>
-
-</arquillian>

http://git-wip-us.apache.org/repos/asf/marmotta/blob/6b4fc9dd/launchers/marmotta-webapp-bigdata/src/test/resources/ehcache.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp-bigdata/src/test/resources/ehcache.xml b/launchers/marmotta-webapp-bigdata/src/test/resources/ehcache.xml
deleted file mode 100644
index 7cd8120..0000000
--- a/launchers/marmotta-webapp-bigdata/src/test/resources/ehcache.xml
+++ /dev/null
@@ -1,377 +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.
--->
-
-<!--
-CacheManager Configuration
-==========================
-An ehcache-marmotta.xml corresponds to a single CacheManager.
-
-See instructions below or the ehcache schema (ehcache.xsd) on how to configure.
-
-System property tokens can be specified in this file which are replaced when the configuration
-is loaded. For example multicastGroupPort=${multicastGroupPort} can be replaced with the
-System property either from an environment variable or a system property specified with a
-command line switch such as -DmulticastGroupPort=4446.
-
-The attributes of <ehcache> are:
-* name - an optional name for the CacheManager.  The name is optional and primarily used 
-for documentation or to distinguish Terracotta clustered cache state.  With Terracotta 
-clustered caches, a combination of CacheManager name and cache name uniquely identify a 
-particular cache store in the Terracotta clustered memory.
-* updateCheck - an optional boolean flag specifying whether this CacheManager should check
-for new versions of Ehcache over the Internet.  If not specified, updateCheck="true".
-* monitoring - an optional setting that determines whether the CacheManager should 
-automatically register the SampledCacheMBean with the system MBean server.  Currently,
-this monitoring is only useful when using Terracotta and thus the "autodetect" value 
-will detect the presence of Terracotta and register the MBean.  Other allowed values 
-are "on" and "off".  The default is "autodetect".
--->    
-<ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="ehcache.xsd">
-
-    <!-- 
-    DiskStore configuration
-    =======================
-
-    The diskStore element is optional. To turn off disk store path creation, comment out the diskStore
-    element below.
-
-    Configure it if you have overflowToDisk or diskPersistent enabled for any cache.
-
-    If it is not configured, and a cache is created which requires a disk store, a warning will be
-     issued and java.io.tmpdir will automatically be used.
-
-    diskStore has only one attribute - "path". It is the path to the directory where
-    .data and .index files will be created.
-
-    If the path is one of the following Java System Property it is replaced by its value in the
-    running VM. For backward compatibility these are not specified without being enclosed in the ${token}
-    replacement syntax.
-
-    The following properties are translated:
-    * user.home - KiWiUser's home directory
-    * user.dir - KiWiUser's current working directory
-    * java.io.tmpdir - Default temp file path
-    * ehcache.disk.store.dir - A system property you would normally specify on the command line
-      e.g. java -Dehcache.disk.store.dir=/u01/myapp/diskdir ...
-
-    Subdirectories can be specified below the property e.g. java.io.tmpdir/one
-
-    -->
-    <diskStore path="java.io.tmpdir"/>
-
-   <!--
-    Cachemanagereventlistener
-    =========================
-    Specifies a CacheManagerEventListenerFactory which is notified when Caches are added
-    or removed from the CacheManager.
-
-    The attributes of CacheManagerEventListenerFactory are:
-    * class - a fully qualified factory class name
-    * properties - comma separated properties having meaning only to the factory.
-
-    Sets the fully qualified class name to be registered as the CacheManager event listener.
-
-    The events include:
-    * adding a Cache
-    * removing a Cache
-
-    Callbacks to listener methods are synchronous and unsynchronized. It is the responsibility
-    of the implementer to safely handle the potential performance and thread safety issues
-    depending on what their listener is doing.
-
-    If no class is specified, no listener is created. There is no default.
-    -->
-    <cacheManagerEventListenerFactory class="" properties=""/>
-
-
-    <!--
-    CacheManagerPeerProvider
-    ========================
-    (For distributed operation)
-
-    Specifies a CacheManagerPeerProviderFactory which will be used to create a
-    CacheManagerPeerProvider, which discovers other CacheManagers in the cluster.
-
-    One or more providers can be configured. The first one in the ehcache-marmotta.xml is the default, which is used
-    for replication and bootstrapping.
-
-    The attributes of cacheManagerPeerProviderFactory are:
-    * class - a fully qualified factory class name
-    * properties - comma separated properties having meaning only to the factory.
-
-    Providers are available for RMI, JGroups and JMS as shown following.
-
-    RMICacheManagerPeerProvider
-    +++++++++++++++++++++++++++
-
-    Ehcache comes with a built-in RMI-based distribution system with two means of discovery of
-    CacheManager peers participating in the cluster:
-    * automatic, using a multicast group. This one automatically discovers peers and detects
-      changes such as peers entering and leaving the group
-    * manual, using manual rmiURL configuration. A hardcoded list of peers is provided at
-      configuration time.
-
-    Configuring Automatic Discovery:
-    Automatic discovery is configured as per the following example:
-    <cacheManagerPeerProviderFactory
-                        class="net.sf.ehcache.distribution.RMICacheManagerPeerProviderFactory"
-                        properties="hostName=fully_qualified_hostname_or_ip,
-                                    peerDiscovery=automatic, multicastGroupAddress=230.0.0.1,
-                                    multicastGroupPort=4446, timeToLive=32"/>
-
-    Valid properties are:
-    * peerDiscovery (mandatory) - specify "automatic"
-    * multicastGroupAddress (mandatory) - specify a valid multicast group address
-    * multicastGroupPort (mandatory) - specify a dedicated port for the multicast heartbeat
-      traffic
-    * timeToLive - specify a value between 0 and 255 which determines how far the packets will
-      propagate.
-
-      By convention, the restrictions are:
-      0   - the same host
-      1   - the same subnet
-      32  - the same site
-      64  - the same region
-      128 - the same continent
-      255 - unrestricted
-
-     * hostName - the hostname or IP of the interface to be used for sending and receiving multicast packets
-       (relevant to mulithomed hosts only)
-
-    Configuring Manual Discovery:
-    Manual discovery requires a unique configuration per host. It is contains a list of rmiURLs for the peers, other
-    than itself. So, if we have server1, server2 and server3 the configuration will be:
-
-    In server1's configuration:
-    <cacheManagerPeerProviderFactory class=
-                          "net.sf.ehcache.distribution.RMICacheManagerPeerProviderFactory"
-                          properties="peerDiscovery=manual,
-                          rmiUrls=//server2:40000/sampleCache1|//server3:40000/sampleCache1
-                          | //server2:40000/sampleCache2|//server3:40000/sampleCache2"
-                          propertySeparator="," />
-
-    In server2's configuration:
-    <cacheManagerPeerProviderFactory class=
-                          "net.sf.ehcache.distribution.RMICacheManagerPeerProviderFactory"
-                          properties="peerDiscovery=manual,
-                          rmiUrls=//server1:40000/sampleCache1|//server3:40000/sampleCache1
-                          | //server1:40000/sampleCache2|//server3:40000/sampleCache2"
-                          propertySeparator="," />
-
-    In server3's configuration:
-    <cacheManagerPeerProviderFactory class=
-                          "net.sf.ehcache.distribution.RMICacheManagerPeerProviderFactory"
-                          properties="peerDiscovery=manual,
-                          rmiUrls=//server1:40000/sampleCache1|//server2:40000/sampleCache1
-                          | //server1:40000/sampleCache2|//server2:40000/sampleCache2"
-                          propertySeparator="," />
-
-
-    Valid properties are:
-    * peerDiscovery (mandatory) - specify "manual"
-    * rmiUrls (mandatory) - specify a pipe separated list of rmiUrls, in the form
-                            //hostname:port
-    * hostname (optional) - the hostname is the hostname of the remote CacheManager peer. The port is the listening
-      port of the RMICacheManagerPeerListener of the remote CacheManager peer.
-    
-    JGroupsCacheManagerPeerProvider
-    +++++++++++++++++++++++++++++++
-    <cacheManagerPeerProviderFactory class="net.sf.ehcache.distribution.jgroups.JGroupsCacheManagerPeerProviderFactory"
-                                     properties="connect=UDP(mcast_addr=231.12.21.132;mcast_port=45566;ip_ttl=32;
-                                     mcast_send_buf_size=150000;mcast_recv_buf_size=80000):
-                                     PING(timeout=2000;num_initial_members=6):
-                                     MERGE2(min_interval=5000;max_interval=10000):
-                                     FD_SOCK:VERIFY_SUSPECT(timeout=1500):
-                                     pbcast.NAKACK(gc_lag=10;retransmit_timeout=3000):
-                                     UNICAST(timeout=5000):
-                                     pbcast.STABLE(desired_avg_gossip=20000):
-                                     FRAG:
-                                     pbcast.GMS(join_timeout=5000;join_retry_timeout=2000;shun=false;print_local_addr=false)"
-                                     propertySeparator="::"
-            />
-     The only property necessary is the connect String used by jgroups to configure itself. Refer to the Jgroups documentation for explanation
-     of all the protocols. The example above uses UDP multicast. If the connect property is not specified the default JGroups connection will be
-     used.       
-
-
-    JMSCacheManagerPeerProviderFactory
-    ++++++++++++++++++++++++++++++++++
-    <cacheManagerPeerProviderFactory
-            class="net.sf.ehcache.distribution.jms.JMSCacheManagerPeerProviderFactory"
-            properties="..."
-            propertySeparator=","
-            />
-
-    The JMS PeerProviderFactory uses JNDI to maintain message queue independence. Refer to the manual for full configuration
-    examples using ActiveMQ and Open Message Queue.
-
-    Valid properties are:
-    * initialContextFactoryName (mandatory) - the name of the factory used to create the message queue initial context.
-    * providerURL (mandatory) - the JNDI configuration information for the service provider to use.
-    * topicConnectionFactoryBindingName (mandatory) - the JNDI binding name for the TopicConnectionFactory
-    * topicBindingName (mandatory) - the JNDI binding name for the topic name
-    * getQueueBindingName (mandatory only if using jmsCacheLoader) - the JNDI binding name for the queue name
-    * securityPrincipalName - the JNDI java.naming.security.principal
-    * securityCredentials - the JNDI java.naming.security.credentials
-    * urlPkgPrefixes - the JNDI java.naming.factory.url.pkgs
-    * userName - the user name to use when creating the TopicConnection to the Message Queue
-    * password - the password to use when creating the TopicConnection to the Message Queue
-    * acknowledgementMode - the JMS Acknowledgement mode for both publisher and subscriber. The available choices are
-                            AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE and SESSION_TRANSACTED. The default is AUTO_ACKNOWLEDGE.
-    -->
-<!--    <cacheManagerPeerProviderFactory-->
-<!--            class="net.sf.ehcache.distribution.RMICacheManagerPeerProviderFactory"-->
-<!--            properties="peerDiscovery=automatic,-->
-<!--                        multicastGroupAddress=230.0.0.1,-->
-<!--                        multicastGroupPort=4446, timeToLive=1"-->
-<!--            propertySeparator=","-->
-<!--            />-->
-
-
-    <!--
-    CacheManagerPeerListener
-    ========================
-    (Enable for distributed operation)
-
-    Specifies a CacheManagerPeerListenerFactory which will be used to create a
-    CacheManagerPeerListener, which listens for messages from cache replicators participating in the cluster.
-
-    The attributes of cacheManagerPeerListenerFactory are:
-    class - a fully qualified factory class name
-    properties - comma separated properties having meaning only to the factory.
-
-    Ehcache comes with a built-in RMI-based distribution system. The listener component is
-    RMICacheManagerPeerListener which is configured using
-    RMICacheManagerPeerListenerFactory. It is configured as per the following example:
-
-    <cacheManagerPeerListenerFactory
-        class="net.sf.ehcache.distribution.RMICacheManagerPeerListenerFactory"
-        properties="hostName=fully_qualified_hostname_or_ip,
-                    port=40001,
-                    remoteObjectPort=40002,
-                    socketTimeoutMillis=120000"
-                    propertySeparator="," />
-
-    All properties are optional. They are:
-    * hostName - the hostName of the host the listener is running on. Specify
-      where the host is multihomed and you want to control the interface over which cluster
-      messages are received. Defaults to the host name of the default interface if not
-      specified.
-    * port - the port the RMI Registry listener listens on. This defaults to a free port if not specified.
-    * remoteObjectPort - the port number on which the remote objects bound in the registry receive calls.
-                         This defaults to a free port if not specified.
-    * socketTimeoutMillis - the number of ms client sockets will stay open when sending
-      messages to the listener. This should be long enough for the slowest message.
-      If not specified it defaults to 120000ms.
-
-    -->
-<!--    <cacheManagerPeerListenerFactory-->
-<!--            class="net.sf.ehcache.distribution.RMICacheManagerPeerListenerFactory"/>-->
-
-    <!-- Cache configuration.
-
-    The following attributes are required.
-
-    name:
-    Sets the name of the cache. This is used to identify the cache. It must be unique.
-
-    maxElementsInMemory:
-    Sets the maximum number of objects that will be created in memory
-
-        maxElementsOnDisk:
-    Sets the maximum number of objects that will be maintained in the DiskStore
-        The default value is zero, meaning unlimited.
-
-    eternal:
-    Sets whether elements are eternal. If eternal,  timeouts are ignored and the
-    element is never expired.
-
-    overflowToDisk:
-    Sets whether elements can overflow to disk when the memory store
-    has reached the maxInMemory limit.
-
-    The following attributes are optional.
-
-    timeToIdleSeconds:
-    Sets the time to idle for an element before it expires.
-    i.e. The maximum amount of time between accesses before an element expires
-    Is only used if the element is not eternal.
-    Optional attribute. A value of 0 means that an Element can idle for infinity.
-    The default value is 0.
-
-    timeToLiveSeconds:
-    Sets the time to live for an element before it expires.
-    i.e. The maximum time between creation time and when an element expires.
-    Is only used if the element is not eternal.
-    Optional attribute. A value of 0 means that and Element can live for infinity.
-    The default value is 0.
-
-    diskPersistent:
-    Whether the disk store persists between restarts of the Virtual Machine.
-    The default value is false.
-
-    diskExpiryThreadIntervalSeconds:
-    The number of seconds between runs of the disk expiry thread. The default value
-    is 120 seconds.
-
-    memoryStoreEvictionPolicy:
-    Policy would be enforced upon reaching the maxElementsInMemory limit. Default
-    policy is Least Recently Used (specified as LRU). Other policies available -
-    First In First Out (specified as FIFO) and Less Frequently Used
-    (specified as LFU)
-
-    -->
-
-    <!--
-    Mandatory Default Cache configuration. These settings will be applied to caches
-    created programmtically using CacheManager.add(String cacheName)
-    -->
-    <defaultCache
-            maxElementsInMemory="20000"
-            eternal="true"
-            overflowToDisk="false"
-            memoryStoreEvictionPolicy="LRU"
-            />
-
-    <cache name="org.hibernate.cache.StandardQueryCache"
-           maxElementsInMemory="10000"
-           eternal="true"
-           overflowToDisk="false"
-           memoryStoreEvictionPolicy="LRU"/>
-
-    <cache name="org.hibernate.cache.UpdateTimestampsCache"
-           maxElementsInMemory="10000"
-           eternal="true"
-           overflowToDisk="false"/>
-
-    <cache name="PageCache"
-           maxElementsInMemory="1000"
-           eternal="false"
-           overflowToDisk="true"
-           timeToIdleSeconds="1000"
-           timeToLiveSeconds="1000"
-           memoryStoreEvictionPolicy="LRU"/>
-
-<!--  uncomment to enable cache debugging -->
-<!-- 
-	<cacheManagerPeerListenerFactory
-	    class="org.terracotta.ehcachedx.monitor.probe.ProbePeerListenerFactory"
-	    properties="monitorAddress=localhost, monitorPort=9889" />
--->
-
-</ehcache>

http://git-wip-us.apache.org/repos/asf/marmotta/blob/6b4fc9dd/launchers/marmotta-webapp-bigdata/src/test/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp-bigdata/src/test/resources/jndi.properties b/launchers/marmotta-webapp-bigdata/src/test/resources/jndi.properties
deleted file mode 100644
index 72a02c6..0000000
--- a/launchers/marmotta-webapp-bigdata/src/test/resources/jndi.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# 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.
-#
-

http://git-wip-us.apache.org/repos/asf/marmotta/blob/6b4fc9dd/launchers/marmotta-webapp-bigdata/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp-bigdata/src/test/resources/logback.xml b/launchers/marmotta-webapp-bigdata/src/test/resources/logback.xml
deleted file mode 100644
index 19b0144..0000000
--- a/launchers/marmotta-webapp-bigdata/src/test/resources/logback.xml
+++ /dev/null
@@ -1,68 +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.
--->
-
-<configuration>
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <!-- encoders are assigned the type
-     ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="FILE" class="ch.qos.logback.core.FileAppender">
-        <file>kiwi-test.log</file>
-        <append>true</append>
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <!--
-    <appender name="SOCKET" class="ch.qos.logback.classic.net.SocketAppender">
-        <remoteHost>localhost</remoteHost>
-        <port>4560</port>
-        <reconnectionDelay>10000</reconnectionDelay>
-        <includeCallerData>true</includeCallerData>
-    </appender>
-
-
-    <appender name="LILITH" class="de.huxhorn.lilith.logback.appender.ClassicMultiplexSocketAppender">
-        <Compressing>true</Compressing>
-        <ReconnectionDelay>10000</ReconnectionDelay>
-        <IncludeCallerData>true</IncludeCallerData>
-        <RemoteHosts>localhost</RemoteHosts>
-    </appender>
-    -->
-
-
-    <logger name="org.apache.marmotta.platform.core" level="DEBUG" />
-    <logger name="kiwi.test" level="DEBUG" />
-
-    <logger name="org.hibernate" level="INFO" />
-    <logger name="org.hibernate.SQL" level="DEBUG" />
-    <logger name="org.hibernate.pretty" level="DEBUG" />
-
-    <logger name="org.apache.solr" level="INFO" />
-
-
-    <root level="debug">
-        <appender-ref ref="FILE" />
-    </root>
-</configuration>

http://git-wip-us.apache.org/repos/asf/marmotta/blob/6b4fc9dd/launchers/marmotta-webapp-bigdata/src/test/resources/test-config.properties
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp-bigdata/src/test/resources/test-config.properties b/launchers/marmotta-webapp-bigdata/src/test/resources/test-config.properties
deleted file mode 100644
index 1ac0b04..0000000
--- a/launchers/marmotta-webapp-bigdata/src/test/resources/test-config.properties
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# 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.
-#
-
-#####################################################################################################################
-# KiWi core configuration
-#####################################################################################################################
-
-
-# KiWi version
-kiwi.version = 1.99.1
-
-# KiWi home directory (for configuration files etc)
-kiwi.home = /tmp/kiwi-test
-
-# directory where KiWi stores the search index for SOLR search
-solr.home = ${kiwi.home}/solr
-
-# directory where KiWi stores the triple index for SPARQL queries (using Sesame)
-sesame.home = ${kiwi.home}/triples
-
-# base URI of this KiWi installation; used for constructing resource URIs
-kiwi.context = http://localhost:9090/test/
-
-# base URL of the KiWi installation; used for accessing additional web services like SOLR and H2
-kiwi.host = http://localhost:9090/test/
-
-#####################################################################################################################
-# KiWi rendering plugins; these are applied when loading/saving content in the KiWi system
-#####################################################################################################################
-
-savelets.source=kiwi.service.render.savelet.ExtractLinksSavelet,\
-        kiwi.service.render.savelet.HtmlCleanerSavelet
-savelets.text=kiwi.service.render.savelet.NavigationalLinksSavelet,\
-        kiwi.service.render.savelet.RdfaSavelet,\
-        kiwi.service.render.savelet.FragmentsSavelet,\
-        kiwi.service.render.savelet.ComponentSavelet
-savelets.media=
-
-
-renderlets.html.source=
-renderlets.html.xom=kiwi.service.render.renderlet.ComponentRenderlet,\
-		kiwi.service.render.renderlet.ComponentDisplayRenderlet,\
-        kiwi.service.render.renderlet.RdfaRenderlet,\
-        kiwi.service.render.renderlet.HtmlLinkRenderlet,\
-        kiwi.service.render.renderlet.HtmlRdfaRenderlet,\
-        kiwi.service.render.renderlet.HtmlFragmentRenderlet,\
-        kiwi.service.render.renderlet.ImageLinkRenderlet,\
-        kiwi.service.render.renderlet.QueryRenderlet
-
-
-renderlets.editor.source=
-renderlets.editor.xom=kiwi.service.render.renderlet.ComponentRenderlet,\
-        kiwi.service.render.renderlet.RdfaRenderlet,\
-        kiwi.service.render.renderlet.EditorLinkRenderlet
-
-renderlets.annotation.source=
-renderlets.annotation.xom=kiwi.service.render.renderlet.HtmlLinkRenderlet,\
-        kiwi.service.render.renderlet.AnnotationLinksRenderlet
-
-renderlets.media=

http://git-wip-us.apache.org/repos/asf/marmotta/blob/6b4fc9dd/launchers/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/pom.xml b/launchers/pom.xml
index 96b45fa..f75f37b 100644
--- a/launchers/pom.xml
+++ b/launchers/pom.xml
@@ -58,14 +58,4 @@
         <module>marmotta-webapp</module>
     </modules>
 
-    <profiles>
-        <profile>
-            <id>non-free</id>
-            <modules>
-                <module>marmotta-webapp-bigdata</module>
-            </modules>
-        </profile>
-    </profiles>
-
-
 </project>


[4/4] git commit: MARMOTTA-422: remove deprecared marmotta-webapp-bigdata launcher

Posted by wi...@apache.org.
MARMOTTA-422: remove deprecared marmotta-webapp-bigdata launcher


Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/6b4fc9dd
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/6b4fc9dd
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/6b4fc9dd

Branch: refs/heads/develop
Commit: 6b4fc9dd435b6df0f7fb4e4c810ccbf1b2a6c753
Parents: 80bb222
Author: Sergio Fernández <wi...@apache.org>
Authored: Mon Jan 20 08:14:13 2014 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Mon Jan 20 08:14:13 2014 +0100

----------------------------------------------------------------------
 launchers/marmotta-webapp-bigdata/assembly.xml  |   63 -
 launchers/marmotta-webapp-bigdata/pom.xml       |  268 --
 .../src/main/doc/README.txt                     |  111 -
 .../src/main/resources/META-INF/beans.xml       |   28 -
 .../src/main/resources/logback.xml              |   39 -
 .../src/main/webapp/META-INF/LICENSE            | 2821 ------------------
 .../src/main/webapp/META-INF/NOTICE             |   42 -
 .../src/main/webapp/META-INF/jetty-web.xml      |   27 -
 .../src/main/webapp/WEB-INF/jetty-web.xml       |   36 -
 .../src/main/webapp/WEB-INF/web.xml             |  159 -
 .../src/main/webapp/index.jsp                   |   25 -
 .../src/test/resources/META-INF/beans.xml       |   26 -
 .../resources/META-INF/test-persistence.xml     |   83 -
 .../src/test/resources/WEB-INF/test-web.xml     |  188 --
 .../src/test/resources/arquillian.xml           |   27 -
 .../src/test/resources/ehcache.xml              |  377 ---
 .../src/test/resources/jndi.properties          |   14 -
 .../src/test/resources/logback.xml              |   68 -
 .../src/test/resources/test-config.properties   |   71 -
 launchers/pom.xml                               |   10 -
 20 files changed, 4483 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/6b4fc9dd/launchers/marmotta-webapp-bigdata/assembly.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp-bigdata/assembly.xml b/launchers/marmotta-webapp-bigdata/assembly.xml
deleted file mode 100644
index fdeccf1..0000000
--- a/launchers/marmotta-webapp-bigdata/assembly.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<!--
-  ~ 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.
-  -->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-
-    <id>webapp</id>
-
-    <formats>
-        <format>zip</format>
-        <format>tar.gz</format>
-    </formats>
-
-    <!-- unpack to apache-marmotta-x.x.x directory -->
-    <includeBaseDirectory>true</includeBaseDirectory>
-
-
-    <files>
-        <file>
-            <source>${project.basedir}/src/main/webapp/META-INF/LICENSE</source>
-            <destName>LICENSE.txt</destName>
-            <outputDirectory>/</outputDirectory>
-            <fileMode>0644</fileMode>
-        </file>
-        <file>
-            <source>${project.basedir}/src/main/doc/README.txt</source>
-            <outputDirectory>/</outputDirectory>
-            <fileMode>0644</fileMode>
-            <filtered>true</filtered>
-        </file>
-        <file>
-            <source>${project.basedir}/../../DISCLAIMER.txt</source>
-            <outputDirectory>/</outputDirectory>
-            <fileMode>0644</fileMode>
-            <filtered>true</filtered>
-        </file>
-        <file>
-            <source>${project.basedir}/src/main/webapp/META-INF/NOTICE</source>
-            <destName>NOTICE.txt</destName>
-            <outputDirectory>/</outputDirectory>
-            <fileMode>0644</fileMode>
-        </file>
-        <file>
-            <source>${project.build.directory}/marmotta.war</source>
-            <outputDirectory>/</outputDirectory>
-            <fileMode>0644</fileMode>
-        </file>
-    </files>
-</assembly>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/marmotta/blob/6b4fc9dd/launchers/marmotta-webapp-bigdata/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp-bigdata/pom.xml b/launchers/marmotta-webapp-bigdata/pom.xml
deleted file mode 100644
index 656af87..0000000
--- a/launchers/marmotta-webapp-bigdata/pom.xml
+++ /dev/null
@@ -1,268 +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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.marmotta</groupId>
-        <artifactId>marmotta-parent</artifactId>
-        <version>3.2.0-SNAPSHOT</version>
-        <relativePath>../../parent</relativePath>
-    </parent>
-
-    <artifactId>marmotta-webapp-bigdata</artifactId>
-    <packaging>war</packaging>
-
-    <name>Apache Marmotta Web Application (BigData Bundle)</name>
-    <description>Web Application bundle (WAR file) containing Apache Marmotta. This package is bundled with the GPL
-        licensed BigData backend and therefore not build by default.
-    </description>
-
-    <properties>
-        <!-- these are used for the goals tomcat6/7:run or jetty:run -->
-        <marmotta.home>${java.io.tmpdir}${file.separator}marmotta</marmotta.home>
-        <marmotta.context>/</marmotta.context>
-        <marmotta.port>8080</marmotta.port>
-    </properties>
-
-    <repositories>
-        <repository>
-            <id>bigdata.releases</id>
-            <url>http://www.systap.com/maven/releases/</url>
-        </repository>
-    </repositories>
-
-    <build>
-        <finalName>marmotta</finalName>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <artifactId>maven-war-plugin</artifactId>
-                    <version>2.3</version>
-                    <configuration>
-                        <archive>
-                            <manifest>
-                                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                                <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                            </manifest>
-                        </archive>
-                        <archiveClasses>false</archiveClasses>
-                    </configuration>
-                </plugin>
-                <plugin> <!-- generate JRebel Configuration -->
-                    <groupId>org.zeroturnaround</groupId>
-                    <artifactId>jrebel-maven-plugin</artifactId>
-                    <configuration>
-                        <relativePath>../</relativePath>
-                        <rootPath>${rebel.root}</rootPath>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-install-plugin</artifactId>
-                    <configuration>
-                        <skip>true</skip>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <configuration>
-                        <skip>true</skip>
-                    </configuration>
-                </plugin>
-                 <plugin>
-                    <groupId>org.apache.tomcat.maven</groupId>
-                    <artifactId>tomcat7-maven-plugin</artifactId>
-                    <version>2.1</version>
-                    <configuration>
-                        <path>${marmotta.context}</path>
-                        <port>${marmotta.port}</port>
-                        <systemProperties>
-                            <marmotta.home>${marmotta.home}</marmotta.home>
-                        </systemProperties>
-                        <!-- <contextReloadable>true</contextReloadable> -->
-                        <!-- <backgroundProcessorDelay>10</backgroundProcessorDelay> -->
-                    </configuration>
-                </plugin>
-             </plugins>
-        </pluginManagement>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.tomcat.maven</groupId>
-                <artifactId>tomcat7-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-            </plugin>
-
-            <plugin>
-                <groupId>org.jasig.maven</groupId>
-                <artifactId>maven-notice-plugin</artifactId>
-                <version>1.0.4</version>
-                <configuration>
-                    <noticeTemplate>NOTICE.template</noticeTemplate>
-                    <licenseMapping>
-                        <param>../../license-mappings.xml</param>
-                    </licenseMapping>
-                    <noticeMessage>* {0}, under {1}</noticeMessage>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>cleanall</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-clean-plugin</artifactId>
-                        <version>2.5</version>
-                        <configuration>
-                            <filesets>
-                                <fileset>
-                                    <directory>${marmotta.home}</directory>
-                                    <followSymlinks>true</followSymlinks>
-                                </fileset>
-                            </filesets>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>marmotta-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <phase>package</phase>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>assembly.xml</descriptor>
-                                    </descriptors>
-                                    <finalName>apache-marmotta-${project.version}</finalName>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-    <dependencies>
-        <!-- Marmotta Modules, include the ones needed by the application -->
-        <dependency>
-            <groupId>org.apache.marmotta</groupId>
-            <artifactId>marmotta-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.marmotta</groupId>
-            <artifactId>marmotta-ldpath</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.marmotta</groupId>
-            <artifactId>marmotta-backend-bigdata</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.marmotta</groupId>
-            <artifactId>marmotta-sparql</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.marmotta</groupId>
-            <artifactId>marmotta-security</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.marmotta</groupId>
-            <artifactId>marmotta-user</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.marmotta</groupId>
-            <artifactId>marmotta-ldcache-common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.marmotta</groupId>
-            <artifactId>marmotta-ldcache-file</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <!-- Servlet / CDI Environment -->
-        <dependency>
-            <groupId>javax.el</groupId>
-            <artifactId>javax.el-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.weld.servlet</groupId>
-            <artifactId>weld-servlet-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.weld</groupId>
-            <artifactId>weld-core</artifactId>
-        </dependency>
-
-
-        <dependency>
-            <groupId>com.bigdata</groupId>
-            <artifactId>bigdata</artifactId>
-            <version>1.2.3</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.openrdf.sesame</groupId>
-                    <artifactId>sesame-runtime</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-
-            </exclusions>
-        </dependency>
-
-        <!-- CORS filter -->
-        <dependency>
-            <groupId>com.thetransactioncompany</groupId>
-            <artifactId>cors-filter</artifactId>
-        </dependency>
-
-    </dependencies>
-
-</project>

http://git-wip-us.apache.org/repos/asf/marmotta/blob/6b4fc9dd/launchers/marmotta-webapp-bigdata/src/main/doc/README.txt
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp-bigdata/src/main/doc/README.txt b/launchers/marmotta-webapp-bigdata/src/main/doc/README.txt
deleted file mode 100644
index 739c2fc..0000000
--- a/launchers/marmotta-webapp-bigdata/src/main/doc/README.txt
+++ /dev/null
@@ -1,111 +0,0 @@
-Apache Marmotta Web Application
-===============================
-
-This package contains a special version for the binary web application of the
-Apache Marmotta Platform packaged with the high-performance BigData triple
-store implementation.
-
-The package can be deployed in any Java Application Server (with Servlet API 2.5 or
-higher). Apache Marmotta is tested on the following servers:
-- Apache Tomcat 6.x and 7.x
-- Jetty 6.x
-
-However, most other servers should also work without problems.
-
-The following sections give a short introduction how to deploy the Marmotta
-Web Application in your server. More detailed instructions are available at:
-
-http://marmotta.apache.org/installation.html
-
-
-1. Requirements
----------------
-
-The following minimum requirements need to be satisfied to run the Apache
-Marmotta Web Application:
-
-Hardware:
-- Dual-Core CPU
-- 1GB main memory
-- 100MB hard disk
-
-Software:
-- Java JDK 6 or higher
-- Java Application Server (Apache Tomcat 6.x/7.x or Jetty 6.x)
-
-If no database is available, Apache Marmotta will use an embedded H2 database
-for storing its data. This should only be used for testing and demonstration
-purposes and is strongly discouraged for production deployments.
-
-
-2. Deployment
--------------
-
-To deploy the Apache Marmotta Web Application in your application server,
-follow the following steps:
-
-1.  download and install the application server and the database you intend
-    to use (PostgreSQL or MySQL)
-2a. set the environment variable MARMOTTA_HOME to the directory where
-    Apache Marmotta should store its persistent runtime data; this can also
-    be done permanently in the startup scripts of the application server
-2b. alternatively, configure a context definition for your web application
-    that sets the init parameter "marmotta.home" to the directory where
-    Apache Marmotta should store its persistent runtime data (see below)
-3.  configure the application server with sufficient main memory
-    (1GB heap space, 256MB permgen space)
-4.  copy marmotta.war to the deployment root of your application server
-    (Tomcat and Jetty: the webapps/ subdirectory)
-5.  start up your application server using the startup script or similar
-    provided by the distribution
-
-Examples:
-
-Environment variables for home directory and application server memory:
-
-> export MARMOTTA_HOME=<PATH-TO-HOME>
-> export JAVA_OPTS="-Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=256m"
-
-Tomcat context definition for handing over the home directory init parameter
-(in conf/Catalina/localhost/marmotta.xml):
-
-<Context docBase="/path/to/marmotta.war" unpackWAR="false" useNaming="true">
-  <Parameter name="marmotta.home" value="/data/marmotta" override="false"/>
-</Context>
-
-
-3. Configuration
-----------------
-
-3.1 Access Admin Interface
-
-You can now access the Apache Marmotta Web Application through your browser,
-e.g. by accessing the URL:
-
-  http://localhost:8080/marmotta
-
-Note that the host name and port you are using for the first access of your
-installation decide on how Linked Data resources will be created later. If
-you plan a production deployment, you should therefore directly deploy on
-the server you are going to use and access it via the host name it will
-have in the future.
-
-
-3.2 Change Database Configuration
-
-In case you are not going to use the embedded H2 database, the first step you
-should do is to configure a different database. The database can be changed
-in the "configuration" section of the Marmotta Core module (scroll down to
-the bottom of the configuration page).
-
-Apache Marmotta can only connect to an existing database with an existing
-user and password. It will create the necessary database tables the first
-time it accesses the database, in case they do not exist yet. On first start
-the database should therefore be empty, or otherwise you will have old data
-in your installation.
-
-Special note for MySQL: for legal reasons, we cannot distribute the MySQL
-Java drivers that are needed to access a MySQL database. In case you aim
-to use MySQL, please download the MySQL JDBC connector manually and place
-it either in the application server lib/ directory or in the WEB-INF/lib
-directory of Apache Marmotta.

http://git-wip-us.apache.org/repos/asf/marmotta/blob/6b4fc9dd/launchers/marmotta-webapp-bigdata/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp-bigdata/src/main/resources/META-INF/beans.xml b/launchers/marmotta-webapp-bigdata/src/main/resources/META-INF/beans.xml
deleted file mode 100644
index 461858e..0000000
--- a/launchers/marmotta-webapp-bigdata/src/main/resources/META-INF/beans.xml
+++ /dev/null
@@ -1,28 +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.
-
--->
-<beans
-   xmlns="http://java.sun.com/xml/ns/javaee"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="
-      http://java.sun.com/xml/ns/javaee
-      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
-
-</beans>

http://git-wip-us.apache.org/repos/asf/marmotta/blob/6b4fc9dd/launchers/marmotta-webapp-bigdata/src/main/resources/logback.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp-bigdata/src/main/resources/logback.xml b/launchers/marmotta-webapp-bigdata/src/main/resources/logback.xml
deleted file mode 100644
index c775855..0000000
--- a/launchers/marmotta-webapp-bigdata/src/main/resources/logback.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--
-
-    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.
-
--->
-<configuration>
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <!-- encoders are assigned the type
-     ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-        <encoder>
-<!--            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>  -->
-            <pattern>%d{HH:mm:ss.SSS} %-5level - %msg%n</pattern>
-<!--            <pattern>%d{HH:mm:ss.SSS} %-5level %logger{36} - %msg%n</pattern> -->
-        </encoder>
-    </appender>
-
-    <logger name="org.apache.marmotta.platform.core" level="INFO" />
-
-    <logger name="org.apache.marmotta.platform.reasoner" level="INFO" />
-
-    <root level="info">
-        <appender-ref ref="STDOUT" />
-    </root>
-</configuration>