From 3b8c0aea9f922cb4625a746cc38aab909da5af9c Mon Sep 17 00:00:00 2001
From: Araozu <tbyuyfcjjll@gmail.com>
Date: Mon, 11 Jun 2018 22:07:40 -0500
Subject: [PATCH] .gitignore para ignorar archivos autogenerados

---
 .gitignore                                    |   3 +
 .idea/workspace.xml                           | 259 ++++++++++++------
 Lab09.iml                                     |   4 +-
 .../access/AccessControllerDelete.class       | Bin 801 -> 801 bytes
 .../access/AccessControllerIndex.class        | Bin 798 -> 798 bytes
 .../access/AccessControllerView.class         | Bin 795 -> 795 bytes
 .../resource/ResourcesControllerAdd.class     | Bin 805 -> 0 bytes
 .../resource/ResourcesControllerDelete.class  | Bin 814 -> 0 bytes
 .../resource/ResourcesControllerIndex.class   | Bin 811 -> 0 bytes
 .../resource/ResourcesControllerView.class    | Bin 808 -> 0 bytes
 .../controller/roles/RolesControllerAdd.class | Bin 787 -> 787 bytes
 .../roles/RolesControllerDelete.class         | Bin 796 -> 796 bytes
 .../roles/RolesControllerIndex.class          | Bin 793 -> 793 bytes
 .../roles/RolesControllerView.class           | Bin 790 -> 790 bytes
 .../controller/users/UsersControllerAdd.class | Bin 787 -> 4244 bytes
 .../users/UsersControllerDelete.class         | Bin 796 -> 796 bytes
 .../users/UsersControllerIndex.class          | Bin 793 -> 793 bytes
 .../users/UsersControllerView.class           | Bin 790 -> 790 bytes
 war/WEB-INF/classes/model/Role.class          | Bin 249 -> 10088 bytes
 war/WEB-INF/classes/model/User.class          | Bin 249 -> 11973 bytes
 20 files changed, 188 insertions(+), 78 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 war/WEB-INF/classes/controller/resource/ResourcesControllerAdd.class
 delete mode 100644 war/WEB-INF/classes/controller/resource/ResourcesControllerDelete.class
 delete mode 100644 war/WEB-INF/classes/controller/resource/ResourcesControllerIndex.class
 delete mode 100644 war/WEB-INF/classes/controller/resource/ResourcesControllerView.class

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a6ec6b6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+.idea/
+war/WEB-INF/classes/
+war/WEB-INF/appengine-generated/
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2b85a74..20241fe 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,15 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="2779599e-b2aa-4ead-8b6c-b1aa4798807f" name="Default" comment="Lanzamiento Inicial. Intenten crear branches para trabajar de forma segura.">
+    <list default="true" id="2779599e-b2aa-4ead-8b6c-b1aa4798807f" name="Default" comment="Funcionalidad basica.">
+      <change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Lab09.iml" beforeDir="false" afterPath="$PROJECT_DIR$/Lab09.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/controller/users/UsersControllerAdd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/controller/users/UsersControllerAdd.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/model/Role.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/model/Role.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/model/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/model/User.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/war/WEB-INF/appengine-web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/appengine-web.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/war/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/web.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/war/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/war/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/war/WEB-INF/classes/controller/access/AccessControllerDelete.class" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/classes/controller/access/AccessControllerDelete.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/war/WEB-INF/classes/controller/access/AccessControllerIndex.class" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/classes/controller/access/AccessControllerIndex.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/war/WEB-INF/classes/controller/access/AccessControllerView.class" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/classes/controller/access/AccessControllerView.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/war/WEB-INF/classes/controller/resource/ResourcesControllerAdd.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/war/WEB-INF/classes/controller/resource/ResourcesControllerDelete.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/war/WEB-INF/classes/controller/resource/ResourcesControllerIndex.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/war/WEB-INF/classes/controller/resource/ResourcesControllerView.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/war/WEB-INF/classes/controller/roles/RolesControllerAdd.class" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/classes/controller/roles/RolesControllerAdd.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/war/WEB-INF/classes/controller/roles/RolesControllerDelete.class" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/classes/controller/roles/RolesControllerDelete.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/war/WEB-INF/classes/controller/roles/RolesControllerIndex.class" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/classes/controller/roles/RolesControllerIndex.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/war/WEB-INF/classes/controller/roles/RolesControllerView.class" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/classes/controller/roles/RolesControllerView.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/war/WEB-INF/classes/controller/users/UsersControllerAdd.class" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/classes/controller/users/UsersControllerAdd.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/war/WEB-INF/classes/controller/users/UsersControllerDelete.class" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/classes/controller/users/UsersControllerDelete.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/war/WEB-INF/classes/controller/users/UsersControllerIndex.class" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/classes/controller/users/UsersControllerIndex.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/war/WEB-INF/classes/controller/users/UsersControllerView.class" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/classes/controller/users/UsersControllerView.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/war/WEB-INF/classes/model/Role.class" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/classes/model/Role.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/war/WEB-INF/classes/model/User.class" beforeDir="false" afterPath="$PROJECT_DIR$/war/WEB-INF/classes/model/User.class" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/war/WEB-INF/classes/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -24,8 +36,8 @@
       <file leaf-file-name="User.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/model/User.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="415">
