From 047ce14b0bfb7b0f435ca819d5f06083dd1edd6d Mon Sep 17 00:00:00 2001
From: Ksenomorfa <black_estrella@mail.ru>
Date: Tue, 21 Jun 2016 08:06:43 +0300
Subject: [PATCH] =?UTF-8?q?*=20=D0=9D=D0=B0=D1=87=D0=B0=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D0=BF=D0=BE=D0=B4=20Spring?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BugTracker.iml                                | 13 ++++++++----
 META-INF/application.xml                      |  7 -------
 pom.xml                                       | 19 +++++++++++++++++-
 .../{webapp => }/resources/hibernate.cfg.xml  |  0
 .../resources/hibernate.properties            |  0
 src/main/resources/log4j.properties           |  4 ++++
 .../webapp/WEB-INF/dispatcher-servlet.xml     |  4 +---
 src/main/webapp/WEB-INF/pages/index.html      | 20 +++++++++++++++++++
 src/main/webapp/WEB-INF/pages/index.jsp       |  3 ++-
 src/main/webapp/WEB-INF/web.xml               |  1 -
 10 files changed, 54 insertions(+), 17 deletions(-)
 delete mode 100644 META-INF/application.xml
 rename src/main/{webapp => }/resources/hibernate.cfg.xml (100%)
 rename src/main/{webapp => }/resources/hibernate.properties (100%)
 create mode 100644 src/main/resources/log4j.properties
 create mode 100644 src/main/webapp/WEB-INF/pages/index.html

diff --git a/BugTracker.iml b/BugTracker.iml
index 3b52a80..b64a5b2 100644
--- a/BugTracker.iml
+++ b/BugTracker.iml
@@ -11,7 +11,8 @@
         </webroots>
         <sourceRoots>
           <root url="file://$MODULE_DIR$/src/main/java" />
-          <root url="file://$MODULE_DIR$/src/main/webapp/static/resources" />
+          <root url="file://$MODULE_DIR$/src/main/resources" />
+          <root url="file://$MODULE_DIR$/src/main/webapp/resources" />
         </sourceRoots>
       </configuration>
     </facet>
@@ -30,7 +31,7 @@
         <naming-strategy-map>
           <unit-entry name="hibernate.cfg.xml" />
         </naming-strategy-map>
-        <deploymentDescriptor name="hibernate.cfg.xml" url="file://$MODULE_DIR$/src/main/webapp/resources/hibernate.cfg.xml" />
+        <deploymentDescriptor name="hibernate.cfg.xml" url="file://$MODULE_DIR$/src/main/resources/hibernate.cfg.xml" />
       </configuration>
     </facet>
     <facet type="Spring" name="Spring">
@@ -55,6 +56,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/webapp/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
@@ -63,8 +65,10 @@
     <orderEntry type="library" name="Java EE 6-Java EE 6" level="project" />
     <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.2" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" />
     <orderEntry type="library" name="Maven: org.postgresql:postgresql:9.4-1206-jdbc4" level="project" />
     <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
     <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
@@ -80,6 +84,8 @@
     <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
     <orderEntry type="library" name="Maven: org.hibernate:hibernate-entitymanager:5.1.0.Final" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.6" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.1.Final" level="project" />
     <orderEntry type="library" name="Maven: com.mchange:c3p0:0.9.5" level="project" />
     <orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.9" level="project" />
@@ -105,6 +111,5 @@
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:1.3.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.5.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.7.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.slf4j:jcl-over-slf4j:1.7.1" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/META-INF/application.xml b/META-INF/application.xml
deleted file mode 100644
index 8533088..0000000
--- a/META-INF/application.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://java.sun.com/xml/ns/javaee"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_6.xsd"
-             version="6">
-
-</application>
diff --git a/pom.xml b/pom.xml
index 42e9d40..1256166 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,17 @@
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <version>1.6.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.6.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
             <version>1.6.2</version>
         </dependency>
         <dependency>
@@ -75,6 +85,11 @@
             <artifactId>jboss-logging</artifactId>
             <version>3.3.0.Final</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.6</version>
+        </dependency>
         <dependency>
             <groupId>org.jboss.spec.javax.transaction</groupId>
             <artifactId>jboss-transaction-api_1.1_spec</artifactId>
@@ -172,6 +187,8 @@
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
+                    <showWarnings>true</showWarnings>
+                    <showDeprecation>true</showDeprecation>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/src/main/webapp/resources/hibernate.cfg.xml b/src/main/resources/hibernate.cfg.xml
similarity index 100%
rename from src/main/webapp/resources/hibernate.cfg.xml
rename to src/main/resources/hibernate.cfg.xml
diff --git a/src/main/webapp/resources/hibernate.properties b/src/main/resources/hibernate.properties
similarity index 100%
rename from src/main/webapp/resources/hibernate.properties
rename to src/main/resources/hibernate.properties
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
new file mode 100644
index 0000000..15ae367
--- /dev/null
+++ b/src/main/resources/log4j.properties
@@ -0,0 +1,4 @@
+log4j.rootCategory=INFO, console
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%p %c: %m%n
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/dispatcher-servlet.xml b/src/main/webapp/WEB-INF/dispatcher-servlet.xml
index 77c26d3..26d903c 100644
--- a/src/main/webapp/WEB-INF/dispatcher-servlet.xml
+++ b/src/main/webapp/WEB-INF/dispatcher-servlet.xml
@@ -8,9 +8,7 @@
        http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
        http://www.springframework.org/schema/context 
        http://www.springframework.org/schema/context/spring-context-4.2.xsd
-       http://www.springframework.org/schema/tx 
-       http://www.springframework.org/schema/tx/spring-tx-4.2.xsd
-       ">
+    ">
 
     <context:annotation-config/>
 
diff --git a/src/main/webapp/WEB-INF/pages/index.html b/src/main/webapp/WEB-INF/pages/index.html
new file mode 100644
index 0000000..de4a583
--- /dev/null
+++ b/src/main/webapp/WEB-INF/pages/index.html
@@ -0,0 +1,20 @@
+<html>
+<head>
+    <title>Стартовая страница Баг-трекера</title>
+    <!-- Пока css стили тут, нужно вынести отдельно-->
+    <link rel="stylesheet" href="resources/clearcss.css">
+    <link rel="stylesheet" href="resources/index.css">
+
+</head>
+<body>
+<div class="main">
+
+    <div class="header"> Здесь будет заголовок с переходом на главную + кнопки:
+        <button name="create">Войти\Зарегистрироваться</button>
+        <button name="create">FAQ</button>
+        <br>
+
+    </div>
+</div>
+</body>
+</html>
diff --git a/src/main/webapp/WEB-INF/pages/index.jsp b/src/main/webapp/WEB-INF/pages/index.jsp
index 8dfbd92..d294af3 100644
--- a/src/main/webapp/WEB-INF/pages/index.jsp
+++ b/src/main/webapp/WEB-INF/pages/index.jsp
@@ -40,7 +40,8 @@
             (возможно просто два поля в заголовке с кнопками Войти\Зарегистрироваться).<br>
             Пока для проверки добавляется при каждом обновлении страницы задача в список и выводится ее
             toString.<br><br>
-
+            Переделать все ниже на запрос из модели.
+            {$task.service
             <%
                 TaskList.tasks.createTask("Новая задача");
                 for (int i = 0; i < TaskList.tasks.size(); i++) {
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 294f02a..b28513d 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -25,7 +25,6 @@
         <url-pattern>/</url-pattern>
     </servlet-mapping>
 
-
     <session-config>
         <session-timeout>30</session-timeout>
     </session-config>