Now we have pulled the winery source codes from github and publish the winery binary to OPEN-O third party Nexus repository. So we don't use winery code in the OPEN-O git repo anymore.

Issue id: OCS-55

Change-Id: I76fdfb17b1c90377a44c2d47f81b5698d5a220d3
Signed-off-by: HuabingZhao <zhao.huabing@zte.com.cn>

14 files changed, 0 insertions, 1254 deletions

diff --git a/winery/org.eclipse.winery.highlevelrestapi/.gitignore b/winery/org.eclipse.winery.highlevelrestapi/.gitignore
deleted file mode 100644
index 948b942..0000000
--- a/winery/org.eclipse.winery.highlevelrestapi/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-.classpath
-/.gradle
-.settings
-.project
-/.sonar
-/bin
-/build
-sonar-project.properties
-/src/main/resources/rebel.xml
-/target
diff --git a/winery/org.eclipse.winery.highlevelrestapi/LICENSE-ASL.txt b/winery/org.eclipse.winery.highlevelrestapi/LICENSE-ASL.txt
deleted file mode 100644
index d645695..0000000
--- a/winery/org.eclipse.winery.highlevelrestapi/LICENSE-ASL.txt
+++ /dev/null
@@ -1,202 +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.
diff --git a/winery/org.eclipse.winery.highlevelrestapi/LICENSE-EPL.txt b/winery/org.eclipse.winery.highlevelrestapi/LICENSE-EPL.txt
deleted file mode 100644
index 5d80026..0000000
--- a/winery/org.eclipse.winery.highlevelrestapi/LICENSE-EPL.txt
+++ /dev/null
@@ -1,227 +0,0 @@
-Eclipse Public License - v 1.0
-
-   THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-   PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF
-   THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-   1. DEFINITIONS
-
-   "Contribution" means:
-
-   a) in the case of the initial Contributor, the initial code and
-   documentation distributed under this Agreement, and
-
-   b) in the case of each subsequent Contributor:
-
-   i) changes to the Program, and
-
-   ii) additions to the Program;
-
-   where such changes and/or additions to the Program originate from and
-   are distributed by that particular Contributor. A Contribution
-   'originates' from a Contributor if it was added to the Program by such
-   Contributor itself or anyone acting on such Contributor's behalf.
-   Contributions do not include additions to the Program which: (i) are
-   separate modules of software distributed in conjunction with the
-   Program under their own license agreement, and (ii) are not derivative
-   works of the Program.
-
-   "Contributor" means any person or entity that distributes the Program.
-
-   "Licensed Patents" mean patent claims licensable by a Contributor which
-   are necessarily infringed by the use or sale of its Contribution alone
-   or when combined with the Program.
-
-   "Program" means the Contributions distributed in accordance with this
-   Agreement.
-
-   "Recipient" means anyone who receives the Program under this Agreement,
-   including all Contributors.
-
-   2. GRANT OF RIGHTS
-
-   a) Subject to the terms of this Agreement, each Contributor hereby
-   grants Recipient a non-exclusive, worldwide, royalty-free copyright
-   license to reproduce, prepare derivative works of, publicly display,
-   publicly perform, distribute and sublicense the Contribution of such
-   Contributor, if any, and such derivative works, in source code and
-   object code form.
-
-   b) Subject to the terms of this Agreement, each Contributor hereby
-   grants Recipient a non-exclusive, worldwide, royalty-free patent
-   license under Licensed Patents to make, use, sell, offer to sell,
-   import and otherwise transfer the Contribution of such Contributor, if
-   any, in source code and object code form. This patent license shall
-   apply to the combination of the Contribution and the Program if, at the
-   time the Contribution is added by the Contributor, such addition of the
-   Contribution causes such combination to be covered by the Licensed
-   Patents. The patent license shall not apply to any other combinations
-   which include the Contribution. No hardware per se is licensed
-   hereunder.
-
-   c) Recipient understands that although each Contributor grants the
-   licenses to its Contributions set forth herein, no assurances are
-   provided by any Contributor that the Program does not infringe the
-   patent or other intellectual property rights of any other entity. Each
-   Contributor disclaims any liability to Recipient for claims brought by
-   any other entity based on infringement of intellectual property rights
-   or otherwise. As a condition to exercising the rights and licenses
-   granted hereunder, each Recipient hereby assumes sole responsibility to
-   secure any other intellectual property rights needed, if any. For
-   example, if a third party patent license is required to allow Recipient
-   to distribute the Program, it is Recipient's responsibility to acquire
-   that license before distributing the Program.
-
-   d) Each Contributor represents that to its knowledge it has sufficient
-   copyright rights in its Contribution, if any, to grant the copyright
-   license set forth in this Agreement.
-
-   3. REQUIREMENTS
-
-   A Contributor may choose to distribute the Program in object code form
-   under its own license agreement, provided that:
-
-   a) it complies with the terms and conditions of this Agreement; and
-
-   b) its license agreement:
-
-   i) effectively disclaims on behalf of all Contributors all warranties
-   and conditions, express and implied, including warranties or conditions
-   of title and non-infringement, and implied warranties or conditions of
-   merchantability and fitness for a particular purpose;
-
-   ii) effectively excludes on behalf of all Contributors all liability
-   for damages, including direct, indirect, special, incidental and
-   consequential damages, such as lost profits;
-
-   iii) states that any provisions which differ from this Agreement are
-   offered by that Contributor alone and not by any other party; and
-
-   iv) states that source code for the Program is available from such
-   Contributor, and informs licensees how to obtain it in a reasonable
-   manner on or through a medium customarily used for software exchange.
-
-   When the Program is made available in source code form:
-
-   a) it must be made available under this Agreement; and
-
-   b) a copy of this Agreement must be included with each copy of the
-   Program.
-
-   Contributors may not remove or alter any copyright notices contained
-   within the Program.
-
-   Each Contributor must identify itself as the originator of its
-   Contribution, if any, in a manner that reasonably allows subsequent
-   Recipients to identify the originator of the Contribution.
-
-   4. COMMERCIAL DISTRIBUTION
-
-   Commercial distributors of software may accept certain responsibilities
-   with respect to end users, business partners and the like. While this
-   license is intended to facilitate the commercial use of the Program,
-   the Contributor who includes the Program in a commercial product
-   offering should do so in a manner which does not create potential
-   liability for other Contributors. Therefore, if a Contributor includes
-   the Program in a commercial product offering, such Contributor
-   ("Commercial Contributor") hereby agrees to defend and indemnify every
-   other Contributor ("Indemnified Contributor") against any losses,
-   damages and costs (collectively "Losses") arising from claims, lawsuits
-   and other legal actions brought by a third party against the
-   Indemnified Contributor to the extent caused by the acts or omissions
-   of such Commercial Contributor in connection with its distribution of
-   the Program in a commercial product offering. The obligations in this
-   section do not apply to any claims or Losses relating to any actual or
-   alleged intellectual property infringement. In order to qualify, an
-   Indemnified Contributor must: a) promptly notify the Commercial
-   Contributor in writing of such claim, and b) allow the Commercial
-   Contributor to control, and cooperate with the Commercial Contributor
-   in, the defense and any related settlement negotiations. The
-   Indemnified Contributor may participate in any such claim at its own
-   expense.
-
-   For example, a Contributor might include the Program in a commercial
-   product offering, Product X. That Contributor is then a Commercial
-   Contributor. If that Commercial Contributor then makes performance
-   claims, or offers warranties related to Product X, those performance
-   claims and warranties are such Commercial Contributor's responsibility
-   alone. Under this section, the Commercial Contributor would have to
-   defend claims against the other Contributors related to those
-   performance claims and warranties, and if a court requires any other
-   Contributor to pay any damages as a result, the Commercial Contributor
-   must pay those damages.
-
-   5. NO WARRANTY
-
-   EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-   PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY
-   WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR
-   FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible
-   for determining the appropriateness of using and distributing the
-   Program and assumes all risks associated with its exercise of rights
-   under this Agreement , including but not limited to the risks and costs
-   of program errors, compliance with applicable laws, damage to or loss
-   of data, programs or equipment, and unavailability or interruption of
-   operations.
-
-   6. DISCLAIMER OF LIABILITY
-
-   EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR
-   ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-   INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-   WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-   DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-   HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-   7. GENERAL
-
-   If any provision of this Agreement is invalid or unenforceable under
-   applicable law, it shall not affect the validity or enforceability of
-   the remainder of the terms of this Agreement, and without further
-   action by the parties hereto, such provision shall be reformed to the
-   minimum extent necessary to make such provision valid and enforceable.
-
-   If Recipient institutes patent litigation against any entity (including
-   a cross-claim or counterclaim in a lawsuit) alleging that the Program
-   itself (excluding combinations of the Program with other software or
-   hardware) infringes such Recipient's patent(s), then such Recipient's
-   rights granted under Section 2(b) shall terminate as of the date such
-   litigation is filed.
-
-   All Recipient's rights under this Agreement shall terminate if it fails
-   to comply with any of the material terms or conditions of this
-   Agreement and does not cure such failure in a reasonable period of time
-   after becoming aware of such noncompliance. If all Recipient's rights
-   under this Agreement terminate, Recipient agrees to cease use and
-   distribution of the Program as soon as reasonably practicable. However,
-   Recipient's obligations under this Agreement and any licenses granted
-   by Recipient relating to the Program shall continue and survive.
-
-   Everyone is permitted to copy and distribute copies of this Agreement,
-   but in order to avoid inconsistency the Agreement is copyrighted and
-   may only be modified in the following manner. The Agreement Steward
-   reserves the right to publish new versions (including revisions) of
-   this Agreement from time to time. No one other than the Agreement
-   Steward has the right to modify this Agreement. The Eclipse Foundation
-   is the initial Agreement Steward. The Eclipse Foundation may assign the
-   responsibility to serve as the Agreement Steward to a suitable separate
-   entity. Each new version of the Agreement will be given a
-   distinguishing version number. The Program (including Contributions)
-   may always be distributed subject to the version of the Agreement under
-   which it was received. In addition, after a new version of the
-   Agreement is published, Contributor may elect to distribute the Program
-   (including its Contributions) under the new version. Except as
-   expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-   rights or licenses to the intellectual property of any Contributor
-   under this Agreement, whether expressly, by implication, estoppel or
-   otherwise. All rights in the Program not expressly granted under this
-   Agreement are reserved.
-
-   This Agreement is governed by the laws of the State of New York and the
-   intellectual property laws of the United States of America. No party to
-   this Agreement will bring a legal action under this Agreement more than
-   one year after the cause of action arose. Each party waives its rights
-   to a jury trial in any resulting litigation.
diff --git a/winery/org.eclipse.winery.highlevelrestapi/README.md b/winery/org.eclipse.winery.highlevelrestapi/README.md
deleted file mode 100644
index fa1820b..0000000
--- a/winery/org.eclipse.winery.highlevelrestapi/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-This project provides a wrapper around org.apache.commons.httpclient.
-
-It is independent of Winery itself as Winery uses JAX-RS.
-The generated implementation artifacts, however, rely on this package.
-
-## Build fat JARs
-To build a fatJar of the HighLevelRestAPI which also contains all the dependencies use the maven profile fatJar (i.e., run `mvn clean package -P fatJar`).
-Maven will create a JAR called `org.eclipse.winery.highlevelrestapi-*-jar-with-dependencies.jar` in `/target`.
\ No newline at end of file
diff --git a/winery/org.eclipse.winery.highlevelrestapi/about.html b/winery/org.eclipse.winery.highlevelrestapi/about.html
deleted file mode 100644
index 070c2de..0000000
--- a/winery/org.eclipse.winery.highlevelrestapi/about.html
+++ /dev/null
@@ -1,117 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>January 24, 2014</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&ldquo;Content&rdquo;).  Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-<a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License Version 1.0 (&ldquo;EPL&rdquo;)</a>
-and <a href="http://www.opensource.org/licenses/apache2.0.php">Apache License Version 2.0</a>.
-A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
-and a copy of the Apache License Version 2.0 is available at <a href="http://www.opensource.org/licenses/apache2.0.php">http://www.opensource.org/licenses/apache2.0.php</a>.
-You may elect to redistribute this code under either of these licenses.
-For purposes of the EPL, &ldquo;Program&rdquo; will mean the Content.
-</p>
-
-<p>
-If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party (&ldquo;Redistributor&rdquo;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor&rsquo;s license that was
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL and Apache License 2.0 still apply to any source code
-in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.
-</p>
-
-<h3>Third Party Content</h3>
-
-<h4>Java Libraries</h4>
-
-<h5>Apache Commons Codec &ndash; Version 1.3</h5>
-<table>
-	<tr>
-		<td>URL</td>
-		<td><a href="http://commons.apache.org/proper/commons-codec/">http://commons.apache.org/proper/commons-codec/</a></td>
-	</tr>
-	<tr>
-		<td>License</td>
-		<td>Apache 2.0. A copy of the license is contained in the file <a href="about_files/Apache-LICENSE-2.0.txt" target="_blank">Apache-LICENSE-2.0.txt</a> and is also available at <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">http://www.apache.org/licenses/LICENSE-2.0</a></td>
-	</tr>
-</table>
-
-<h5>Apache Commons HTTP Client &ndash; Version 3.1</h5>
-<table>
-	<tr>
-		<td>URL</td>
-		<td><a href="http://hc.apache.org/httpclient-3.x/">http://hc.apache.org/httpclient-3.x/</a></td>
-	</tr>
-	<tr>
-		<td>License</td>
-		<td>Apache 2.0. A copy of the license is contained in the file <a href="about_files/Apache-LICENSE-2.0.txt" target="_blank">Apache-LICENSE-2.0.txt</a> and is also available at <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">http://www.apache.org/licenses/LICENSE-2.0</a></td>
-	</tr>
-</table>
-
-<h5>Logback Classic &ndash; Version 1.1.1</h5>
-<table>
-	<tr>
-		<td>URL</td>
-		<td><a href="http://logback.qos.ch/">http://logback.qos.ch/</a></td>
-	</tr>
-	<tr>
-		<td>License</td>
-		<td>EPL/LGPL dual license.
-		EPL: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-		LGPL v2.1: <a href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1">http://www.gnu.org/licenses/old-licenses/lgpl-2.1</a>.
-		A copy of the license is contained in the file <a href="about_files/LICENSE-logback.txt" target="_blank">LICENSE-logback.txt</a> and is also available at <a href="http://logback.qos.ch/license.html" target="_blank">http://logback.qos.ch/license.html</a>.
-		The Eclipse Foundation elects to include this software in this distribution under the EPL license.</td>
-	</tr>
-</table>
-
-<h5>Logback Core &ndash; Version 1.1.1</h5>
-<table>
-	<tr>
-		<td>URL</td>
-		<td><a href="http://logback.qos.ch/">http://logback.qos.ch/</a></td>
-	</tr>
-	<tr>
-		<td>License</td>
-		<td>EPL/LGPL dual license.
-		EPL: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-		LGPL v2.1: <a href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1">http://www.gnu.org/licenses/old-licenses/lgpl-2.1</a>.
-		A copy of the license is contained in the file <a href="about_files/LICENSE-logback.txt" target="_blank">LICENSE-logback.txt</a> and is also available at <a href="http://logback.qos.ch/license.html" target="_blank">http://logback.qos.ch/license.html</a>.
-		The Eclipse Foundation elects to include this software in this distribution under the EPL license.</td>
-	</tr>
-</table>
-
-<h5>SLF4J: slf4j-api &ndash; Version 1.7.6</h5>
-<table>
-	<tr>
-		<td>URL</td>
-		<td><a href="http://www.slf4j.org/">http://www.slf4j.org/</a></td>
-	</tr>
-	<tr>
-		<td>License</td>
-		<td>MIT. A copy of the license is contained in the file <a href="about_files/LICENSE-slf4j-api.txt" target="_blank">LICENSE-slf4j-api.txt</a> and is also available at <a href="http://www.slf4j.org/license.html" target="_blank">http://www.slf4j.org/license.html</a></td>
-	</tr>
-</table>
-
-<h5>SLF4J: jcl-over-slf4j &ndash; Version 1.7.6</h5>
-<table>
-	<tr>
-		<td>URL</td>
-		<td><a href="http://www.slf4j.org/legacy.html">http://www.slf4j.org/legacy.html</a></td>
-	</tr>
-	<tr>
-		<td>License</td>
-		<td>Apache 2.0. A copy of the license is contained in the file <a href="about_files/Apache-LICENSE-2.0.txt" target="_blank">Apache-LICENSE-2.0.txt</a> and is also available at <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">http://www.apache.org/licenses/LICENSE-2.0</a></td>
-	</tr>
-</table>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/winery/org.eclipse.winery.highlevelrestapi/about_files/Apache-LICENSE-2.0.txt b/winery/org.eclipse.winery.highlevelrestapi/about_files/Apache-LICENSE-2.0.txt
deleted file mode 100644
index d645695..0000000
--- a/winery/org.eclipse.winery.highlevelrestapi/about_files/Apache-LICENSE-2.0.txt
+++ /dev/null
@@ -1,202 +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.
diff --git a/winery/org.eclipse.winery.highlevelrestapi/about_files/LICENSE-logback.txt b/winery/org.eclipse.winery.highlevelrestapi/about_files/LICENSE-logback.txt
deleted file mode 100644
index b4fe24e..0000000
--- a/winery/org.eclipse.winery.highlevelrestapi/about_files/LICENSE-logback.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Logback LICENSE
----------------
-
-Logback: the reliable, generic, fast and flexible logging framework.
-Copyright (C) 1999-2012, QOS.ch. All rights reserved.
-
-This program and the accompanying materials are dual-licensed under
-either the terms of the Eclipse Public License v1.0 as published by
-the Eclipse Foundation
- 
-  or (per the licensee's choosing)
- 
-under the terms of the GNU Lesser General Public License version 2.1
-as published by the Free Software Foundation.
-
diff --git a/winery/org.eclipse.winery.highlevelrestapi/about_files/LICENSE-slf4j-api.txt b/winery/org.eclipse.winery.highlevelrestapi/about_files/LICENSE-slf4j-api.txt
deleted file mode 100644
index 37050c9..0000000
--- a/winery/org.eclipse.winery.highlevelrestapi/about_files/LICENSE-slf4j-api.txt
+++ /dev/null
@@ -1,21 +0,0 @@
- Copyright (c) 2004-2013 QOS.ch
- All rights reserved.
-
- Permission is hereby granted, free  of charge, to any person obtaining
- a  copy  of this  software  and  associated  documentation files  (the
- "Software"), to  deal in  the Software without  restriction, including
- without limitation  the rights to  use, copy, modify,  merge, publish,
- distribute,  sublicense, and/or sell  copies of  the Software,  and to
- permit persons to whom the Software  is furnished to do so, subject to
- the following conditions:
- 
- The  above  copyright  notice  and  this permission  notice  shall  be
- included in all copies or substantial portions of the Software.
- 
- THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
- EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
- MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/winery/org.eclipse.winery.highlevelrestapi/notice.html b/winery/org.eclipse.winery.highlevelrestapi/notice.html
deleted file mode 100644
index 122ebbc..0000000
--- a/winery/org.eclipse.winery.highlevelrestapi/notice.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 and Apache License v2.0 which accompanies this distribution.
-The Eclipse Public License is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a> and the Apache License v2.0 is available at <a href="http://www.opensource.org/licenses/apache2.0.php">http://www.opensource.org/licenses/apache2.0.php</a>.
-You may elect to redistribute this code under either of these licenses.</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/winery/org.eclipse.winery.highlevelrestapi/pom.xml b/winery/org.eclipse.winery.highlevelrestapi/pom.xml
deleted file mode 100644
index 7474246..0000000
--- a/winery/org.eclipse.winery.highlevelrestapi/pom.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*******************************************************************************
- * Copyright (c) 2013 University of Stuttgart.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and the Apache License 2.0 which both accompany this distribution,
- * and are available at http://www.eclipse.org/legal/epl-v10.html
- * and http://www.apache.org/licenses/LICENSE-2.0
- *
- * Contributors:
- *    Oliver Kopp - initial API and implementation and/or initial documentation
- *    Tobias Binz - Adds support for building fatJars (including all dependencies) and profile for fatJars
- *******************************************************************************/
--->
-<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>
-	<groupId>org.eclipse.winery</groupId>
-	<version>0.1.7-SNAPSHOT</version>
-	<artifactId>org.eclipse.winery.highlevelrestapi</artifactId>
-	<packaging>jar</packaging>
-	<url>http://www.eclipse.org/winery</url>
-	<organization>
-		<name>Eclipse.org - Winery Project</name>
-		<url>http://www.eclipse.org/winery</url>
-	</organization>
-	<issueManagement>
-		<system>bugzilla</system>
-		<url>https://bugs.eclipse.org/bugs</url>
-	</issueManagement>
-	<inceptionYear>2012</inceptionYear>
-	<mailingLists>
-		<mailingList>
-			<name>Winery Developer List</name>
-			<post>winery-dev@eclipse.org</post>
-			<archive>http://dev.eclipse.org/mhonarc/lists/winery-dev</archive>
-		</mailingList>
-	</mailingLists>
-	<licenses>
-		<license>
-			<name>Eclipse Public License v1.0</name>
-			<url>http://www.eclipse.org/legal/epl-v10.html</url>
-			<distribution>repo</distribution>
-			<comments>Standard Eclipse Licence</comments>
-		</license>
-		<license>
-			<name>Apache License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
-	<profiles>
-		<profile>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<id>default</id>
-			<properties>
-				<package.fatJar>none</package.fatJar>
-			</properties>
-		</profile>
-		<profile>
-			<id>fatJar</id>
-			<properties>
-				<package.fatJar>package</package.fatJar>
-			</properties>
-		</profile>
-	</profiles>
-	<dependencies>
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-			<version>1.3</version>
-		</dependency>
-		<dependency>
-			<!-- NOTE: "The Commons HttpClient project is now end of life, and is no longer being developed."
-				 See http://hc.apache.org/httpclient-3.x/. New project: http://hc.apache.org/httpcomponents-client-ga/ -->
-			<groupId>commons-httpclient</groupId>
-			<artifactId>commons-httpclient</artifactId>
-			<version>3.1</version>
-			<exclusions>
-				<!-- provided by jcl-over-slf4j to enable logging via logback -->
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-			<version>1.1.1</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jcl-over-slf4j</artifactId>
-			<version>1.7.6</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.11</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<!-- Generates an additional *-jar-with-dependencies.jar -->
- 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.4</version>
-				<configuration>
-					<descriptorRefs>
-						<descriptorRef>jar-with-dependencies</descriptorRef>
-					</descriptorRefs>
-				</configuration>
-				<executions>
-					<execution>
-						<id>assemble-all</id>
-						<phase>${package.fatJar}</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/winery/org.eclipse.winery.highlevelrestapi/src/main/java/org/eclipse/winery/highlevelrestapi/HighLevelRestApi.java b/winery/org.eclipse.winery.highlevelrestapi/src/main/java/org/eclipse/winery/highlevelrestapi/HighLevelRestApi.java
deleted file mode 100644
index 376d0da..0000000
--- a/winery/org.eclipse.winery.highlevelrestapi/src/main/java/org/eclipse/winery/highlevelrestapi/HighLevelRestApi.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 University of Stuttgart.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and the Apache License 2.0 which both accompany this distribution,
- * and are available at http://www.eclipse.org/legal/epl-v10.html
- * and http://www.apache.org/licenses/LICENSE-2.0
- *
- * Contributors:
- *     Uwe Breitenbücher - initial API and implementation
- *     Kálmán Képes - improvements
- *******************************************************************************/
-package org.eclipse.winery.highlevelrestapi;
-
-import org.apache.commons.httpclient.HttpMethodBase;
-import org.apache.commons.httpclient.NameValuePair;
-import org.apache.commons.httpclient.methods.DeleteMethod;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.methods.PutMethod;
-
-/**
- * This class wraps HTTP-Method functionality and thereby abstracts from low
- * level code to simplify the usage.
- */
-public class HighLevelRestApi {
-	
-	/**
-	 * This method implements the HTTP Put Method
-	 * 
-	 * @param uri Resource URI
-	 * @param requestPayload Content which has to be put into the Resource
-	 * @return ResponseCode of HTTP Interaction
-	 */
-	@SuppressWarnings("deprecation")
-	public static HttpResponseMessage Put(String uri, String requestPayload, String acceptHeaderValue) {
-		
-		PutMethod method = new PutMethod(uri);
-		// requestPayload = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
-		// requestPayload;
-		
-		HighLevelRestApi.setAcceptHeader(method, acceptHeaderValue);
-		method.setRequestBody(requestPayload);
-		
-		HttpResponseMessage responseMessage = LowLevelRestApi.executeHttpMethod(method);
-		
-		// kill <?xml... in front of response
-		HighLevelRestApi.cleanResponseBody(responseMessage);
-		
-		return responseMessage;
-	}
-	
-	/**
-	 * This method implements the HTTP Post Method
-	 * 
-	 * @param uri Resource URI
-	 * @param requestPayload Content which has to be posted into the Resource
-	 * @return ResponseCode of HTTP Interaction
-	 */
-	@SuppressWarnings("deprecation")
-	public static HttpResponseMessage Post(String uri, String requestPayload, String acceptHeaderValue) {
-		
-		PostMethod method = null;
-		if (uri.contains("?")) {
-			System.out.println("Found query trying to split");
-			String[] split = uri.split("\\?");
-			System.out.println("Raw URI part: " + split[0]);
-			System.out.println("Raw Query part: " + split[1]);
-			method = new PostMethod(split[0]);
-			method.setQueryString(HighLevelRestApi.createNameValuePairArrayFromQuery(split[1]));
-		} else {
-			method = new PostMethod(uri);
-			;
-		}
-		method.setRequestBody(requestPayload);
-		HighLevelRestApi.setAcceptHeader(method, acceptHeaderValue);
-		HttpResponseMessage responseMessage = LowLevelRestApi.executeHttpMethod(method);
-		HighLevelRestApi.cleanResponseBody(responseMessage);
-		return responseMessage;
-	}
-	
-	/**
-	 * This method implements the HTTP Get Method
-	 * 
-	 * @param uri Resource URI
-	 * @return Content represented by the Resource URI
-	 */
-	public static HttpResponseMessage Get(String uri, String acceptHeaderValue) {
-		System.out.println("Setting URI to: \n");
-		System.out.println(uri);
-		GetMethod method = null;
-		if (uri.contains("?")) {
-			System.out.println("Found query trying to split");
-			String[] split = uri.split("\\?");
-			System.out.println("Raw URI part: " + split[0]);
-			System.out.println("Raw Query part: " + split[1]);
-			method = new GetMethod(split[0]);
-			method.setQueryString(HighLevelRestApi.createNameValuePairArrayFromQuery(split[1]));
-		} else {
-			method = new GetMethod(uri);
-		}
-		HighLevelRestApi.setAcceptHeader(method, acceptHeaderValue);
-		HttpResponseMessage responseMessage = LowLevelRestApi.executeHttpMethod(method);
-		HighLevelRestApi.cleanResponseBody(responseMessage);
-		return responseMessage;
-	}
-	
-	private static NameValuePair[] createNameValuePairArrayFromQuery(String query) {
-		// example:
-		// csarID=Moodle.csar&serviceTemplateID={http://www.example.com/tosca/ServiceTemplates/Moodle}Moodle&nodeTemplateID={http://www.example.com/tosca/ServiceTemplates/Moodle}VmApache
-		System.out.println("Splitting query: " + query);
-		String[] pairs = query.trim().split("&");
-		NameValuePair[] nameValuePairArray = new NameValuePair[pairs.length];
-		int count = 0;
-		for (String pair : pairs) {
-			System.out.println("Splitting query pair: " + pair);
-			String[] keyValue = pair.split("=");
-			NameValuePair nameValuePair = new NameValuePair();
-			System.out.println("Key: " + keyValue[0] + " Value: " + keyValue[1]);
-			nameValuePair.setName(keyValue[0]);
-			nameValuePair.setValue(keyValue[1]);
-			nameValuePairArray[count] = nameValuePair;
-			count++;
-		}
-		return nameValuePairArray;
-	}
-	
-	/**
-	 * This method implements the HTTP Delete Method
-	 * 
-	 * @param uri Resource URI
-	 * @return ResponseCode of HTTP Interaction
-	 */
-	public static HttpResponseMessage Delete(String uri, String acceptHeaderValue) {
-		
-		DeleteMethod method = new DeleteMethod(uri);
-		HighLevelRestApi.setAcceptHeader(method, acceptHeaderValue);
-		HttpResponseMessage responseMessage = LowLevelRestApi.executeHttpMethod(method);
-		HighLevelRestApi.cleanResponseBody(responseMessage);
-		return responseMessage;
-	}
-	
-	private static void setAcceptHeader(HttpMethodBase method, String value) {
-		if (!value.equals("")) {
-			method.setRequestHeader("Accept", value);
-		} else {
-			method.setRequestHeader("Accept", "application/xml");
-		}
-	}
-	
-	private static void cleanResponseBody(HttpResponseMessage responseMessage) {
-		System.out.println("ResponseBody: \n");
-		System.out.println(responseMessage.getResponseBody());
-		// @formatter:off
-		String temp = responseMessage
-				.getResponseBody()
-				.replace(
-						"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>",
-						"");
-		// @formatter:on
-		responseMessage.setResponseBody(temp);
-	}
-}
diff --git a/winery/org.eclipse.winery.highlevelrestapi/src/main/java/org/eclipse/winery/highlevelrestapi/HttpMethod.java b/winery/org.eclipse.winery.highlevelrestapi/src/main/java/org/eclipse/winery/highlevelrestapi/HttpMethod.java
deleted file mode 100644
index fedd3f0..0000000
--- a/winery/org.eclipse.winery.highlevelrestapi/src/main/java/org/eclipse/winery/highlevelrestapi/HttpMethod.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 University of Stuttgart.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and the Apache License 2.0 which both accompany this distribution,
- * and are available at http://www.eclipse.org/legal/epl-v10.html
- * and http://www.apache.org/licenses/LICENSE-2.0
- *
- * Contributors:
- *     Uwe Breitenbücher - initial API and implementation
- *******************************************************************************/
-package org.eclipse.winery.highlevelrestapi;
-
-/**
- * This enum is intended to simplify identifying different HTTP-methods
- */
-public enum HttpMethod {
-	PUT, POST, GET, DELETE
-}
\ No newline at end of file
diff --git a/winery/org.eclipse.winery.highlevelrestapi/src/main/java/org/eclipse/winery/highlevelrestapi/HttpResponseMessage.java b/winery/org.eclipse.winery.highlevelrestapi/src/main/java/org/eclipse/winery/highlevelrestapi/HttpResponseMessage.java
deleted file mode 100644
index 14888af..0000000
--- a/winery/org.eclipse.winery.highlevelrestapi/src/main/java/org/eclipse/winery/highlevelrestapi/HttpResponseMessage.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 University of Stuttgart.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and the Apache License 2.0 which both accompany this distribution,
- * and are available at http://www.eclipse.org/legal/epl-v10.html
- * and http://www.apache.org/licenses/LICENSE-2.0
- *
- * Contributors:
- *     Uwe Breitenbücher - initial API and implementation
- *******************************************************************************/
-package org.eclipse.winery.highlevelrestapi;
-
-/**
- */
-public class HttpResponseMessage {
-	
-	private int statusCode;
-	private String responseBody;
-	
-	
-	/**
-	 * @return the statusCode
-	 */
-	public int getStatusCode() {
-		return this.statusCode;
-	}
-	
-	/**
-	 * @param statusCode the statusCode to set
-	 */
-	protected void setStatusCode(int statusCode) {
-		this.statusCode = statusCode;
-	}
-	
-	/**
-	 * @return the responseBody
-	 */
-	public String getResponseBody() {
-		return this.responseBody;
-	}
-	
-	/**
-	 * @param responseBody the responseBody to set
-	 */
-	protected void setResponseBody(String responseBody) {
-		this.responseBody = responseBody;
-	}
-	
-}
diff --git a/winery/org.eclipse.winery.highlevelrestapi/src/main/java/org/eclipse/winery/highlevelrestapi/LowLevelRestApi.java b/winery/org.eclipse.winery.highlevelrestapi/src/main/java/org/eclipse/winery/highlevelrestapi/LowLevelRestApi.java
deleted file mode 100644
index a99bb8f..0000000
--- a/winery/org.eclipse.winery.highlevelrestapi/src/main/java/org/eclipse/winery/highlevelrestapi/LowLevelRestApi.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 University of Stuttgart.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and the Apache License 2.0 which both accompany this distribution,
- * and are available at http://www.eclipse.org/legal/epl-v10.html
- * and http://www.apache.org/licenses/LICENSE-2.0
- *
- * Contributors:
- *     Uwe Breitenbücher - initial API and implementation
- *     Kálmán Képes - improvements
- *******************************************************************************/
-package org.eclipse.winery.highlevelrestapi;
-
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpMethod;
-
-/**
- * This static-class eases HTTP-method execution by self-managed fault-handling
- * and automated Response-information processing
- */
-public class LowLevelRestApi {
-	
-	// Local HttpClient used for every communication (Singleton implementation)
-	private static HttpClient httpClient = new HttpClient();
-	
-	
-	/**
-	 * Executes a passed HttpMethod (Method type is either PUT, POST, GET or
-	 * DELETE) and returns a HttpResponseMessage
-	 * 
-	 * @param method Method to execute
-	 * @return HttpResponseMessage which contains all information about the
-	 *         execution
-	 */
-	public static HttpResponseMessage executeHttpMethod(HttpMethod method) {
-		
-		HttpResponseMessage responseMessage = null;
-		
-		try {
-			System.out.println("Method invocation on URI: \n");
-			System.out.println(method.getURI().toString());
-			// Execute Request
-			LowLevelRestApi.httpClient.executeMethod(method);
-			responseMessage = LowLevelRestApi.extractResponseInformation(method);
-			
-		} catch (Exception e) {
-			e.printStackTrace();
-		} finally {
-			
-			// Release Connection anyway
-			method.releaseConnection();
-		}
-		
-		// Extract response information and return
-		return responseMessage;
-	}
-	
-	/**
-	 * Extracts the response information from an executed HttpMethod
-	 * 
-	 * @param method Executed Method
-	 * @return Packaged response information
-	 */
-	private static HttpResponseMessage extractResponseInformation(HttpMethod method) {
-		// Create and return HttpResponseMethod
-		HttpResponseMessage responseMessage = new HttpResponseMessage();
-		responseMessage.setStatusCode(method.getStatusCode());
-		try {
-			responseMessage.setResponseBody(method.getResponseBodyAsString());
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return responseMessage;
-		
-	}
-	
-}