-              <caret line="35" lean-forward="true" selection-start-line="35" selection-end-line="35" />
+            <state relative-caret-position="629">
+              <caret line="37" column="27" selection-start-line="37" selection-start-column="27" selection-end-line="37" selection-end-column="27" />
               <folding>
                 <element signature="imports" expanded="true" />
                 <element signature="e#1479#1480#0" expanded="true" />
@@ -38,8 +50,8 @@
       <file leaf-file-name="appengine-web.xml" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/war/WEB-INF/appengine-web.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="170">
-              <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+            <state relative-caret-position="306">
+              <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
             </state>
           </provider>
         </entry>
@@ -47,17 +59,17 @@
       <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/war/index.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="577">
-              <caret line="68" column="27" selection-start-line="68" selection-start-column="27" selection-end-line="68" selection-end-column="27" />
+            <state relative-caret-position="620">
+              <caret line="63" column="35" selection-start-line="63" selection-start-column="35" selection-end-line="63" selection-end-column="35" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="UsersControllerAdd.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="UsersControllerAdd.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/controller/users/UsersControllerAdd.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="442">
-              <caret line="37" column="16" lean-forward="true" selection-start-line="37" selection-start-column="16" selection-end-line="37" selection-end-column="16" />
+            <state relative-caret-position="340">
+              <caret line="30" column="41" selection-start-line="30" selection-start-column="41" selection-end-line="30" selection-end-column="41" />
               <folding>
                 <element signature="e#227#254#0" expanded="true" />
                 <element signature="method#doGet#0;class#UsersControllerAdd#0" />
@@ -66,6 +78,27 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/.gitignore">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="17">
+              <caret line="1" column="20" selection-start-line="1" selection-start-column="20" selection-end-line="1" selection-end-column="20" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="AccessControllerDelete.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/controller/access/AccessControllerDelete.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="221">
+              <caret line="17" column="1" lean-forward="true" selection-start-line="17" selection-start-column="1" selection-end-line="17" selection-end-column="1" />
+              <folding>
+                <element signature="e#228#255#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="Role.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/model/Role.java">
           <provider selected="true" editor-type-id="text-editor">
@@ -122,8 +155,9 @@
         <option value="$USER_HOME$/AppData/Local/Temp/Rar$DIa176.14748/GmailServlet.java" />
         <option value="$PROJECT_DIR$/war/WEB-INF/appengine-web.xml" />
         <option value="$PROJECT_DIR$/src/model/User.java" />
-        <option value="$PROJECT_DIR$/src/controller/users/UsersControllerAdd.java" />
         <option value="$PROJECT_DIR$/war/index.html" />
