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>

5 files changed, 0 insertions, 334 deletions

diff --git a/winery/org.eclipse.winery.topologymodeler/src/main/webapp/jsp/shared/README.md b/winery/org.eclipse.winery.topologymodeler/src/main/webapp/jsp/shared/README.md
deleted file mode 100644
index 4cb255e..0000000
--- a/winery/org.eclipse.winery.topologymodeler/src/main/webapp/jsp/shared/README.md
+++ /dev/null
@@ -1 +0,0 @@
-This folder is shared between repository and topology modeler
\ No newline at end of file
diff --git a/winery/org.eclipse.winery.topologymodeler/src/main/webapp/jsp/shared/dialogs.jsp b/winery/org.eclipse.winery.topologymodeler/src/main/webapp/jsp/shared/dialogs.jsp
deleted file mode 100644
index 21a7fec..0000000
--- a/winery/org.eclipse.winery.topologymodeler/src/main/webapp/jsp/shared/dialogs.jsp
+++ /dev/null
@@ -1,83 +0,0 @@
-<%--
-/*******************************************************************************
- * Copyright (c) 2012-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
- *    Yves Schubert - switch to bootstrap 3
- *******************************************************************************/
---%>
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-
-<script>
-/**
- * Displays a nice message box with "yes" and "no"
- *
- * TODO: currently cannot be recursively called
- *
- * @param msg      Message to display
- * @param fnOnYes  function to be called if user presses "yes"
- * @param title    (optional) title of the dialog
- */
-function vConfirmYesNo(msg, fnOnYes, title) {
-	title = title || "Please confirm";
-	$("#diagyesnotitle").text(title);
-	$("#diagyesnomsg").text(msg);
-	$("#diagyesnoyesbtn").off("click");
-	$("#diagyesnoyesbtn").on("click", function() {
-		var diag = $("#diagyesno");
-		// quick hack to get fnOnYes() working -> use the hidden.bs.modal event
-		diag.on("hidden.bs.modal", function() {
-			fnOnYes();
-			diag.off("hidden.bs.modal");
-		});
-		diag.modal("hide");
-	});
-	$("#diagyesno").modal("show");
-}
-
-$(function() {
-	$("#diagyesno").on("shown.bs.modal", function() {
-		$("#diagyesnoyesbtn").focus();
-	});
-});
-</script>
-
-<div class="modal fade z1051" id="diagyesno">
-	<div class="modal-dialog">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-				<h4 class="modal-title" id="diagyesnotitle"></h4>
-			</div>
-			<div class="modal-body">
-				<p id="diagyesnomsg"></p>
-			</div>
-			<div class="modal-footer">
-				<button type="button" class="btn btn-default" data-dismiss="modal">No</button>
-				<button id="diagyesnoyesbtn" type="button" class="btn btn-primary">Yes</button>
-			</div>
-		</div>
-	</div>
-</div>
-
-<div class="modal fade z1060" id="diagmessage">
-	<div class="modal-dialog">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-				<h4 class="modal-title" id="diagmessagetitle"></h4>
-			</div>
-			<div class="modal-body" id="diagmessagemsg">
-			</div>
-			<div class="modal-footer">
-				<button type="button" class="btn btn-primary" data-dismiss="modal">OK</button>
-			</div>
-		</div>
-	</div>
-</div>
diff --git a/winery/org.eclipse.winery.topologymodeler/src/main/webapp/jsp/topologyCompletion/selectionHandler.jsp b/winery/org.eclipse.winery.topologymodeler/src/main/webapp/jsp/topologyCompletion/selectionHandler.jsp
deleted file mode 100644
index 81758a4..0000000
--- a/winery/org.eclipse.winery.topologymodeler/src/main/webapp/jsp/topologyCompletion/selectionHandler.jsp
+++ /dev/null
@@ -1,25 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2013 Pascal Hirmer.
- * 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:
- *    Pascal Hirmer - initial API and implementation
- *******************************************************************************/
-
-/**
- * This JSP file adds Node and RelationshipTemplates to a topology XML String using the JAXBHelper class.
- * After the java method has finished, the completed topology XML String is returned.
- */
-%>
-<%@page import="org.eclipse.winery.topologymodeler.addons.topologycompleter.helper.JAXBHelper"%>
-
-<%
-	String topologyXML = JAXBHelper.addTemplatesToTopology(request.getParameter("topology"), request.getParameter("allChoices"), request.getParameter("selectedNodeTemplates"), request.getParameter("selectedRelationshipTemplates"));
-%>
-
-<%=topologyXML%>
\ No newline at end of file
diff --git a/winery/org.eclipse.winery.topologymodeler/src/main/webapp/jsp/topologyCompletion/topologyCompletion.jsp b/winery/org.eclipse.winery.topologymodeler/src/main/webapp/jsp/topologyCompletion/topologyCompletion.jsp
deleted file mode 100644
index 6e7f006..0000000
--- a/winery/org.eclipse.winery.topologymodeler/src/main/webapp/jsp/topologyCompletion/topologyCompletion.jsp
+++ /dev/null
@@ -1,175 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2013 Pascal Hirmer.
- * 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:
- *    Pascal Hirmer - initial API and implementation
- *******************************************************************************/
-
-/**
- * This JSP calls the topology completion and handles the response.
- * It is called the event handler when "Complete Topology" is selected in the EnterCompletionInformationDiag.
- * There are several possible responses from the completion:
- *	 - the topology is complete: display a success message
- *   - the topology is complete, several solutions exist: display dialog to choose topology solution
- *	 - topology completion interrupted: the user has to chose inserted Node or Relationship Templates
- */
-%>
-
-<%@page import="java.io.StringWriter"%>
-<%@page import="java.util.List"%>
-<%@page import="java.util.Map"%>
-<%@page import="javax.xml.bind.Marshaller"%>
-<%@page import="javax.xml.bind.JAXBContext"%>
-<%@page import="javax.xml.bind.JAXBException"%>
-<%@page import="org.eclipse.winery.model.tosca.Definitions"%>
-<%@page import="org.eclipse.winery.model.tosca.TEntityTemplate"%>
-<%@page import="org.eclipse.winery.model.tosca.TNodeTemplate"%>
-<%@page import="org.eclipse.winery.model.tosca.TServiceTemplate"%>
-<%@page import="org.eclipse.winery.model.tosca.TTopologyTemplate"%>
-<%@page import="org.eclipse.winery.topologymodeler.addons.topologycompleter.topologycompletion.CompletionInterface"%>
-
-<%@taglib prefix="tc"   tagdir="/WEB-INF/tags/common/topologycompletion"%>
-
-<%
-	// parse Strings from the request to Boolean values
-	boolean stepByStep = Boolean.parseBoolean(request.getParameter("stepByStep"));
-	boolean restarted = Boolean.parseBoolean(request.getParameter("restarted"));
-	boolean overwriteTopology = Boolean.parseBoolean(request.getParameter("overwriteTopology"));
-
-	// call the topology completion component which will return a message if it was successful.
-	CompletionInterface completionInterface = new CompletionInterface();
-	String message = completionInterface.complete(request.getParameter("topology"), request.getParameter("stName"), request.getParameter("templateURL"), overwriteTopology, request.getParameter("topologyName"), request.getParameter("topologyNamespace"), request.getParameter("repositoryURL"), stepByStep, restarted);
-
-	if (message.equals("success")) { %>
-		<script> vShowSuccess('Completion Successful!'); </script>
-	<%
-	} else if (message.equals("topologyComplete") && !restarted) { %>
-		<script>
-			vShowSuccess('The topology is already complete.');
-		</script>
-	<%
-	} else if (message.equals("failure")) {
-		%>
-		<p> <%=completionInterface.getErrorMessage()%> </p>
-	<%} else if (message.equals("userInteraction")) {
-
-			// a user interaction is necessary to choose RelationshipTemplates, receive
-			// the current topology and the choices from the CompletionInterface
-			// and display them via relationshipTemplateSelector.jsp
-
-			TTopologyTemplate currentTopology = completionInterface.getCurrentTopology();
-			List<TEntityTemplate> relationshipTemplateSelection = completionInterface.getRelationshipTemplateChoices();
-
-			/////////////////////////////////////////////////////
-			// Convert JAXB objects of the topology and the
-			// Relationship Templates to be chosen to XML Strings
-			/////////////////////////////////////////////////////
-
-			Definitions definitions = new Definitions();
-			TServiceTemplate serviceTemplate = new TServiceTemplate();
-
-			serviceTemplate.setTopologyTemplate(currentTopology);
-			definitions.getServiceTemplateOrNodeTypeOrNodeTypeImplementation().add(serviceTemplate);
-			JAXBContext context = JAXBContext.newInstance(Definitions.class);
-			Marshaller marshaller = context.createMarshaller();
-			StringWriter currentTopologyString = new StringWriter();
-
-			marshaller.marshal(definitions, currentTopologyString);
-
-			TTopologyTemplate topologyTemplate = new TTopologyTemplate();
-
-			// add all choices to a TopologyTemplate
-			for (TEntityTemplate entityTemplate: relationshipTemplateSelection) {
-				topologyTemplate.getNodeTemplateOrRelationshipTemplate().add(entityTemplate);
-			}
-
-			// get the choices as XML
-			definitions = new Definitions();
-			serviceTemplate = new TServiceTemplate();
-			serviceTemplate.setTopologyTemplate(topologyTemplate);
-			definitions.getServiceTemplateOrNodeTypeOrNodeTypeImplementation().add(serviceTemplate);
-			context = JAXBContext.newInstance(Definitions.class);
-			StringWriter choicesAsXMLString = new StringWriter();
-
-			marshaller.marshal(definitions, choicesAsXMLString);
-		%>
-		<script>
-			var topology = "<%=currentTopologyString.toString()%>";
-			var choices = "<%=choicesAsXMLString.toString()%>";
-		</script>
-		<!-- call the relationshipTemplateSelector tag to render the selection to graphic objects -->
-		<tc:relationshipTemplateSelector choices='<%=relationshipTemplateSelection%>' templateURL='<%=request.getParameter("templateURL")%>' topologyName='<%=request.getParameter("topologyName")%>'
-			topologyNamespace='<%=request.getParameter("topologyNamespace")%>' repositoryURL='<%=request.getParameter("repositoryURL")%>' stName='<%=request.getParameter("stName")%>' />
-	<%} else if (message.equals("userTopologySelection")) {
-		// there are several topology solutions. Receive the choices from the CompletionInterface
-		// and display them via topologyTemplateSelector.tag
-		List<TTopologyTemplate> topologyTemplateSelection = completionInterface.getTopologyTemplateChoices();
-	%>
-	<!-- call the topologyTemplateSelector tag to render the selection to graphic objects -->
-	<tc:topologyTemplateSelector solutionTopologies='<%=topologyTemplateSelection%>' templateURL='<%=request.getParameter("templateURL")%>' topologyName='<%=request.getParameter("topologyName")%>'
-		topologyNamespace='<%=request.getParameter("topologyNamespace")%>' repositoryURL='<%=request.getParameter("repositoryURL")%>' />
-	<%
-	} else if (message.equals("stepByStep")) {
-
-		// the topology completion is processed step-by-step. The user has to choose inserted Node and RelationshipTemplates
-		TTopologyTemplate currentTopology = completionInterface.getCurrentTopology();
-		Map<TNodeTemplate, Map<TNodeTemplate, List<TEntityTemplate>>> nodeTemplateSelection = completionInterface.getNodeTemplateChoices();
-
-		///////////////////////////////////////////////
-		// Convert JAXB objects of the topology and the
-		// Templates to be chosen to XML Strings
-		///////////////////////////////////////////////
-
-		Definitions definitions = new Definitions();
-		TServiceTemplate serviceTemplate = new TServiceTemplate();
-		serviceTemplate.setTopologyTemplate(currentTopology);
-		definitions.getServiceTemplateOrNodeTypeOrNodeTypeImplementation().add(serviceTemplate);
-		JAXBContext context = JAXBContext.newInstance(Definitions.class);
-		Marshaller marshaller = context.createMarshaller();
-		StringWriter currentTopologyString = new StringWriter();
-
-		marshaller.marshal(definitions, currentTopologyString);
-
-		// add all choices to a TopologyTemplate
-		TTopologyTemplate topologyTemplate = new TTopologyTemplate();
-
-		for (TNodeTemplate nodeTemplate: nodeTemplateSelection.keySet()) {
-			Map<TNodeTemplate, List<TEntityTemplate>> entityTemplates = nodeTemplateSelection.get(nodeTemplate);
-
-			for (TNodeTemplate entity: entityTemplates.keySet()) {
-				topologyTemplate.getNodeTemplateOrRelationshipTemplate().add(entity);
-				topologyTemplate.getNodeTemplateOrRelationshipTemplate().addAll(entityTemplates.get(entity));
-			}
-			topologyTemplate.getNodeTemplateOrRelationshipTemplate().add(nodeTemplate);
-		}
-
-		// get the choices as XML
-		definitions = new Definitions();
-		serviceTemplate = new TServiceTemplate();
-		serviceTemplate.setTopologyTemplate(topologyTemplate);
-		definitions.getServiceTemplateOrNodeTypeOrNodeTypeImplementation().add(serviceTemplate);
-
-		StringWriter choicesAsXMLString = new StringWriter();
-
-		marshaller.marshal(definitions, choicesAsXMLString);
-
-		%>
-		<script>
-			var topology = '<%=currentTopologyString.toString()%>';
-			var choices = '<%=choicesAsXMLString.toString()%>';
-		</script>
-		<!-- call the tc:nodeTemplateSelector tag to render the selection to graphic objects -->
-		<tc:nodeTemplateSelector choices='<%=nodeTemplateSelection%>' templateURL='<%=request.getParameter("templateURL")%>' topologyName='<%=request.getParameter("topologyName")%>'
-			topologyNamespace='<%=request.getParameter("topologyNamespace")%>' repositoryURL='<%=request.getParameter("repositoryURL")%>' stName='<%=request.getParameter("stName")%>' />
-	<%}
-%>
-
-<script>
-	var message = "<%=message%>";
-</script>
diff --git a/winery/org.eclipse.winery.topologymodeler/src/main/webapp/jsp/topologyCompletion/topologySaver.jsp b/winery/org.eclipse.winery.topologymodeler/src/main/webapp/jsp/topologyCompletion/topologySaver.jsp
deleted file mode 100644
index 671baee..0000000
--- a/winery/org.eclipse.winery.topologymodeler/src/main/webapp/jsp/topologyCompletion/topologySaver.jsp
+++ /dev/null
@@ -1,50 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2013 Pascal Hirmer.
- * 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:
- *    Pascal Hirmer - initial API and implementation
- *******************************************************************************/
-
-/**
- * This JSP saves a topology template to the repository using the RESTHelper class.
- * It is called when there are several topology solutions which shall be saved in different locations.
- */
-%>
-<%@page import="org.eclipse.winery.topologymodeler.addons.topologycompleter.helper.RESTHelper"%>
-<%@page import="java.io.StringReader"%>
-<%@page import="javax.xml.bind.JAXBContext"%>
-<%@page import="javax.xml.bind.JAXBException"%>
-<%@page import="javax.xml.bind.Unmarshaller"%>
-<%@page import="org.eclipse.winery.model.tosca.Definitions"%>
-<%@page import="org.eclipse.winery.model.tosca.TServiceTemplate"%>
-<%@page import="org.eclipse.winery.model.tosca.TTopologyTemplate"%>
-
-<%
-	String xmlString = request.getParameter("topology");
-	String templateURL = request.getParameter("templateURL");
-	String repositoryURL = request.getParameter("repositoryURL");
-
-	// initiate JaxB context
-	JAXBContext context;
-	context = JAXBContext.newInstance(Definitions.class);
-	StringReader reader = new StringReader(xmlString);
-
-	// unmarshall the topology XML string
-	Unmarshaller um = context.createUnmarshaller();
-	Definitions jaxBDefinitions = (Definitions) um.unmarshal(reader);
-	TServiceTemplate st = (TServiceTemplate) jaxBDefinitions.getServiceTemplateOrNodeTypeOrNodeTypeImplementation().get(0);
-	TTopologyTemplate toBeSaved = st.getTopologyTemplate();
-
-	// depending on the selected save method (overwrite or create new) the save method is called
-	if (request.getParameter("overwriteTopology").equals("true")) {
-		RESTHelper.saveCompleteTopology(toBeSaved, templateURL, true, "", "", repositoryURL);
-	} else {
-		RESTHelper.saveCompleteTopology(toBeSaved, templateURL, false, request.getParameter("topologyName"), request.getParameter("topologyNamespace"), repositoryURL);
-	}
-%>
\ No newline at end of file