From f9c6f9c85e2211d011bb019a4b3d88d6a497acf5 Mon Sep 17 00:00:00 2001
From: Tim Levett <levett@wisc.edu>
Date: Thu, 29 Oct 2015 10:06:39 -0500
Subject: [PATCH] changing names

---
 {myuw-root-jar => myuw-error-valve}/pom.xml         |   0
 .../main/java/edu/wisc/my/root/MyUWErrorValve.java  |   0
 .../src/main/webapp/WEB-INF/web.xml                 |   0
 .../src/main/webapp/favicon.ico                     | Bin
 .../src/main/webapp/main_logo_w_all.png             | Bin
 {myuw-root-war => myuw-root-webapp}/pom.xml         |   0
 .../src/main/webapp/404.html                        |   0
 .../src/main/webapp/500.html                        |   0
 .../src/main/webapp/WEB-INF/web.xml                 |   0
 .../src/main/webapp/favicon.ico                     | Bin
 .../src/main/webapp/main_logo_w_all.png             | Bin
 pom.xml                                             |   4 ++--
 12 files changed, 2 insertions(+), 2 deletions(-)
 rename {myuw-root-jar => myuw-error-valve}/pom.xml (100%)
 rename {myuw-root-jar => myuw-error-valve}/src/main/java/edu/wisc/my/root/MyUWErrorValve.java (100%)
 rename {myuw-root-jar => myuw-error-valve}/src/main/webapp/WEB-INF/web.xml (100%)
 rename {myuw-root-jar => myuw-error-valve}/src/main/webapp/favicon.ico (100%)
 rename {myuw-root-jar => myuw-error-valve}/src/main/webapp/main_logo_w_all.png (100%)
 rename {myuw-root-war => myuw-root-webapp}/pom.xml (100%)
 rename {myuw-root-war => myuw-root-webapp}/src/main/webapp/404.html (100%)
 rename {myuw-root-war => myuw-root-webapp}/src/main/webapp/500.html (100%)
 rename {myuw-root-war => myuw-root-webapp}/src/main/webapp/WEB-INF/web.xml (100%)
 rename {myuw-root-war => myuw-root-webapp}/src/main/webapp/favicon.ico (100%)
 rename {myuw-root-war => myuw-root-webapp}/src/main/webapp/main_logo_w_all.png (100%)

diff --git a/myuw-root-jar/pom.xml b/myuw-error-valve/pom.xml
similarity index 100%
rename from myuw-root-jar/pom.xml
rename to myuw-error-valve/pom.xml
diff --git a/myuw-root-jar/src/main/java/edu/wisc/my/root/MyUWErrorValve.java b/myuw-error-valve/src/main/java/edu/wisc/my/root/MyUWErrorValve.java
similarity index 100%
rename from myuw-root-jar/src/main/java/edu/wisc/my/root/MyUWErrorValve.java
rename to myuw-error-valve/src/main/java/edu/wisc/my/root/MyUWErrorValve.java
diff --git a/myuw-root-jar/src/main/webapp/WEB-INF/web.xml b/myuw-error-valve/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from myuw-root-jar/src/main/webapp/WEB-INF/web.xml
rename to myuw-error-valve/src/main/webapp/WEB-INF/web.xml
diff --git a/myuw-root-jar/src/main/webapp/favicon.ico b/myuw-error-valve/src/main/webapp/favicon.ico
similarity index 100%
rename from myuw-root-jar/src/main/webapp/favicon.ico
rename to myuw-error-valve/src/main/webapp/favicon.ico
diff --git a/myuw-root-jar/src/main/webapp/main_logo_w_all.png b/myuw-error-valve/src/main/webapp/main_logo_w_all.png
similarity index 100%
rename from myuw-root-jar/src/main/webapp/main_logo_w_all.png
rename to myuw-error-valve/src/main/webapp/main_logo_w_all.png
diff --git a/myuw-root-war/pom.xml b/myuw-root-webapp/pom.xml
similarity index 100%
rename from myuw-root-war/pom.xml
rename to myuw-root-webapp/pom.xml
diff --git a/myuw-root-war/src/main/webapp/404.html b/myuw-root-webapp/src/main/webapp/404.html
similarity index 100%
rename from myuw-root-war/src/main/webapp/404.html
rename to myuw-root-webapp/src/main/webapp/404.html
diff --git a/myuw-root-war/src/main/webapp/500.html b/myuw-root-webapp/src/main/webapp/500.html
similarity index 100%
rename from myuw-root-war/src/main/webapp/500.html
rename to myuw-root-webapp/src/main/webapp/500.html
diff --git a/myuw-root-war/src/main/webapp/WEB-INF/web.xml b/myuw-root-webapp/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from myuw-root-war/src/main/webapp/WEB-INF/web.xml
rename to myuw-root-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/myuw-root-war/src/main/webapp/favicon.ico b/myuw-root-webapp/src/main/webapp/favicon.ico
similarity index 100%
rename from myuw-root-war/src/main/webapp/favicon.ico
rename to myuw-root-webapp/src/main/webapp/favicon.ico
diff --git a/myuw-root-war/src/main/webapp/main_logo_w_all.png b/myuw-root-webapp/src/main/webapp/main_logo_w_all.png
similarity index 100%
rename from myuw-root-war/src/main/webapp/main_logo_w_all.png
rename to myuw-root-webapp/src/main/webapp/main_logo_w_all.png
diff --git a/pom.xml b/pom.xml
index b5fe867..799211b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,8 +16,8 @@
   <url>git@git.doit.wisc.edu:myuw/my-root.git</url>
   
   <modules>
-    <module>myuw-root-jar</module>
-    <module>myuw-root-war</module>
+    <module>myuw-error-valve</module>
+    <module>myuw-root-webapp</module>
   </modules>
   
   <repositories>
-- 
GitLab