+        <option value="$PROJECT_DIR$/src/controller/users/UsersControllerAdd.java" />
+        <option value="$PROJECT_DIR$/.gitignore" />
       </list>
     </option>
   </component>
@@ -163,19 +197,6 @@
               <item name="Lab09" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="Lab09" type="b2602c69:ProjectViewProjectNode" />
-              <item name="Lab09" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="controller" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="Lab09" type="b2602c69:ProjectViewProjectNode" />
-              <item name="Lab09" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="controller" type="462c0819:PsiDirectoryNode" />
-              <item name="users" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="Lab09" type="b2602c69:ProjectViewProjectNode" />
               <item name="Lab09" type="462c0819:PsiDirectoryNode" />
@@ -298,7 +319,7 @@
       <option name="presentableId" value="Default" />
       <updated>1528406594376</updated>
       <workItem from="1528406596826" duration="3465000" />
-      <workItem from="1528759543471" duration="10244000" />
+      <workItem from="1528759543471" duration="13097000" />
     </task>
     <task id="LOCAL-00001" summary="Lanzamiento Inicial. Intenten crear branches para trabajar de forma segura.">
       <created>1528408256446</created>
@@ -307,14 +328,71 @@
       <option name="project" value="LOCAL" />
       <updated>1528408256446</updated>
     </task>
-    <option name="localTasksCounter" value="2" />
+    <task id="LOCAL-00002" summary="He puesto espacios entre los servlets y sus mappings para que buscar uno sea mas facil.">
+      <created>1528769854523</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1528769854523</updated>
+    </task>
+    <task id="LOCAL-00003" summary="Puse el tag &lt;sessions-enabled&gt; (linea 5) para que se puedan usar Sesiones en la aplicacion (Variables de Sesion en indice-ejemplos.appspot.com). Las Sesiones se utilizaran para que cuando el usuario inicie sesion, no se pierda su login al moverse entre las paginas.">
+      <created>1528770182632</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1528770182632</updated>
+    </task>
+    <task id="LOCAL-00004" summary="Aun deben cambiar el nombre de la aplicacion (lab08-SU_CUI) con el que deployaran.">
+      <created>1528770257691</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1528770257691</updated>
+    </task>
+    <task id="LOCAL-00005" summary="Espacios entre servlets y mapping para una mejor lectura.">
+      <created>1528770284160</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1528770284160</updated>
+    </task>
+    <task id="LOCAL-00006" summary="index.html provisional. Lo uso para probar mis recursos. Uds. usenlo para lo que necesiten, una vez se termine el backend, recien se hará el frontend.">
+      <created>1528772027367</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1528772027367</updated>
+    </task>
+    <task id="LOCAL-00007" summary="Primera edicion con funcionalidad basica.">
+      <created>1528772065813</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1528772065813</updated>
+    </task>
+    <task id="LOCAL-00008" summary="Este Servlet:&#10;&#10;-Se accede al iniciar sesion con Google (Por ahora)&#10;-Comprueba si existe una sesion.&#10;-Comprueba si existe un usuario, sino, lo crea.">
+      <created>1528772167290</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1528772167290</updated>
+    </task>
+    <task id="LOCAL-00009" summary="Funcionalidad basica.">
+      <created>1528772208557</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1528772208557</updated>
+    </task>
+    <option name="localTasksCounter" value="10" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="13709000" />
+    <option name="totallyTimeSpent" value="16562000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="15" y="72" width="1848" height="932" extended-state="0" />
+    <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="bottom" id="Event Log" order="12" side_tool="true" weight="0.32928312" />
@@ -335,9 +413,9 @@
       <window_info anchor="right" id="Capture Analysis" order="8" />
       <window_info anchor="bottom" id="Version Control" order="11" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Terminal" order="8" weight="0.32928312" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="8" visible="true" weight="0.32928312" />
       <window_info id="Persistence" order="2" side_tool="true" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49939248" visible="true" weight="0.14737992" />
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49939248" visible="true" weight="0.14737992" />
       <window_info id="Web" order="7" sideWeight="0.50060755" side_tool="true" weight="0.24961714" />
       <window_info anchor="right" id="Google Cloud Storage" order="4" />
       <window_info anchor="right" id="Theme Preview" order="7" />
