Merge branch 'release/3.6'

radcortez · radcortez · commit cbbf524f8474 · 2015-12-23T11:49:49.000Z
diff --git a/.gitignore b/.gitignore
@@ -23,6 +23,11 @@
 ## Additional for IntelliJ
 out/
 
+## Additional for eclipse
+.project
+.classpath
+.settings/
+
 # generated by mpeltonen/sbt-idea plugin
 .idea_modules/
 
diff --git a/README.md b/README.md
@@ -8,35 +8,46 @@
 
 * [Codenvy setup to demo applications using Docker: Java EE 7 with Angular](http://www.radcortez.com/codenvy-setup-to-demo-applications-using-docker-java-ee-7-with-angular/)
 
-* [Java EE 7 with Angular Demo](https://codenvy.com/f?id=ybnr6nsyrimeoyhg)
-
 ## How to run ? ##
 
-* You need JDK 7 or higher, Maven 3 and Wildfly 8 or Glassfish 4.1 to run the application.
+## Codenvy ##
+
+Codenvy (https://codenvy.com) is a cloud environment for coding, building, and debugging apps. It's the recommended way
+to run this project, since all the setup is cloud based, you don't need to setup anything in your own machine.
+
+Just go to: [Java EE 7 with Angular Demo](https://codenvy.com/f?id=ybnr6nsyrimeoyhg)
 
+Wait for the project to load and then just hit the Green Run Button in the upper right corner. You might want to check a
+few instructions here: [Codenvy setup to demo applications using Docker: Java EE 7 with Angular](http://www.radcortez.com/codenvy-setup-to-demo-applications-using-docker-java-ee-7-with-angular/)
+
+## Localhost ##
+
+* You need JDK 7 or higher, Maven 3 and Wildfly 8 or Glassfish 4.1 to run the application.
 * Build the code using Maven with the command: `mvn clean install`.
 
-* ## Deploy in the Wildfly 8 ##
+### Deploy in Wildfly 8 ###
 
-  * Copy the file javaee7-angular-3.4.war from target directory to your Wildfly installation folder /standalone/deployments
+  * Copy the file javaee7-angular-3.4.war from target directory to your Wildfly installation folder
+  `standalone/deployments`
 
-  * You can also deploy the app, using Maven Wildfly Plugin with the following command: `mvn wildfly:deploy`. You need to have Wildfly running.
+  * You can also deploy the app, using Maven Wildfly Plugin with the following command: `mvn wildfly:deploy`.
+  You need to have Wildfly running.
 
-  * Start Wildfly 8 and go to http://localhost:8080/javaee7-angular-3.4/
+  * Start Wildfly 8 and go to http://localhost:8080/javaee7-angular-3.6/ (http://localhost:8080/javaee7-angular-3.6/)
 
-* ## Deploy in the Glassfish 4.1 ##
+### Deploy in Glassfish 4.1 ###
 
   * Open Admin Console (http://localhost:8484/)
   
   * Go to menu "Application" 
   
-  * In the button "Deploy..." select the file javaee7-angular-3.4.war
+  * In the button "Deploy..." select the file javaee7-angular-3.6.war
    
-  * Go to http://localhost:8080/javaee7-angular-3.4/
+  * Go to http://localhost:8080/javaee7-angular-3.6/ (http://localhost:8080/javaee7-angular-3.6/)
 
 ## Javascript Package Management (optional) ##
 
-* The required JS libraries are included in the project, but it also possible to manage them with the next steps.
+The required JS libraries are included in the project, but it also possible to manage them following the next steps:
 
 * You need NPM. Please go to http://nodejs.org/download/ to get a copy.
 
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>com.cortez.samples</groupId>
     <artifactId>javaee7-angular</artifactId>
-    <version>3.5</version>
+    <version>3.6</version>
     <packaging>war</packaging>
 
     <name>javaee7-angular</name>
diff --git a/src/main/resources/sql/load.sql b/src/main/resources/sql/load.sql
@@ -1,9 +1,9 @@
 INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (1, 'Uzumaki Naruto', 'Konoha', 'http://img1.wikia.nocookie.net/__cb20140523045537/naruto/images/thumb/3/36/Naruto_Uzumaki.png/300px-Naruto_Uzumaki.png')
 INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (2, 'Hatake Kakashi', 'Konoha', 'http://img1.wikia.nocookie.net/__cb20140616090940/naruto/images/thumb/b/b3/KakashiHatake.png/300px-KakashiHatake.png')
-INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (3, 'Haruno Sakura', 'Konoha', 'http://img1.wikia.nocookie.net/__cb20130910111848/naruto/images/thumb/5/59/Sakura_Part_II.png/300px-Sakura_Part_II.png')
+INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (3, 'Haruno Sakura', 'Konoha', 'http://vignette2.wikia.nocookie.net/naruto/images/b/ba/Sakurap2.png/revision/latest/scale-to-width-down/300?cb=20150825101949')
 INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (4, 'Uchiha Sasuke', 'Missing-nin', 'http://img1.wikia.nocookie.net/__cb20150110232732/naruto/images/c/c3/Sasuke_headshot.png')
 INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (5, 'Gaara', 'Sunagakure', 'http://img3.wikia.nocookie.net/__cb20130910220958/naruto/images/thumb/0/0f/Gaara_Part_II.png/300px-Gaara_Part_II.png')
-INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (6, 'Killer Bee', 'Kumogakure', 'http://img1.wikia.nocookie.net/__cb20120215120020/naruto/images/thumb/3/36/Killer_Bee.png/300px-Killer_Bee.png')
+INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (6, 'Killer Bee', 'Kumogakure', 'http://vignette3.wikia.nocookie.net/naruto/images/6/63/Killer_B.png/revision/latest/scale-to-width-down/300?cb=20150917075056')
 INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (7, 'Jiraya', 'Konoha', 'http://img2.wikia.nocookie.net/__cb20120925123905/naruto/images/thumb/2/21/Profile_Jiraiya.PNG/300px-Profile_Jiraiya.PNG')
 INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (8, 'Namikaze Minato', 'Konoha', 'http://img4.wikia.nocookie.net/__cb20140209115534/naruto/images/thumb/1/1f/Minato_Namikaze.PNG/300px-Minato_Namikaze.PNG')
 INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (9, 'Uchiha Madara', 'Missing-nin', 'http://img2.wikia.nocookie.net/__cb20140724225045/naruto/images/thumb/c/cf/Madara_newshot.png/300px-Madara_newshot.png')
@@ -17,5 +17,5 @@ INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (16, 'Uzumaki
 INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (17, 'Nara Shikamaru', 'Konoha', 'http://img1.wikia.nocookie.net/__cb20130917013425/naruto/images/thumb/9/9a/Shikamaru_Nara.png/300px-Shikamaru_Nara.png')
 INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (18, 'Sarutobi Hiruzen', 'Konoha', 'http://img4.wikia.nocookie.net/__cb20120912121115/naruto/images/thumb/e/e4/Hiruzen_Sarutobi.png/300px-Hiruzen_Sarutobi.png')
 INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (19, 'Tsunade', 'Konoha', 'http://img4.wikia.nocookie.net/__cb20150108211132/naruto/images/b/b3/Tsunade_infobox2.png')
-INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (20, 'Orochimaru', 'Missing-nin', 'http://img3.wikia.nocookie.net/__cb20100623204832/naruto/images/thumb/e/e8/Orochimaru2.jpg/300px-Orochimaru2.jpg')
-INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (21, 'Uchicha Itachi', 'Missing-nin', 'http://img1.wikia.nocookie.net/__cb20110723152743/naruto/images/thumb/8/8d/UchihaItachi.png/300px-UchihaItachi.png')
+INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (20, 'Orochimaru', 'Missing-nin', 'http://vignette2.wikia.nocookie.net/naruto/images/1/14/Orochimaru_Infobox.png/revision/latest/scale-to-width-down/300?cb=20150925223113')
+INSERT INTO PERSON("ID", "NAME", "DESCRIPTION", "IMAGEURL") VALUES (21, 'Uchicha Itachi', 'Missing-nin', 'http://vignette2.wikia.nocookie.net/naruto/images/b/bb/Itachi.png/revision/latest/scale-to-width-down/300?cb=20150602102445')
diff --git a/src/main/webapp/script/person.js b/src/main/webapp/script/person.js
@@ -48,7 +48,8 @@ app.controller('personsListController', function ($scope, $rootScope, personServ
 
     // Watch the sortInfo variable. If changes are detected than we need to refresh the grid.
     // This also works for the first page access, since we assign the initial sorting in the initialize section.
-    $scope.$watch('sortInfo.fields[0]', function () {
+    $scope.$watch('sortInfo', function () {
+        $scope.persons = {currentPage: 1};
         $scope.refreshGrid();
     }, true);
 
