5Commit

Marija26 · Sep 25, 2018 · 51a6bc2 · 51a6bc2
1 parent db0a323
commit 51a6bc2
Show file tree

Hide file tree

Showing 21 changed files with 28 additions and 28 deletions.
diff --git a/Data_Source/pom.xml → data_Source/pom.xml b/Data_Source/pom.xml → data_Source/pom.xml
diff --git a/...ource/src/main/java/org/mary/pro/.gitKeep → ...ource/src/main/java/org/mary/pro/.gitKeep b/...ource/src/main/java/org/mary/pro/.gitKeep → ...ource/src/main/java/org/mary/pro/.gitKeep
diff --git a/Domain/pom.xml → domain/pom.xml b/Domain/pom.xml → domain/pom.xml
diff --git a/Domain/src/main/java/org/mary/pro/.gitKeep → domain/src/main/java/org/mary/pro/.gitKeep b/Domain/src/main/java/org/mary/pro/.gitKeep → domain/src/main/java/org/mary/pro/.gitKeep
diff --git a/...rc/main/java/org/mary/pro/model/User.java → ...rc/main/java/org/mary/pro/model/User.java b/...rc/main/java/org/mary/pro/model/User.java → ...rc/main/java/org/mary/pro/model/User.java
@@ -49,27 +49,27 @@ public void setPosition(String position) {
     }
 
 //
-//    @Override
-//    public boolean equals(Object o) {
-//        if (this == o) return true;
-//        if (o == null || getClass() != o.getClass()) return false;
-//        User user = (User) o;
-//        return Objects.equals(name, user.name) &&
-//                Objects.equals(lastName, user.lastName) &&
-//                Objects.equals(position, user.position);
-//    }
-//
-//    @Override
-//    public int hashCode() {
-//        return Objects.hash(name, lastName, position);
-//    }
-//
-//    @Override
-//    public String toString() {
-//        return "User{" +
-//                "name='" + name + '\'' +
-//                ", lastName='" + lastName + '\'' +
-//                ", position='" + position + '\'' +
-//                '}';
-//    }
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        User user = (User) o;
+        return Objects.equals(name, user.name) &&
+                Objects.equals(lastName, user.lastName) &&
+                Objects.equals(position, user.position);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, lastName, position);
+    }
+
+    @Override
+    public String toString() {
+        return "User{" +
+                "name='" + name + '\'' +
+                ", lastName='" + lastName + '\'' +
+                ", position='" + position + '\'' +
+                '}';
+    }
 }
diff --git a/pom.xml b/pom.xml
@@ -135,7 +135,7 @@
         </dependency>
     </dependencies>
     <repositories>
-        <!-- ... possibly other repository elements ... -->
+        <!-- ... possibly other service elements ... -->
         <repository>
             <id>spring-snapshots</id>
             <url>https://repo.springsource.org/snapshot</url>

diff --git a/Presentation/Presentation.iml → presentation/Presentation.iml b/Presentation/Presentation.iml → presentation/Presentation.iml
diff --git a/Presentation/pom.xml → presentation/pom.xml b/Presentation/pom.xml → presentation/pom.xml
@@ -59,7 +59,7 @@
         <!--</dependency>-->
   </dependencies>
     <repositories>
-        <!-- ... possibly other repository elements ... -->
+        <!-- ... possibly other service elements ... -->
         <repository>
             <id>spring-snapshots</id>
             <url>https://repo.springsource.org/snapshot</url>

diff --git a/...ation/src/main/java/org/mary/pro/.gitKeep → ...ation/src/main/java/org/mary/pro/.gitKeep b/...ation/src/main/java/org/mary/pro/.gitKeep → ...ation/src/main/java/org/mary/pro/.gitKeep
diff --git a/.../pro/config/ApplicationContextConfig.java → .../pro/config/ApplicationContextConfig.java b/.../pro/config/ApplicationContextConfig.java → .../pro/config/ApplicationContextConfig.java
diff --git a/...nfig/MyBasicAuthenticationEntryPoint.java → ...nfig/MyBasicAuthenticationEntryPoint.java b/...nfig/MyBasicAuthenticationEntryPoint.java → ...nfig/MyBasicAuthenticationEntryPoint.java
diff --git a/...a/org/mary/pro/config/SecurityConfig.java → ...a/org/mary/pro/config/SecurityConfig.java b/...a/org/mary/pro/config/SecurityConfig.java → ...a/org/mary/pro/config/SecurityConfig.java
diff --git a/...pro/config/SpringSecurityInitializer.java → ...pro/config/SpringSecurityInitializer.java b/...pro/config/SpringSecurityInitializer.java → ...pro/config/SpringSecurityInitializer.java
diff --git a/...y/pro/config/SpringWebAppInitializer.java → ...y/pro/config/SpringWebAppInitializer.java b/...y/pro/config/SpringWebAppInitializer.java → ...y/pro/config/SpringWebAppInitializer.java
diff --git a/...ava/org/mary/pro/config/WebMvcConfig.java → ...ava/org/mary/pro/config/WebMvcConfig.java b/...ava/org/mary/pro/config/WebMvcConfig.java → ...ava/org/mary/pro/config/WebMvcConfig.java
diff --git a/...rg/mary/pro/cotroller/UserController.java → ...rg/mary/pro/cotroller/UserController.java b/...rg/mary/pro/cotroller/UserController.java → ...rg/mary/pro/cotroller/UserController.java
@@ -1,7 +1,7 @@
 package org.mary.pro.cotroller;
 
 
-import org.mary.pro.DAO.UserDAO;
+import org.mary.pro.service.UserDAO;
 import org.mary.pro.model.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;

diff --git a/...c/main/java/org/mary/pro/DAO/UserDAO.java → ...in/java/org/mary/pro/service/UserDAO.java b/...c/main/java/org/mary/pro/DAO/UserDAO.java → ...in/java/org/mary/pro/service/UserDAO.java
@@ -1,4 +1,4 @@
-package org.mary.pro.DAO;
+package org.mary.pro.service;
 
 import org.mary.pro.model.User;
 import org.springframework.stereotype.Component;

diff --git a/...ation/src/main/resources/log4j.properties → ...ation/src/main/resources/log4j.properties b/...ation/src/main/resources/log4j.properties → ...ation/src/main/resources/log4j.properties
diff --git a/Presentation/src/main/webapp/WEB-INF/web.xml → presentation/src/main/webapp/WEB-INF/web.xml b/Presentation/src/main/webapp/WEB-INF/web.xml → presentation/src/main/webapp/WEB-INF/web.xml
diff --git a/.../MyBasicAuthenticationEntryPointTest.java → .../MyBasicAuthenticationEntryPointTest.java b/.../MyBasicAuthenticationEntryPointTest.java → .../MyBasicAuthenticationEntryPointTest.java
diff --git a/...ary/pro/cotroller/UserControllerTest.java → ...ary/pro/cotroller/UserControllerTest.java b/...ary/pro/cotroller/UserControllerTest.java → ...ary/pro/cotroller/UserControllerTest.java
@@ -4,7 +4,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mary.pro.DAO.UserDAO;
+import org.mary.pro.service.UserDAO;
 import org.mary.pro.config.ApplicationContextConfig;
 import org.mary.pro.model.User;
 import org.mockito.InjectMocks;