@@ -360,7 +438,27 @@
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
     <MESSAGE value="Lanzamiento Inicial. Intenten crear branches para trabajar de forma segura." />
-    <option name="LAST_COMMIT_MESSAGE" value="Lanzamiento Inicial. Intenten crear branches para trabajar de forma segura." />
+    <MESSAGE value="He puesto espacios entre los servlets y sus mappings para que buscar uno sea mas facil." />
+    <MESSAGE value="Puse el tag &lt;sessions-enabled&gt; (linea 5) para que se puedan usar Sesiones en la aplicacion (Variables de Sesion en indice-ejemplos.appspot.com). Las Sesiones se utilizaran para que cuando el usuario inicie sesion, no se pierda su login al moverse entre las paginas." />
+    <MESSAGE value="Aun deben cambiar el nombre de la aplicacion (lab08-SU_CUI) con el que deployaran." />
+    <MESSAGE value="Espacios entre servlets y mapping para una mejor lectura." />
+    <MESSAGE value="index.html provisional. Lo uso para probar mis recursos. Uds. usenlo para lo que necesiten, una vez se termine el backend, recien se hará el frontend." />
+    <MESSAGE value="Primera edicion con funcionalidad basica." />
+    <MESSAGE value="Este Servlet:&#10;&#10;-Se accede al iniciar sesion con Google (Por ahora)&#10;-Comprueba si existe una sesion.&#10;-Comprueba si existe un usuario, sino, lo crea." />
+    <MESSAGE value="Funcionalidad basica." />
+    <option name="LAST_COMMIT_MESSAGE" value="Funcionalidad basica." />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/model/User.java</url>
+          <line>42</line>
+          <properties />
+        </line-breakpoint>
+      </breakpoints>
+      <option name="time" value="1" />
+    </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/src/controller/resources/ResourcesControllerView.java">
@@ -423,16 +521,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/controller/access/AccessControllerDelete.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="8" column="27" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" />
-          <folding>
-            <element signature="e#228#255#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/controller/access/AccessControllerIndex.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="68">
@@ -580,9 +668,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/war/WEB-INF/web.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/model/Role.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="391">
@@ -693,32 +778,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/war/WEB-INF/appengine-web.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="170">
-          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/model/User.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="415">
-          <caret line="35" lean-forward="true" selection-start-line="35" selection-end-line="35" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#1479#1480#0" expanded="true" />
-            <element signature="e#1518#1519#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/war/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="577">
-          <caret line="68" column="27" selection-start-line="68" selection-start-column="27" selection-end-line="68" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/AppData/Local/Temp/Rar$DIa5688.4603/Comprobar.java">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -729,10 +788,49 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/war/WEB-INF/web.xml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/model/User.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="629">
+          <caret line="37" column="27" selection-start-line="37" selection-start-column="27" selection-end-line="37" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#1479#1480#0" expanded="true" />
+            <element signature="e#1518#1519#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/war/WEB-INF/appengine-web.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="306">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/war/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="620">
+          <caret line="63" column="35" selection-start-line="63" selection-start-column="35" selection-end-line="63" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/controller/access/AccessControllerDelete.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="221">
+          <caret line="17" column="1" lean-forward="true" selection-start-line="17" selection-start-column="1" selection-end-line="17" selection-end-column="1" />
+          <folding>
+            <element signature="e#228#255#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/controller/users/UsersControllerAdd.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="442">
-          <caret line="37" column="16" lean-forward="true" selection-start-line="37" selection-start-column="16" selection-end-line="37" selection-end-column="16" />
+        <state relative-caret-position="340">
+          <caret line="30" column="41" selection-start-line="30" selection-start-column="41" selection-end-line="30" selection-end-column="41" />
           <folding>
             <element signature="e#227#254#0" expanded="true" />
             <element signature="method#doGet#0;class#UsersControllerAdd#0" />
