2.2.2 Switch to enunciate 2.x

Change-Id: I29dc7cc72e8dc9a7d35fb17685c2971d42fd319d Signed-off-by: Matthias Steiner <matthias.steiner@inscope.net>
SAP-archive · Jun 17, 2016 · 8a30413 · 8a30413
1 parent cd533db
commit 8a30413
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 13 deletions.
diff --git a/enterprise-granny-client/pom.xml b/enterprise-granny-client/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.sap.hana.cloud.samples</groupId>
     <artifactId>enterprise-granny</artifactId>
-    <version>2.2.1-BUILD-SNAPSHOT</version>
+    <version>2.2.2</version>
   </parent>
 
   <artifactId>enterprise-granny-client</artifactId>

diff --git a/enterprise-granny-core/pom.xml b/enterprise-granny-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.sap.hana.cloud.samples</groupId>
     <artifactId>enterprise-granny</artifactId>
-    <version>2.2.1-BUILD-SNAPSHOT</version>
+    <version>2.2.2</version>
   </parent>
 
   <artifactId>enterprise-granny-core</artifactId>

diff --git a/enterprise-granny-service/pom.xml b/enterprise-granny-service/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.hana.cloud.samples</groupId>
 		<artifactId>enterprise-granny</artifactId>
-		<version>2.2.1-BUILD-SNAPSHOT</version>
+		<version>2.2.2</version>
 	</parent>
 
 	<artifactId>enterprise-granny-service</artifactId>

diff --git a/...y-service/src/main/java/com/sap/hana/cloud/samples/granny/api/impl/ContactFacadeImpl.java b/...y-service/src/main/java/com/sap/hana/cloud/samples/granny/api/impl/ContactFacadeImpl.java
@@ -30,6 +30,7 @@
 @Produces({ "application/json" })
 @com.webcohesion.enunciate.metadata.Facet(value="Addressbook API", documentation="Provides REST endpoints to manage address data.")
 @com.webcohesion.enunciate.metadata.rs.ResourceLabel(value="Contact Service")
+@com.webcohesion.enunciate.metadata.rs.ServiceContextRoot(value="/api/v1")
 public class ContactFacadeImpl extends BaseFacade 
 {
 	@Autowired

diff --git a/enterprise-granny-service/src/main/resources/META-INF/enunciate/docs.fmt b/enterprise-granny-service/src/main/resources/META-INF/enunciate/docs.fmt
@@ -46,6 +46,12 @@
   <!-- Mobile viewport optimized: j.mp/bplateviewport -->
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
+  <link rel="apple-touch-icon-precomposed" sizes="144x144" href="/resources/img/ensw_granny_logo_144.png">
+  <link rel="apple-touch-icon-precomposed" sizes="114x114" href="/resources/img/ensw_granny_logo_114.png">
+  <link rel="apple-touch-icon-precomposed" sizes="72x72" href="/resources/img/ensw_granny_logo_72.png">
+  <link rel="apple-touch-icon-precomposed" href="/resources/img/ensw_granny_logo_57.png">
+
+
   <!-- Bootstrap core CSS -->
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css">
 
@@ -62,6 +68,9 @@
 
   <link rel="shortcut icon" href="${favicon}" type="image/x-icon" />
   [/#if]
+
+  <!-- fonts -->
+  <link href='http://fonts.googleapis.com/css?family=Pacifico' rel='stylesheet' type='text/css'>
 
   <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
   <!--[if lt IE 9]>
@@ -127,7 +136,7 @@
 
         <footer class="footer">
           <div class="container">
-            <p class="text-muted">[#if copyright??]Copyright &copy; <script type="text/javascript" language="javascript">d = new Date;document.write(d.getFullYear());</script> <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">${copyright}</span>. [/#if]Generated by <a href="http://enunciate.webcohesion.com">Enunciate</a>.</p>
+            <p class="text-muted">[#if copyright??]Copyright &copy; <script type="text/javascript" language="javascript">d = new Date;document.write(d.getFullYear());</script> <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">${copyright}</span>. [/#if]</p>
           </div>
         </footer>
 

diff --git a/enterprise-granny-service/src/main/resources/META-INF/enunciate/enunciate.xml b/enterprise-granny-service/src/main/resources/META-INF/enunciate/enunciate.xml
@@ -1,13 +1,15 @@
 <enunciate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="http://enunciate.webcohesion.com/schemas/enunciate-2.0.0.xsd">
+	xsi:noNamespaceSchemaLocation="http://enunciate.webcohesion.com/schemas/enunciate-2.5.0.xsd">
 
 
-	<title>Granny's Addressbook</title>
-	<copyright>SAP SE</copyright>
+	<title>Granny's Addressbook - Contact Management Service</title>
 	<description>Provides REST endpoints to manage address data.</description>
+	<copyright>SAP SE</copyright>
+
 	<terms>Apache License, Version 2.0 </terms>
-	<application>/api/v1</application>
 
+	<application root="/api/v1" />
+
 	<api-classes>
 		<include pattern="com.sap.hana.cloud.samples.granny.model.*" />
 
@@ -17,13 +19,16 @@
 		<exclude pattern="org.eclipse.persistence.jpa.rs.**" />
 	</api-classes>
 
-
 	<modules>
 		<jaxrs datatype-detection="aggressive" />
 		<jackson />
-		<docs docsDir="../../../webapp/docs" docsSubdir="/" disableRestMountpoint="true"/>
-
-		<swagger disabled="true" />
+		<docs docsDir="../../../webapp/docs" docsSubdir="../docs" 
+		      faviconUri="/resources/img/favicon.ico" 
+		      freemarkerTemplate="docs.fmt"
+		      includeApplicationPath="true"
+		      disableResourceLinks="false" />
+
+		<swagger disabled="true"/>
 
 		<gwt-json-overlay disabled="true" />
 		<idl disabled="true" />

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 	<artifactId>enterprise-granny</artifactId>
 	<name>enterprise-granny</name>
 	<packaging>pom</packaging>
-	<version>2.2.1-BUILD-SNAPSHOT</version>
+	<version>2.2.2</version>
 	<description>A sample address book application demonstrating the interplay of popular open-source libraries. [WIP]</description>
 
 	<properties>