From 0e34458e65c891a78f9688b50414ab9cee4d0caa Mon Sep 17 00:00:00 2001
From: Miguel Reboiro-Jato <mrjato@uvigo.es>
Date: Tue, 15 Nov 2016 14:15:55 +0100
Subject: [PATCH] Adds Bootstrap as a Maven dependency

The Bootstrap libraries (CSS and JavaScript libraries) were inserted in
the web pages (JSF module) through a CDN. Now, these libraries are added
as Maven dependencies, using the Webjars project packages.

In addition, the link and script tags used in the JSF template have been
replaced by the h:outputStylesheet and h:outputScript tags from JSF, as
this tags make consistent the use of relative paths though the different
pages of the application.

Finally, a minor error has been solved in the pets.xhtml file, as the
placeholder text for the birth field was assigned to the animal type
field.
---
 jsf/pom.xml                                | 4 ++++
 jsf/src/main/webapp/WEB-INF/template.xhtml | 6 +++---
 jsf/src/main/webapp/owner/pets.xhtml       | 4 ++--
 pom.xml                                    | 6 ++++++
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/jsf/pom.xml b/jsf/pom.xml
index ffb4d63..23108fd 100644
--- a/jsf/pom.xml
+++ b/jsf/pom.xml
@@ -24,6 +24,10 @@
 			<artifactId>service</artifactId>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+		    <groupId>org.webjars</groupId>
+		    <artifactId>bootstrap</artifactId>
+		</dependency>
 
 		<!-- Testing -->
 		<dependency>
diff --git a/jsf/src/main/webapp/WEB-INF/template.xhtml b/jsf/src/main/webapp/WEB-INF/template.xhtml
index 8e53092..50854f7 100644
--- a/jsf/src/main/webapp/WEB-INF/template.xhtml
+++ b/jsf/src/main/webapp/WEB-INF/template.xhtml
@@ -5,7 +5,7 @@
 <h:head>
 	<title>Pet Store</title>
 
-	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" />
+	<h:outputStylesheet name="webjars/bootstrap/3.3.7-1/css/bootstrap.min.css" />
 </h:head>
 <h:body>
 	<div class="container">
@@ -41,7 +41,7 @@
 		</div>
 	</div>
 
-	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
-	<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
+	<h:outputScript name="webjars/jquery/1.11.1/jquery.min.js" />
+	<h:outputScript name="webjars/bootstrap/3.3.7-1/js/bootstrap.min.js" />
 </h:body>
 </html>
\ No newline at end of file
diff --git a/jsf/src/main/webapp/owner/pets.xhtml b/jsf/src/main/webapp/owner/pets.xhtml
index b81f128..78a06a3 100644
--- a/jsf/src/main/webapp/owner/pets.xhtml
+++ b/jsf/src/main/webapp/owner/pets.xhtml
@@ -15,10 +15,10 @@
 				<h:panelGroup class="row">
 					<h:form>
 						<h:inputText class="form-control" a:placeholder="Pet name" value="#{pet.name}"></h:inputText>
-						<h:inputText value="#{pet.birth}" size="20" required="true" label="Receipt Date" class="form-control">
+						<h:inputText value="#{pet.birth}" size="20" required="true" label="Receipt Date" class="form-control" a:placeholder="Birth (YYYY-MM-DD hh:mm:ss)">
 							<f:convertDateTime pattern="yyyy-M-d hh:mm:ss" />
 						</h:inputText>
-						<h:selectOneMenu value="#{pet.animal}" class="form-control" a:placeholder="Birth (YYYY-MM-DD hh:mm:ss)">
+						<h:selectOneMenu value="#{pet.animal}" class="form-control">
 							<f:selectItem itemValue="BIRD" itemLabel="Bird" />
 							<f:selectItem itemValue="CAT" itemLabel="Cat" />
 							<f:selectItem itemValue="DOG" itemLabel="Dog" />
diff --git a/pom.xml b/pom.xml
index 11b46c0..67e6f4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,6 +47,7 @@
 		<!-- Dependencies versions -->
 		<wildfly.version>8.2.1.Final</wildfly.version>
 		<commons.lang3.version>3.4</commons.lang3.version>
+		<bootstrap.version>3.3.7-1</bootstrap.version>
 
 		<!-- Testing dependecies versions -->
 		<junit.version>4.12</junit.version>
@@ -131,6 +132,11 @@
 				<artifactId>commons-lang3</artifactId>
 				<version>${commons.lang3.version}</version>
 			</dependency>
+			<dependency>
+			    <groupId>org.webjars</groupId>
+			    <artifactId>bootstrap</artifactId>
+			    <version>${bootstrap.version}</version>
+			</dependency>
 
 			<!-- Testing -->
 			<dependency>
-- 
2.18.1