@@ -740,6 +838,13 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/.gitignore">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="17">
+          <caret line="1" column="20" selection-start-line="1" selection-start-column="20" selection-end-line="1" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/Lab09.iml b/Lab09.iml
index 1fbe192..390016e 100644
--- a/Lab09.iml
+++ b/Lab09.iml
@@ -21,7 +21,9 @@
       <configuration>
         <setting name="validation-enabled" value="true" />
         <setting name="provider-name" value="" />
-        <datasource-mapping />
+        <datasource-mapping>
+          <factory-entry name="transactions-optional" />
+        </datasource-mapping>
         <deploymentDescriptor name="persistence.xml" url="file://$MODULE_DIR$/src/META-INF/persistence.xml" />
       </configuration>
     </facet>
diff --git a/war/WEB-INF/classes/controller/access/AccessControllerDelete.class b/war/WEB-INF/classes/controller/access/AccessControllerDelete.class
index 7aaa5f171ca324f9e69f350ab9930c5e6331b426..b3c460bda8bc84d818989a7babed95b541d9e5b4 100644
GIT binary patch
delta 29
jcmZ3;wvcT@5ECQU<X|QjM&8LEnbarmXEJ0I1hNbOe?<tA

delta 29
jcmZ3;wvcT@5ECQk<X|QjMxMzZnbarmXEJ0I0J01Ke;f#p

diff --git a/war/WEB-INF/classes/controller/access/AccessControllerIndex.class b/war/WEB-INF/classes/controller/access/AccessControllerIndex.class
index 0d2526510489bf29e91cf2ca282882dea73cec47..a16f4eb26e1e5c1120c83915bf001ecaaa666328 100644
GIT binary patch
delta 29
jcmbQoHjizCKNBO@<NziYM&8NqnA9ilVKQVC1hNbOebESg

delta 29
jcmbQoHjizCKNBP8<NziYMxM#<nA9ilVKQVC0J01KeW(a}

diff --git a/war/WEB-INF/classes/controller/access/AccessControllerView.class b/war/WEB-INF/classes/controller/access/AccessControllerView.class
index ad4de1ec7c2af2413e37aa8da71c7aafe2637ae6..35b05c24c0e01ffe7e51b831ba02e4637be11b78 100644
GIT binary patch
delta 29
jcmbQuHk)mO4-+HTWM3v1M&8M<nbarmWHMwF1hNbOd|e1=

delta 29
jcmbQuHk)mO4-+HjWM3v1MxM#9nbarmWHMwF0J01Kd^8AU

