Merge branch 'master' of https://git.bukova.info/repos/git/isspst

12 years ago · edbb106320
parent af1cf69958 c440c65afd
commit edbb106320
10 changed files with 17 additions and 57 deletions
--- a/src/main/java/info/bukova/isspst/dao/jpa/AddressDaoJPA.java
+++ b/src/main/java/info/bukova/isspst/dao/jpa/AddressDaoJPA.java
@ -4,10 +4,4 @@ import info.bukova.isspst.dao.AddressDao;
 import info.bukova.isspst.data.Address;

 public class AddressDaoJPA extends BaseDaoJPA<Address> implements AddressDao {
-
-	@Override
-	public String getEntityName() {
-		return Address.class.getSimpleName();
-	}
-
 }
--- a/src/main/java/info/bukova/isspst/dao/jpa/BaseDaoJPA.java
+++ b/src/main/java/info/bukova/isspst/dao/jpa/BaseDaoJPA.java
@ -4,11 +4,27 @@ import java.util.List;

 import org.hibernate.Query;
 import org.hibernate.SessionFactory;
+import org.springframework.core.GenericTypeResolver;

 import info.bukova.isspst.dao.BaseDao;

 public abstract class BaseDaoJPA<T> implements BaseDao<T> {

+	protected Class<T> classTypeResolver;
+	
+	@SuppressWarnings("unchecked")
+	public BaseDaoJPA()
+	{
+		this.classTypeResolver = (Class<T>) GenericTypeResolver.resolveTypeArgument(getClass(), BaseDaoJPA.class);
+	}
+	
+	@Override
+	public String getEntityName() {
+		String className = classTypeResolver.getSimpleName();
+		return className;
+	}
+
+	
 	private SessionFactory sessionFactory;
 	
 	public void setSessionFactory(SessionFactory factory) {
--- a/src/main/java/info/bukova/isspst/dao/jpa/BuildingDaoJPA.java
+++ b/src/main/java/info/bukova/isspst/dao/jpa/BuildingDaoJPA.java
@ -4,9 +4,4 @@ import info.bukova.isspst.dao.BuildingDao;
 import info.bukova.isspst.data.Building;

 public class BuildingDaoJPA extends BaseDaoJPA<Building> implements BuildingDao {
-
-	@Override
-	public String getEntityName() {
-		return "Building";
-	}
 }
--- a/src/main/java/info/bukova/isspst/dao/jpa/MUnitDaoJPA.java
+++ b/src/main/java/info/bukova/isspst/dao/jpa/MUnitDaoJPA.java
@ -4,9 +4,4 @@ import info.bukova.isspst.dao.MUnitDao;
 import info.bukova.isspst.data.MUnit;

 public class MUnitDaoJPA extends BaseDaoJPA<MUnit> implements MUnitDao {
-
-	@Override
-	public String getEntityName() {
-		return "MUnit";
-	}
 }
--- a/src/main/java/info/bukova/isspst/dao/jpa/MaterialDaoJPA.java
+++ b/src/main/java/info/bukova/isspst/dao/jpa/MaterialDaoJPA.java
@ -4,11 +4,4 @@ import info.bukova.isspst.dao.MaterialDao;
 import info.bukova.isspst.data.Material;

 public class MaterialDaoJPA extends BaseDaoJPA<Material> implements MaterialDao {
-
-	@Override
-	public String getEntityName() {
-		return Material.class.getSimpleName();
-	}
-
-
 }
--- a/src/main/java/info/bukova/isspst/dao/jpa/PermissionDaoJPA.java
+++ b/src/main/java/info/bukova/isspst/dao/jpa/PermissionDaoJPA.java
@ -4,10 +4,4 @@ import info.bukova.isspst.dao.PermissionDao;
 import info.bukova.isspst.data.Permission;

 public class PermissionDaoJPA extends BaseDaoJPA<Permission> implements PermissionDao {
-
-	@Override
-	public String getEntityName() {
-		return Permission.class.getSimpleName();
-	}
-
 }
--- a/src/main/java/info/bukova/isspst/dao/jpa/RoleDaoJPA.java
+++ b/src/main/java/info/bukova/isspst/dao/jpa/RoleDaoJPA.java
@ -4,10 +4,4 @@ import info.bukova.isspst.dao.RoleDao;
 import info.bukova.isspst.data.Role;

 public class RoleDaoJPA extends BaseDaoJPA<Role> implements RoleDao {
-
-	@Override
-	public String getEntityName() {
-		return "Role";
-	}
-
 }
--- a/src/main/java/info/bukova/isspst/dao/jpa/UserDaoJPA.java
+++ b/src/main/java/info/bukova/isspst/dao/jpa/UserDaoJPA.java
@ -4,11 +4,4 @@ import info.bukova.isspst.dao.UserDao;
 import info.bukova.isspst.data.User;

 public class UserDaoJPA extends BaseDaoJPA<User> implements UserDao {
-
-
-	@Override
-	public String getEntityName() {
-		return "User";
-	}
-
 }
--- a/src/main/webapp/WEB-INF/jdbc.properties
+++ b/src/main/webapp/WEB-INF/jdbc.properties
@ -1,5 +1,5 @@
 jdbc.driverClassName=com.mysql.jdbc.Driver
 jdbc.dialect=org.hibernate.dialect.MySQLDialect
 jdbc.databaseurl=jdbc:mysql://127.0.0.1:3306/isspst?characterEncoding=latin2
-jdbc.username=root
+jdbc.username=isspst
 jdbc.password=xsacfgd
--- a/src/main/webapp/WEB-INF/views/home.jsp
+++ b/src/main/webapp/WEB-INF/views/home.jsp
@ -1,14 +0,0 @@
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page session="false" %>
-<html>
-<head>
-	<title>Home</title>
-</head>
-<body>
-<h1>
-	Hello world!  
-</h1>
-
-<P>  The time on the server is ${serverTime}. </P>
-</body>
-</html>