Bug 530471 - Need more flexibility for user editing in resource HTML and
creator JSP
remove all detailed protected code areas in each jsp file.
Added a single protected area covering the whole content.
Change-Id: Ie3cd411bd9e781422a5eba8eecb78c636232968c
Signed-off-by: Jad El-khoury <jad@kth.se>
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateFilteredResourceCollectionJsp.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateFilteredResourceCollectionJsp.mtl
index ee178b5..b3e3275 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateFilteredResourceCollectionJsp.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateFilteredResourceCollectionJsp.mtl
@@ -48,7 +48,11 @@
This file is generated by org.eclipse.lyo.oslc4j.codegenerator
--%>
-
+<%--[protected ('"body"')]
+TODO: Replace/adjust this default content as necessary.
+All manual changes in this "protected" user code area will NOT be overwritten upon subsequent code generations.
+To revert to the default generated content, delete all content in this file, and then re-generate.
+--%>
<%@ page import="java.net.*" %>
<%@ page import="java.util.*" %>
<%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
@@ -56,12 +60,6 @@
[for (aResource: Resource | aSelectionDialog.resourceTypes)]
<%@page import="[javaClassFullName(aResource, anAdaptorInterface, null) /]"%>
[/for]
-<%--
-[protected ('imports')]
---%>
-<%--
-[/protected]
---%>
<%@ page contentType="application/json" language="java" pageEncoding="UTF-8" %>
@@ -71,12 +69,6 @@
List<[dialogMethodResourceType(aSelectionDialog)/]> resources = (List<[dialogMethodResourceType(aSelectionDialog)/]>) request.getAttribute("resources");
String terms = (String) request.getAttribute("terms");
%>
-<%--
-[protected ('getRequestAttributes')]
---%>
-<%--
-[/protected]
---%>
"oslc:results": ['['/]
<% int i = 0; for ([dialogMethodResourceType(aSelectionDialog)/] r : resources) { %>
<% if (i > 0) { %>,<% } %>
@@ -87,6 +79,7 @@
<% i++; } %>
[']'/]
}
+<%--[/protected]--%>
[/let]
[/file]
[/template]
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateGetResourceJsp.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateGetResourceJsp.mtl
index ba08fa8..e8a69da 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateGetResourceJsp.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateGetResourceJsp.mtl
@@ -32,6 +32,11 @@
[template public generateGetResourceJsp(aResource : Resource, contextAdaptorInterface : AdaptorInterface, managingAdaptorInterface: AdaptorInterface)]
[file (getResourceJspFullFileName(aResource, contextAdaptorInterface), false, 'UTF-8')]
+<%--[protected ('"body"')]
+TODO: Replace/adjust this default content as necessary.
+All manual changes in this "protected" user code area will NOT be overwritten upon subsequent code generations.
+To revert to the default generated content, delete all content in this file, and then re-generate.
+--%>
<!DOCTYPE html>
<%--
Copyright (c) 2011, 2012, 2017 IBM Corporation and others.
@@ -61,24 +66,12 @@
<%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
<%@page import="java.util.List" %>
<%@page import="[javaClassFullName(aResource, contextAdaptorInterface, null) /]"%>
-<%--
-[protected ('imports')]
---%>
-<%--
-[/protected]
---%>
<%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
<%
[javaClassName(aResource)/] a[javaName(aResource, true)/] = ([javaClassName(aResource)/]) request.getAttribute("a[javaName(aResource, true)/]");
%>
-<%--
-[protected ('getRequestAttributes')]
---%>
-<%--
-[/protected]
---%>
<html lang="en">
<head>
<meta charset="utf-8">
@@ -95,12 +88,6 @@
<script src="<c:url value="/static/js/bootstrap-4.0.0-beta.min.js"/>"></script>
<script src="<c:url value="/static/js/preview.js"/>"></script>
- <%--
- [protected ('(RECOMMENDED) headStuff')]
- --%>
- <%--
- [/protected]
- --%>
</head>
@@ -120,13 +107,6 @@
<a href="<%= a[javaName(aResource, true)/].getAbout() %>"><%= a[javaName(aResource, true)/].getAbout() %></a>
</p>
</div>
- <%--
- [protected ('(RECOMMENDED) bodyStuff1')]
- --%>
- <%--
- [/protected]
- --%>
-
<h2>Properties</h2>
<div>
@@ -151,5 +131,6 @@
</footer>
</body>
</html>
+<%--[/protected]--%>
[/file]
[/template]
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateGetResourceSmallPreviewJsp.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateGetResourceSmallPreviewJsp.mtl
index a3bdcd6..7957b67 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateGetResourceSmallPreviewJsp.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateGetResourceSmallPreviewJsp.mtl
@@ -51,40 +51,25 @@
This file is generated by org.eclipse.lyo.oslc4j.codegenerator
--%>
+<%--[protected ('"body"')]
+TODO: Replace/adjust this default content as necessary.
+All manual changes in this "protected" user code area will NOT be overwritten upon subsequent code generations.
+To revert to the default generated content, delete all content in this file, and then re-generate.
+--%>
+
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
<%@page import="java.util.List" %>
<%@page import="[javaClassFullName(aResource, contextAdaptorInterface, null) /]"%>
-<%--
-[protected ('imports')]
---%>
-<%--
-[/protected]
---%>
<%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
<%
[javaClassName(aResource)/] a[javaName(aResource, true)/] = ([javaClassName(aResource)/]) request.getAttribute("a[javaName(aResource, true)/]");
%>
-<%--
-[protected ('getRequestAttributes')]
---%>
-<%--
-[/protected]
---%>
-
-<%--
-[protected ('"indexBody"')]
---%>
-<%--
-TODO: Replace/adjust this default content as necessary.
-All manual changes in this "protected" user code area will NOT be overwritten upon subsequent code generations.
-To revert to the default generated content, delete all content in this file, and then re-generate.
---%>
<html lang="en">
<head>
<meta charset="utf-8">
@@ -118,8 +103,6 @@
</div>
</body>
</html>
-<%--
-[/protected]
---%>
+<%--[/protected]--%>
[/file]
[/template]
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceCollectionJsp.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceCollectionJsp.mtl
index 344d8e7..2bb3eea 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceCollectionJsp.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceCollectionJsp.mtl
@@ -55,6 +55,11 @@
This file is generated by org.eclipse.lyo.oslc4j.codegenerator
--%>
+<%--[protected ('"body"')]
+TODO: Replace/adjust this default content as necessary.
+All manual changes in this "protected" user code area will NOT be overwritten upon subsequent code generations.
+To revert to the default generated content, delete all content in this file, and then re-generate.
+--%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
@@ -65,24 +70,12 @@
[for (aResource: Resource | aQueryCapability.resourceTypes)]
<%@page import="[javaClassFullName(aResource, anAdaptorInterface, null) /]"%>
[/for]
-<%--
-[protected ('imports')]
---%>
-<%--
-[/protected]
---%>
<%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
<%
List<[queryMethodResourceType(aQueryCapability)/]> resources = (List<[queryMethodResourceType(aQueryCapability)/]>) request.getAttribute("resources");
String queryUri = (String)request.getAttribute("queryUri");
String nextPageUri = (String)request.getAttribute("nextPageUri");
%>
-<%--
-[protected ('getRequestAttributes')]
---%>
-<%--
-[/protected]
---%>
<html lang="en">
<head>
<meta charset="utf-8">
@@ -98,12 +91,6 @@
<script src="<c:url value="/static/js/bootstrap-4.0.0-beta.min.js"/>"></script>
<script src="<c:url value="/static/js/preview.js"/>"></script>
- <%--
- [protected ('(RECOMMENDED) headStuff')]
- --%>
- <%--
- [/protected]
- --%>
</head>
<body>
<!-- Fixed navbar -->
@@ -121,29 +108,9 @@
<%= resources.size()%>
</div>
</div>
- <%--
- [protected ('(RECOMMENDED) bodyStuff1')]
- --%>
- <%--
- [/protected]
- --%>
<% for ([queryMethodResourceType(aQueryCapability)/] aResource : resources) { %>
[if (queryMethodResourceType(aQueryCapability) = 'AbstractResource')]
- <%--
- [protected ('(RECOMMENDED) query_item')]
- --%>
- <p><a href="<%= aResource.getAbout() %>"><%=aResource.getAbout().toString()%></a><br /></p>
- <%--
- [/protected]
- --%>
[else]
- <%--
- [protected ('(RECOMMENDED) queryItem')]
- --%>
- <p><%= aResource.toHtml() %><br /></p>
- <%--
- [/protected]
- --%>
[/if]
<% } %>
<% if (nextPageUri != null) { %><a href="<%= nextPageUri %>">Next Page</a><% } %>
@@ -155,6 +122,7 @@
</footer>
</body>
</html>
+<%--[/protected]--%>
[/let]
[/file]
[/template]
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceCreatorClientJsp.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceCreatorClientJsp.mtl
index 3373579..ccbaada 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceCreatorClientJsp.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceCreatorClientJsp.mtl
@@ -46,24 +46,18 @@
This file is generated by org.eclipse.lyo.oslc4j.codegenerator
--%>
+<%--[protected ('"body"')]
+TODO: Replace/adjust this default content as necessary.
+All manual changes in this "protected" user code area will NOT be overwritten upon subsequent code generations.
+To revert to the default generated content, delete all content in this file, and then re-generate.
+--%>
+
<%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider" %>
-<%--
-[protected ('imports')]
---%>
-<%--
-[/protected]
---%>
<%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
<%
String creationDialogUri = request.getParameter("creationUri");
creationDialogUri += "#oslc-core-postMessage-1.0";
%>
-<%--
-[protected ('getRequestAttributes')]
---%>
-<%--
-[/protected]
---%>
<html>
<head>
<title>Creation Dialog client</title>
@@ -151,5 +145,6 @@
</body>
</html>
+<%--[/protected]--%>
[/file]
[/template]
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceCreatorJsp.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceCreatorJsp.mtl
index 9964440..5fb0d8f 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceCreatorJsp.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceCreatorJsp.mtl
@@ -51,6 +51,11 @@
This file is generated by org.eclipse.lyo.oslc4j.codegenerator
--%>
+<%--[protected ('"body"')]
+TODO: Replace/adjust this default content as necessary.
+All manual changes in this "protected" user code area will NOT be overwritten upon subsequent code generations.
+To revert to the default generated content, delete all content in this file, and then re-generate.
+--%>
<%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
<%@page import="java.util.List" %>
@@ -59,13 +64,6 @@
[/for]
<%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
<%@page import="javax.ws.rs.core.UriBuilder"%>
-<%--
-[protected ('imports')]
---%>
-<%--
-[/protected]
---%>
-
<%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
@@ -75,43 +73,19 @@
String [aPathParameter/] = (String) request.getAttribute("[aPathParameter/]");
[/for]
%>
-<%--
-[protected ('getRequestAttributes')]
---%>
-<%--
-[/protected]
---%>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
<title>[aCreationDialog.title/]</title>
- <%--
- [protected ('(RECOMMENDED) headStuff')]
- --%>
- <%--
- [/protected]
- --%>
<script type="text/javascript" src="<%=UriBuilder.fromUri(OSLC4JUtils.getPublicURI()).path("[delegatedUIJavaScriptsRelativeFileName(anAdaptorInterface)/]").build().toString()%>"></script>
</head>
<body style="padding: 10px;">
<div id="bugzilla-body">
<form id="Create" method="POST" class="enter_bug_form">
- <%--
- [protected ('(RECOMMENDED) formStuff')]
- --%>
- <%--
- [/protected]
- --%>
<table style="clear: both;">
[if not (aCreationDialog.resourceTypes->size() = 1)]
// TODO Implement code to create the creation form. This method seems to be expected to handle more than a single type of resources.
- <%--
- [protected ('creationForm')]
- --%>
- <%--
- [/protected]
- --%>
[else]
[let aResource : Resource = aCreationDialog.resourceTypes->first()]
[comment TODO: This whole way of producing the form should be rethought. Which approach gives the programmer
@@ -146,6 +120,7 @@
</div>
</body>
</html>
+<%--[/protected]--%>
[/let]
[/file]
[/template]
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceSelectorClientJsp.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceSelectorClientJsp.mtl
index 7b58150..2781d2a 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceSelectorClientJsp.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceSelectorClientJsp.mtl
@@ -46,24 +46,18 @@
This file is generated by org.eclipse.lyo.oslc4j.codegenerator
--%>
+<%--[protected ('"body"')]
+TODO: Replace/adjust this default content as necessary.
+All manual changes in this "protected" user code area will NOT be overwritten upon subsequent code generations.
+To revert to the default generated content, delete all content in this file, and then re-generate.
+--%>
+
<%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider" %>
-<%--
-[protected ('imports')]
---%>
-<%--
-[/protected]
---%>
<%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
<%
String selectionDialogUri = request.getParameter("selectionUri");
selectionDialogUri += "#oslc-core-postMessage-1.0";
%>
-<%--
-[protected ('getRequestAttributes')]
---%>
-<%--
-[/protected]
---%>
<html>
<head>
<title>Selection Dialog client</title>
@@ -156,5 +150,6 @@
</body>
</html>
+<%--[/protected]--%>
[/file]
[/template]
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceSelectorJsp.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceSelectorJsp.mtl
index 12ecf98..2a38064 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceSelectorJsp.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceSelectorJsp.mtl
@@ -50,6 +50,11 @@
This file is generated by org.eclipse.lyo.oslc4j.codegenerator
--%>
+<%--[protected ('"body"')]
+TODO: Replace/adjust this default content as necessary.
+All manual changes in this "protected" user code area will NOT be overwritten upon subsequent code generations.
+To revert to the default generated content, delete all content in this file, and then re-generate.
+--%>
<%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
[for (aResource: Resource | aSelectionDialog.resourceTypes)]
@@ -57,13 +62,6 @@
[/for]
<%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
<%@page import="javax.ws.rs.core.UriBuilder"%>
-<%--
-[protected ('imports')]
---%>
-<%--
-[/protected]
---%>
-
<%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
@@ -71,23 +69,11 @@
String selectionUri = (String) request.getAttribute("selectionUri");
%>
-<%--
-[protected ('getRequestAttributes')]
---%>
-<%--
-[/protected]
---%>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
<title>[aSelectionDialog.title/]</title>
- <%--
- [protected ('(RECOMMENDED) headStuff')]
- --%>
- <%--
- [/protected]
- --%>
<script type="text/javascript" src="<%=UriBuilder.fromUri(OSLC4JUtils.getPublicURI()).path("[delegatedUIJavaScriptsRelativeFileName(anAdaptorInterface)/]").build().toString()%>"></script>
</head>
[comment TODO: make a more powerfull/flexible search form, by allowing user to entry values on each resource property, and not just "summary" as is expected here./]
@@ -117,6 +103,7 @@
</body>
</html>
+<%--[/protected]--%>
[/let]
[/file]
[/template]
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceShapeJsp.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceShapeJsp.mtl
index 38d34d9..7c60b99 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceShapeJsp.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceShapeJsp.mtl
@@ -44,6 +44,11 @@
This file is generated by org.eclipse.lyo.oslc4j.codegenerator
--%>
+<%--[protected ('"body"')]
+TODO: Replace/adjust this default content as necessary.
+All manual changes in this "protected" user code area will NOT be overwritten upon subsequent code generations.
+To revert to the default generated content, delete all content in this file, and then re-generate.
+--%>
<%@page import="java.util.List" %>
<%@page import="java.net.URI" %>
@@ -51,24 +56,11 @@
<%@page import="org.eclipse.lyo.oslc4j.core.model.Property"%>
<%@page import="org.eclipse.lyo.oslc4j.core.model.OslcConstants"%>
-<%--
-[protected ('imports')]
---%>
-<%--
-[/protected]
---%>
-
<%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
<%
ResourceShape aResourceShape = (ResourceShape) request.getAttribute("aResourceShape");
%>
-<%--
-Start of user code getRequestAttributes
---%>
-<%--
-End of user code
---%>
<html>
<head>
@@ -84,13 +76,6 @@
<script src="<c:url value="/static/js/bootstrap-4.0.0-beta.min.js"/>"></script>
<script src="<c:url value="/static/js/preview.js"/>"></script>
- <%--
- Start of user code (RECOMMENDED) headStuff
- --%>
- <%--
- End of user code
- --%>
-
</head>
<body>
@@ -202,5 +187,6 @@
</footer>
</body>
</html>
+<%--[/protected]--%>
[/file]
[/template]
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateServiceProviderCatalogHTML.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateServiceProviderCatalogHTML.mtl
index e552c4e..44b535d 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateServiceProviderCatalogHTML.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateServiceProviderCatalogHTML.mtl
@@ -50,30 +50,22 @@
This file is generated by org.eclipse.lyo.oslc4j.codegenerator
--%>
+<%--[protected ('"body"')]
+TODO: Replace/adjust this default content as necessary.
+All manual changes in this "protected" user code area will NOT be overwritten upon subsequent code generations.
+To revert to the default generated content, delete all content in this file, and then re-generate.
+--%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ page import="org.eclipse.lyo.oslc4j.core.model.ServiceProviderCatalog" %>
<%@ page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider" %>
-<%--
-[protected ('imports')]
---%>
-<%--
-[/protected]
---%>
<%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
<%
ServiceProviderCatalog catalog = (ServiceProviderCatalog)request.getAttribute("catalog");
%>
-<%--
-[protected ('getRequestAttributes')]
---%>
-<%--
-[/protected]
---%>
-
<html lang="en">
<head>
@@ -90,12 +82,6 @@
<script src="<c:url value="/static/js/popper-1.11.0.min.js"/>"></script>
<script src="<c:url value="/static/js/bootstrap-4.0.0-beta.min.js"/>"></script>
- <%--
-[protected ('(RECOMMENDED) headStuff')]
- --%>
- <%--
-[/protected]
- --%>
</head>
<body>
<nav class="navbar sticky-top navbar-light bg-light">
@@ -108,12 +94,6 @@
<div class="page-header">
<h1>[containingAdaptorInterface(aServiceProviderCatalog).name /] Service Provider Catalogue</h1>
</div>
- <%--
- [protected ('(RECOMMENDED) bodyStuff')]
- --%>
- <%--
- [/protected]
- --%>
<h2>Service Providers</h2>
<% for (ServiceProvider s : catalog.getServiceProviders()) { %>
@@ -139,6 +119,6 @@
</footer>
</body>
</html>
-
+<%--[/protected]--%>
[/file]
[/template]
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateServiceProviderHTML.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateServiceProviderHTML.mtl
index 262ae9f..5e1a9b9 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateServiceProviderHTML.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateServiceProviderHTML.mtl
@@ -50,6 +50,11 @@
This file is generated by org.eclipse.lyo.oslc4j.codegenerator
--%>
+<%--[protected ('"body"')]
+TODO: Replace/adjust this default content as necessary.
+All manual changes in this "protected" user code area will NOT be overwritten upon subsequent code generations.
+To revert to the default generated content, delete all content in this file, and then re-generate.
+--%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
@@ -61,12 +66,6 @@
<%@ page import="org.eclipse.lyo.oslc4j.core.model.CreationFactory" %>
<%@ page import="org.eclipse.lyo.oslc4j.core.model.ResourceShape" %>
<%@ page import="org.eclipse.lyo.oslc4j.core.model.QueryCapability" %>
-<%--
-[protected ('imports')]
---%>
-<%--
-[/protected]
---%>
<%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
@@ -74,12 +73,6 @@
ServiceProvider serviceProvider = (ServiceProvider)request.getAttribute("serviceProvider");
Service['[]'/] services = (Service['[]'/])request.getAttribute("services");
%>
-<%--
-[protected ('getRequestAttributes')]
---%>
-<%--
-[/protected]
---%>
<html lang="en">
<head>
<meta charset="utf-8">
@@ -92,12 +85,6 @@
<script src="<c:url value="/static/js/jquery-3.2.1.min.js"/>"></script>
<script src="<c:url value="/static/js/popper-1.11.0.min.js"/>"></script>
<script src="<c:url value="/static/js/bootstrap-4.0.0-beta.min.js"/>"></script>
- <%--
- [protected ('(RECOMMENDED) headStuff')]
- --%>
- <%--
- [/protected]
- --%>
</head>
<body>
@@ -109,12 +96,6 @@
<div class="container">
<div class="page-header">
- <%--
- [protected ('(RECOMMENDED) bodyStuff1')]
- --%>
- <%--
- [/protected]
- --%>
<h1><%= serviceProvider.getTitle() %></h1>
<p><%= serviceProvider.getDescription() %></p>
@@ -130,12 +111,6 @@
</div>
[/if]
</div>
- <%--
- [protected ('(RECOMMENDED) bodyStuff2')]
- --%>
- <%--
- [/protected]
- --%>
<%for (int serviceIndex = 0; serviceIndex < services.length; serviceIndex++) {%>
<h2>Service #<%=serviceIndex%></h2>
<% Dialog['[]'/] selectionDialogs = services['[serviceIndex]'/].getSelectionDialogs();%>
@@ -219,5 +194,6 @@
</footer>
</body>
</html>
+<%--[/protected]--%>
[/file]
[/template]