diff --git a/war/WEB-INF/classes/controller/resource/ResourcesControllerAdd.class b/war/WEB-INF/classes/controller/resource/ResourcesControllerAdd.class
deleted file mode 100644
index a8f76ea3b45d9de160210f1c6791d7df4ef9a7db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 805
zcmb7CO;5r=5Pee$1w=vc8)Nh&5@RpkFd9SrN*Xm_xEHz!HI>D7A^a^*CLa6&{wU-0
zBOKHSUS@V?-oAM|vmc*t?*NXmZ9pT`dvc(B>3PC8eG$l!-xFplIRwpV@!W9?=!Bg|
zdu&h4K=@-%D6_BB(7a~TjuV8;i92xBDIrxm=n(X#bVMF0<O)b5LnvDAK-`X=y25|3
zyPhDFE!nfZj_tc)oFsMCcLTzqHNU<FH+ST{3>2YNv;G#^63-(MsK!iKFqDHpG{U#!
zFD5-PR4ykBlz+@38Nn1}V1-Z#WtgrsZ|<fAg5k&Q3Hvhz#5xICUQeWjF#B<dYC_tP
zSAqwUZ%3=Wbi;{Pe_!xXs1<wQ-SH0rTfUDBTZ1E$J+V*MUy*&`gN8iYungp|z_t(r
z*e`OVV+ln@l_HdeWmF=fGmgUs^qr&-k?h9BgoI&O#acv6SjPqv>e&1racNFs!WQe&
GQ2hd4FTKqG

diff --git a/war/WEB-INF/classes/controller/resource/ResourcesControllerDelete.class b/war/WEB-INF/classes/controller/resource/ResourcesControllerDelete.class
deleted file mode 100644
index 8c94c2a4d81aa1fcabeffc952b07d31cc7ee824f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 814
zcmb7C%T5AO3_TqN1`q|ox5ns7G|{_phtUN-lZhHI><73BV@58{TnNAA%EW~q;71ud
zkFd}vvT1MIlhf1oetf>Y131Q(1%q(dQGM+z&y&9JWuS(BM~X)B2<nsKx%8x#7EHqS
zqcd{GB9Q)wbE2p9KwPtF#tA~^#O=HKl#r_Kw+Lokb!8qY<O)b5LnzvAU)~O%+R}e;
z+MXnoZPjtSmgBo&oFq-%a|42~XOdXs{#|vi0!?UC?Z34)<nvGlx;7OS3{*dmwQ!vL
z#keB}+U10W@{e^STbO_>ED<W94B;wqb2ljvEI)2f*qbUK)=9|nks>XG>BA+e3F)r7
zlDv?7Gdl348!mnO*E1i5a<L1(Ab%CGWeQ~2S{w=X#6ErSitGzN4CL8{Wgv$+wuKnL
zex4%}3n((G6rl_(q7o6EaU3?F?<9qYWG5~rBn-ncRw81;D%P0L#QJQ+rGF9=HdvQ|
F%`d|!!L$GX

diff --git a/war/WEB-INF/classes/controller/resource/ResourcesControllerIndex.class b/war/WEB-INF/classes/controller/resource/ResourcesControllerIndex.class
deleted file mode 100644
index a47e1b482af16c0819105e746735069e9e6bd6b0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 811
zcmb7C%TB^j5IqBhLPbIF{fe$cW9Y^mMi;~fNuve~`vNziruJfcA^esr6BmAfA7z|A
z!a}3SX6DY!$(b`V_v7>J9l$AebfgF;J?SZ5x~}j|Uj%aG_k`I>9zkPTY<hh$(V-Fc
z9__I`F$3X`U7^f@QbY5GO*>8yvS*IxsB=QPdek9k4cQk4(#RK(L6%Uo98cVip1Q(+
zu)D4xlr7n_-Hz=$VVop2HE;q#&6-DHo!j^2y$lqgRki+>+7izr5vcl1STK}cAnM^X
z#^t0ZhRWfDj`ELfBukirbgU36p$yZJX7g@ZAn1PFo^Uu*K&+FH;}b<%2(yPvR1-3N
zc`bM$Mmsw1l@soK_qQY0LbW&m-;e(Z*fImMY;}%I_QXDO{EFNQKT<H*hGig+1-6A4
zz<!Y<4NE98suZD8SVkoxy5Kl$K;KCU5y^gBOh_1pRjftCgmr8%p@z-*h)e$@CTy{;
H6t=$rYQeyu

diff --git a/war/WEB-INF/classes/controller/resource/ResourcesControllerView.class b/war/WEB-INF/classes/controller/resource/ResourcesControllerView.class
deleted file mode 100644
index 718611800432d01160c074bcf9d2431d07fd0db4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 808
zcmb7C%T5AO3_XQ`0YpLYEit+hH98x27+nxw2~h)v{Qx)NnsF}9T#(;#W#YmQ@S}{K
zM_6bS*|fLq$?0i(KR(~y0UV=ZB0)IlDpz~TafD}i!dFADE39Vx@avOeTZ(5B24U;L
z9@%5d7v9Jb+UjdPu&&s&q68s*B3-FZ3CZeSn_$#cPvnq9Hjfn2ghE5Q;%4~R5#GJs
zaRi~%P+i+;+nx;KIBDp<^a+QJ83fk2dr#ddUlW?u#@|Yt;%O*+U7HH?2g>zDEf^+u
zKJJQvmYgtA`mv072NRHqB|<rnVM%3O-%bhy(~H^@cBcx6bP_Urpim28`f#yoLaL`O
z1urDm3XgjsgOyi)Iq^{-7CYeU@h1UWCP134$&tmL*r)bik$K@q0y(xp8OUOeZ9W39
zpXbQH0t$>OhNuJ<Q4WdDI1U=ncanTavK<v;5{6+JD<Lsq6>CgrV0|{?;y;NA8>}mV
F%`XW<zlHz+

diff --git a/war/WEB-INF/classes/controller/roles/RolesControllerAdd.class b/war/WEB-INF/classes/controller/roles/RolesControllerAdd.class
index 9cf0121657df101138fb417deab811ba2b401981..32524167d9684937596a8c2f60ccadc77845b5d2 100644
GIT binary patch
delta 35
pcmbQtHkoaM3lk&PWLG8^M&8L?Oc9KNKvJEPkwJ=qfq{uZ8UT}325<lX

delta 35
pcmbQtHkoaM3lk&fWLG8^MxM!COc9I%KvJEPkwJ=qfq{uZ8UT|P25kTU

diff --git a/war/WEB-INF/classes/controller/roles/RolesControllerDelete.class b/war/WEB-INF/classes/controller/roles/RolesControllerDelete.class
index f8fd27d24e5d0d48683b99a0b664313b2f019ffa..8b7a0b6a773df161a86a6bac189735aae692b463 100644
GIT binary patch
delta 29
jcmbQkHivD4FB2ozWIrYsM&8M9nA9ilVlreD1hNbOeAx(Z

delta 29
jcmbQkHivD4FB2o@WIrYsMxM!UnA9ilVlreD0J01Ke6R>?

diff --git a/war/WEB-INF/classes/controller/roles/RolesControllerIndex.class b/war/WEB-INF/classes/controller/roles/RolesControllerIndex.class
index 2228e4f7d3b43000f1aaed675b41f82109ea8a25..ffdb4ddfde19d376888b8c0bc9d7c25e0c99a88a 100644
GIT binary patch
delta 29
jcmbQqHj{0G7ZW4bWN#)HM&8L2m?9Vjfu#Cm0cK7Ba#jZd

delta 29
jcmbQqHj{0G7ZW4rWN#)HMxMzNm?9VjfTa3l0cK7Baw!J?

diff --git a/war/WEB-INF/classes/controller/roles/RolesControllerView.class b/war/WEB-INF/classes/controller/roles/RolesControllerView.class
index fa1ab1a393be41021a52b602e19e7cec036fa802..342396183332a7cdcb7d6860dd7291db82f168b4 100644
GIT binary patch
delta 29
jcmbQnHjQnAI};<<WDh16M&8N2Oc9KNKvI1&FEb|qaOei@

delta 29
jcmbQnHjQnAI};=4WDh16MxM#NOc9I%KvI1&FEb|qaJvTT

diff --git a/war/WEB-INF/classes/controller/users/UsersControllerAdd.class b/war/WEB-INF/classes/controller/users/UsersControllerAdd.class
index 6938eff855b762ce71f94ad197e3cbef387ab2c5..5f5a6c9a57fdc74688b778b9438ed1b71974cdad 100644
GIT binary patch
literal 4244
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
T=r;BFDy3*!;BS0-@b~`#$7wqV

delta 212
zcmbQDIGK&>)W2Q(7#J8#7-TkbWiw9hV#{G;P04ppEt#y%ZN$htIgVS4k#lk<w^lua
zJy0Dp5HoHB5=;zSK$4At5lHeda05vNh$N853*-TnF^DpVf#n$)#2F-jI#?Ja8Tf&;
i08o|<NDDFuGq3~MI1Ls+GFX)nkI9S-Qb2Q<7^DHGfDz&V

diff --git a/war/WEB-INF/classes/controller/users/UsersControllerDelete.class b/war/WEB-INF/classes/controller/users/UsersControllerDelete.class
index d0a110efb0eca002086d454d5df75adee4b8b0b8..f711787851df6376ad2837e729e5becb0e8228ad 100644
GIT binary patch
delta 29
jcmbQkHivD4FB2ozWIrYsM&8M9nA9ilVlreD1hNbOeAx(Z

delta 29
jcmbQkHivD4FB2o@WIrYsMxM!UnA9ilVlreD0J01Ke6R>?

diff --git a/war/WEB-INF/classes/controller/users/UsersControllerIndex.class b/war/WEB-INF/classes/controller/users/UsersControllerIndex.class
index 9d16f60db743593d8a8cbd5d75a7bf08e2f77695..6a486d24552405c86d7eca3fef8d2121014bf965 100644
GIT binary patch
delta 29
jcmbQqHj{0G7ZW4bWN#)HM&8L2m?9Vjfu#Cm0cK7Ba#jZd

delta 29
jcmbQqHj{0G7ZW4rWN#)HMxMzNm?9VjfTa3l0cK7Baw!J?

diff --git a/war/WEB-INF/classes/controller/users/UsersControllerView.class b/war/WEB-INF/classes/controller/users/UsersControllerView.class
index 5a3ff25daf40b62b287ec2b6a6f045300dee4b5c..c9b80cb0376a8b3d100312ce8535b07505eec495 100644
GIT binary patch
delta 29
jcmbQnHjQnAI};<<WDh16M&8N2Oc9KNKvI1&FEb|qaOei@

delta 29
jcmbQnHjQnAI};=4WDh16MxM#NOc9I%KvI1&FEb|qaJvTT

diff --git a/war/WEB-INF/classes/model/Role.class b/war/WEB-INF/classes/model/Role.class
index 304cc1126d9388b060e3f2ff2b90ce2c4e4bfa42..0ee35c24134ae8db9e0e08428a816a09c8871a04 100644
GIT binary patch
literal 10088
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

literal 249
zcmYLD!4APd6r5MBY88z?aKk|_Zp206)Q}+V+uE?rYLhDe<s@<N0X|B+6^YBtn|Ybc
zyxxx|fH6WB7QsIid#R&!p`{C(5N6^kA}#Vmv`R9WR)qRg<*J$yYW=~EV9z<>qXsX4
zgF2xTt6VNGr$m-pk!VTi#ziXhPL#^%pJ`V|btVMyzj4C-o8nTYa-mGlGc!hJ0eav*
o-U((hJ&Z1^=&J!|ct_*Lh6SI|yupDcWAMEl<`yeLo6$n&1HE1^0{{R3

diff --git a/war/WEB-INF/classes/model/User.class b/war/WEB-INF/classes/model/User.class
index 0b498e65319e4b4c6590108a094ad2f68ecb93f9..b9f60b82397d9c9f81d77d04f3819349784dc434 100644
GIT binary patch
literal 11973
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

literal 249
zcmYLD%MQU%6r5A7Y88z?u){((cEm<v)v)l`-_{McsW!RFe_2T^e1MM<=ZeH;=FFT-
zW?t{d6Tldu3ya{N%Dv2^?OAFUHX+Q!RYbWc4$&&fWLgpGQ&p&HMyT}%JAysugpV4$
z01oPePOJ*KyqprLHzLU;p&OT}$ag|3qkpDd9o3l-#Q(+#_pi%~PUS+GoM&c?%mVbl
peY_LQWO^7~R?$}j&hU=LjSUMvqj`e^O~&ARJIpOsgf^pv&Ii)>FDd{4