Add a Codacy badge to README.md

.gitignore

@@ -3,6 +3,4 @@ out
 target
 *.iml
 log
-
-
-
+*.patch

README.md

@@ -1,6 +1,8 @@
 Java Enterprise Online Project 
 ===============================
 
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/8a98f01de40c4bf08c7aac306bb30f92)](https://www.codacy.com/app/max402/topjava09?utm_source=github.com&utm_medium=referral&utm_content=max402/topjava09&utm_campaign=badger)
+
 Наиболее востребованные технологии /инструменты / фреймворки Java Enterprise:
 Maven/ Spring/ Security/ JPA(Hibernate)/ REST(Jackson)/ Bootstrap(CSS)/ jQuery + plugins.
 

config/setenv.bat

@@ -0,0 +1,4 @@
+rem run tomcat with JMX ability
+rem Run Tomcat as admin
+rem for remote connection add -Djava.rmi.server.hostname=TomcatServer_IP
+set CATALINA_OPTS=-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false

config/setenv.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# run tomcat with JMX ability as admin
+# for remote connection add -Djava.rmi.server.hostname=TomcatServer_IP
+export CATALINA_OPTS="-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false"

pom.xml

@@ -4,7 +4,7 @@
 
  <groupId>ru.javawebinar</groupId>
  <artifactId>topjava</artifactId>
- <packaging>jar</packaging>
+ <packaging>war</packaging>
 
  <version>1.0-SNAPSHOT</version>
 
@@ -15,11 +15,22 @@
  <java.version>1.8</java.version>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+ <spring.version>4.3.4.RELEASE</spring.version>
+
+ <!-- Logging -->
+ <logback.version>1.1.7</logback.version>
+ <slf4j.version>1.7.21</slf4j.version>
+
+ <!--DB-->
+ <postgresql.version>9.4.1212</postgresql.version>
+ <!-- Tests -->
+ <junit.version>4.12</junit.version>
  </properties>
 
  <build>
  <finalName>topjava</finalName>
- <defaultGoal>install</defaultGoal>
+ <defaultGoal>package</defaultGoal>
  <plugins>
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
@@ -30,10 +41,93 @@
  <target>${java.version}</target>
  </configuration>
  </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.19.1</version>
+ <configuration>
+ <argLine>-Dfile.encoding=UTF-8</argLine>
+ </configuration>
+ </plugin>
  </plugins>
  </build>
 
  <dependencies>
+ <!-- Logging with SLF4J & LogBack -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>${logback.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- Spring -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+
+ <!--DataBase-->
+ <dependency>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>${postgresql.version}</version>
+ </dependency>
+
+ <!--Web-->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.2</version>
+ </dependency>
+
+ <!--Test-->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${spring.version}</version>
+ <scope>test</scope>
+ </dependency>
+
  </dependencies>
 
  <profiles>

src/main/java/ru/javawebinar/topjava/AuthorizedUser.java

@@ -0,0 +1,24 @@
+package ru.javawebinar.topjava;
+
+import ru.javawebinar.topjava.model.BaseEntity;
+import ru.javawebinar.topjava.util.MealsUtil;
+
+/**
+ * GKislin
+ * 06.03.2015.
+ */
+public class AuthorizedUser {
+ public static int id = BaseEntity.START_SEQ;
+
+ public static int id() {
+ return id;
+ }
+
+ public static void setId(int id) {
+ AuthorizedUser.id = id;
+ }
+
+ public static int getCaloriesPerDay() {
+ return MealsUtil.DEFAULT_CALORIES_PER_DAY;
+ }
+}

src/main/java/ru/javawebinar/topjava/model/BaseEntity.java

@@ -0,0 +1,48 @@
+package ru.javawebinar.topjava.model;
+
+/**
+ * User: gkislin
+ * Date: 22.08.2014
+ */
+public class BaseEntity {
+ public static final int START_SEQ = 100000;
+
+ protected Integer id;
+
+ public BaseEntity() {
+ }
+
+ protected BaseEntity(Integer id) {
+ this.id = id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public boolean isNew() {
+ return (this.id == null);
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ BaseEntity that = (BaseEntity) o;
+ return id != null && id.equals(that.id);
+ }
+
+ @Override
+ public int hashCode() {
+ return (id == null) ? 0 : id;
+ }
+
+}

src/main/java/ru/javawebinar/topjava/model/Meal.java

@@ -0,0 +1,58 @@
+package ru.javawebinar.topjava.model;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+
+/**
+ * GKislin
+ * 11.01.2015.
+ */
+public class Meal extends BaseEntity {
+ private final LocalDateTime dateTime;
+
+ private final String description;
+
+ private final int calories;
+
+ public Meal(LocalDateTime dateTime, String description, int calories) {
+ this(null, dateTime, description, calories);
+ }
+
+ public Meal(Integer id, LocalDateTime dateTime, String description, int calories) {
+ super(id);
+ this.dateTime = dateTime;
+ this.description = description;
+ this.calories = calories;
+ }
+
+ public LocalDateTime getDateTime() {
+ return dateTime;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public int getCalories() {
+ return calories;
+ }
+
+ public LocalDate getDate() {
+ return dateTime.toLocalDate();
+ }
+
+ public LocalTime getTime() {
+ return dateTime.toLocalTime();
+ }
+
+ @Override
+ public String toString() {
+ return "Meal{" +
+ "id=" + id +
+ ", dateTime=" + dateTime +
+ ", description='" + description + '\'' +
+ ", calories=" + calories +
+ '}';
+ }
+}

src/main/java/ru/javawebinar/topjava/model/NamedEntity.java

@@ -0,0 +1,31 @@
+package ru.javawebinar.topjava.model;
+
+/**
+ * User: gkislin
+ * Date: 22.08.2014
+ */
+public class NamedEntity extends BaseEntity {
+
+ protected String name;
+
+ public NamedEntity() {
+ }
+
+ protected NamedEntity(Integer id, String name) {
+ super(id);
+ this.name = name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getName() {
+ return this.name;
+ }
+
+ @Override
+ public String toString() {
+ return name;
+ }
+}

src/main/java/ru/javawebinar/topjava/model/Role.java

@@ -0,0 +1,10 @@
+package ru.javawebinar.topjava.model;
+
+/**
+ * User: gkislin
+ * Date: 22.08.2014
+ */
+public enum Role {
+ ROLE_USER,
+ ROLE_ADMIN
+}