Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 49594e4

Browse files
author
Eugen Paraschiv
committed
initial cleanup
1 parent 359b925 commit 49594e4

File tree

7 files changed

+142
-324
lines changed

7 files changed

+142
-324
lines changed

‎guava/.classpath‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,14 @@
2222
<attribute name="maven.pomderived" value="true"/>
2323
</attributes>
2424
</classpathentry>
25-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
25+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
2626
<attributes>
2727
<attribute name="maven.pomderived" value="true"/>
2828
</attributes>
2929
</classpathentry>
30-
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
30+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
3131
<attributes>
3232
<attribute name="maven.pomderived" value="true"/>
33-
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
3433
</attributes>
3534
</classpathentry>
3635
<classpathentry kind="output" path="target/classes"/>

‎guava/.project‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,13 @@
2020
<arguments>
2121
</arguments>
2222
</buildCommand>
23-
<buildCommand>
24-
<name>org.springframework.ide.eclipse.core.springbuilder</name>
25-
<arguments>
26-
</arguments>
27-
</buildCommand>
2823
<buildCommand>
2924
<name>org.eclipse.m2e.core.maven2Builder</name>
3025
<arguments>
3126
</arguments>
3227
</buildCommand>
3328
</buildSpec>
3429
<natures>
35-
<nature>org.springframework.ide.eclipse.core.springnature</nature>
3630
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
3731
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
3832
<nature>org.eclipse.jdt.core.javanature</nature>

‎guava/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
55
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
66
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
77
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
8-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
8+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
99
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
10-
org.eclipse.jdt.core.compiler.compliance=1.7
10+
org.eclipse.jdt.core.compiler.compliance=1.5
1111
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
1212
org.eclipse.jdt.core.compiler.debug.localVariable=generate
1313
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -92,4 +92,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
9292
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
9393
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
9494
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
95-
org.eclipse.jdt.core.compiler.source=1.7
95+
org.eclipse.jdt.core.compiler.source=1.5

‎guava/pom.xml‎

Lines changed: 137 additions & 156 deletions
Original file line numberDiff line numberDiff line change
@@ -1,158 +1,139 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2-
<modelVersion>4.0.0</modelVersion>
3-
<groupId>org.baeldung</groupId>
4-
<artifactId>spring-rest</artifactId>
5-
<version>0.1-SNAPSHOT</version>
6-
7-
<name>spring-rest</name>
8-
<packaging>war</packaging>
9-
10-
<dependencies>
11-
12-
<!-- Spring -->
13-
14-
<dependency>
15-
<groupId>org.springframework</groupId>
16-
<artifactId>spring-web</artifactId>
17-
<version>${org.springframework.version}</version>
18-
</dependency>
19-
<dependency>
20-
<groupId>org.springframework</groupId>
21-
<artifactId>spring-webmvc</artifactId>
22-
<version>${org.springframework.version}</version>
23-
</dependency>
24-
25-
<!-- web -->
26-
27-
<dependency>
28-
<groupId>javax.servlet</groupId>
29-
<artifactId>javax.servlet-api</artifactId>
30-
<version>3.0.1</version>
31-
<scope>provided</scope>
32-
</dependency>
33-
34-
<dependency>
35-
<groupId>javax.servlet</groupId>
36-
<artifactId>jstl</artifactId>
37-
<version>1.2</version>
38-
<scope>runtime</scope>
39-
</dependency>
40-
41-
<!-- test scoped -->
42-
43-
<dependency>
44-
<groupId>junit</groupId>
45-
<artifactId>junit-dep</artifactId>
46-
<version>${junit.version}</version>
47-
<scope>test</scope>
48-
</dependency>
49-
50-
<dependency>
51-
<groupId>org.hamcrest</groupId>
52-
<artifactId>hamcrest-core</artifactId>
53-
<version>${org.hamcrest.version}</version>
54-
<scope>test</scope>
55-
</dependency>
56-
<dependency>
57-
<groupId>org.hamcrest</groupId>
58-
<artifactId>hamcrest-library</artifactId>
59-
<version>${org.hamcrest.version}</version>
60-
<scope>test</scope>
61-
</dependency>
62-
63-
<dependency>
64-
<groupId>org.mockito</groupId>
65-
<artifactId>mockito-core</artifactId>
66-
<version>${mockito.version}</version>
67-
<scope>test</scope>
68-
</dependency>
69-
70-
</dependencies>
71-
72-
<build>
73-
<finalName>spring-rest</finalName>
74-
<resources>
75-
<resource>
76-
<directory>src/main/resources</directory>
77-
<filtering>true</filtering>
78-
</resource>
79-
</resources>
80-
81-
<plugins>
82-
83-
<plugin>
84-
<groupId>org.apache.maven.plugins</groupId>
85-
<artifactId>maven-surefire-plugin</artifactId>
86-
<version>${maven-surefire-plugin.version}</version>
87-
<configuration>
88-
<excludes>
89-
<!-- <exclude>**/*ProductionTest.java</exclude> -->
90-
</excludes>
91-
<systemPropertyVariables>
92-
<!-- <provPersistenceTarget>h2</provPersistenceTarget> -->
93-
</systemPropertyVariables>
94-
</configuration>
95-
</plugin>
96-
97-
<plugin>
98-
<groupId>org.codehaus.cargo</groupId>
99-
<artifactId>cargo-maven2-plugin</artifactId>
100-
<version>${cargo-maven2-plugin.version}</version>
101-
<configuration>
102-
<wait>true</wait>
103-
<container>
104-
<containerId>jetty8x</containerId>
105-
<type>embedded</type>
106-
<systemProperties>
107-
<!-- <provPersistenceTarget>cargo</provPersistenceTarget> -->
108-
</systemProperties>
109-
</container>
110-
<configuration>
111-
<properties>
112-
<cargo.servlet.port>8082</cargo.servlet.port>
113-
</properties>
114-
</configuration>
115-
</configuration>
116-
</plugin>
117-
118-
</plugins>
119-
120-
</build>
121-
122-
<properties>
123-
<!-- Spring -->
124-
<org.springframework.version>3.2.4.RELEASE</org.springframework.version>
125-
<org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
126-
127-
<!-- persistence -->
128-
<hibernate.version>4.2.4.Final</hibernate.version>
129-
<mysql-connector-java.version>5.1.26</mysql-connector-java.version>
130-
131-
<!-- logging -->
132-
<org.slf4j.version>1.7.5</org.slf4j.version>
133-
<logback.version>1.0.11</logback.version>
134-
135-
<!-- various -->
136-
<hibernate-validator.version>5.0.1.Final</hibernate-validator.version>
137-
138-
<!-- util -->
139-
<guava.version>14.0.1</guava.version>
140-
<commons-lang3.version>3.1</commons-lang3.version>
141-
142-
<!-- testing -->
143-
<org.hamcrest.version>1.3</org.hamcrest.version>
144-
<junit.version>4.11</junit.version>
145-
<mockito.version>1.9.5</mockito.version>
146-
147-
<httpcore.version>4.2.4</httpcore.version>
148-
<httpclient.version>4.2.5</httpclient.version>
149-
150-
<rest-assured.version>1.8.1</rest-assured.version>
151-
<groovy.version>1.8.9</groovy.version>
152-
153-
<!-- Maven plugins -->
154-
<cargo-maven2-plugin.version>1.4.3</cargo-maven2-plugin.version>
155-
<maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
156-
</properties>
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>org.baeldung</groupId>
5+
<artifactId>spring-rest</artifactId>
6+
<version>0.1-SNAPSHOT</version>
7+
8+
<name>spring-rest</name>
9+
10+
<dependencies>
11+
12+
<!-- utils -->
13+
14+
<dependency>
15+
<groupId>com.google.guava</groupId>
16+
<artifactId>guava</artifactId>
17+
<version>15.0</version>
18+
</dependency>
19+
20+
<!-- web -->
21+
22+
<!-- test scoped -->
23+
24+
<dependency>
25+
<groupId>junit</groupId>
26+
<artifactId>junit-dep</artifactId>
27+
<version>${junit.version}</version>
28+
<scope>test</scope>
29+
</dependency>
30+
31+
<dependency>
32+
<groupId>org.hamcrest</groupId>
33+
<artifactId>hamcrest-core</artifactId>
34+
<version>${org.hamcrest.version}</version>
35+
<scope>test</scope>
36+
</dependency>
37+
<dependency>
38+
<groupId>org.hamcrest</groupId>
39+
<artifactId>hamcrest-library</artifactId>
40+
<version>${org.hamcrest.version}</version>
41+
<scope>test</scope>
42+
</dependency>
43+
44+
<dependency>
45+
<groupId>org.mockito</groupId>
46+
<artifactId>mockito-core</artifactId>
47+
<version>${mockito.version}</version>
48+
<scope>test</scope>
49+
</dependency>
50+
51+
</dependencies>
52+
53+
<build>
54+
<finalName>spring-rest</finalName>
55+
<resources>
56+
<resource>
57+
<directory>src/main/resources</directory>
58+
<filtering>true</filtering>
59+
</resource>
60+
</resources>
61+
62+
<plugins>
63+
64+
<plugin>
65+
<groupId>org.apache.maven.plugins</groupId>
66+
<artifactId>maven-surefire-plugin</artifactId>
67+
<version>${maven-surefire-plugin.version}</version>
68+
<configuration>
69+
<excludes>
70+
<!-- <exclude>**/*ProductionTest.java</exclude> -->
71+
</excludes>
72+
<systemPropertyVariables>
73+
<!-- <provPersistenceTarget>h2</provPersistenceTarget> -->
74+
</systemPropertyVariables>
75+
</configuration>
76+
</plugin>
77+
78+
<plugin>
79+
<groupId>org.codehaus.cargo</groupId>
80+
<artifactId>cargo-maven2-plugin</artifactId>
81+
<version>${cargo-maven2-plugin.version}</version>
82+
<configuration>
83+
<wait>true</wait>
84+
<container>
85+
<containerId>jetty8x</containerId>
86+
<type>embedded</type>
87+
<systemProperties>
88+
<!-- <provPersistenceTarget>cargo</provPersistenceTarget> -->
89+
</systemProperties>
90+
</container>
91+
<configuration>
92+
<properties>
93+
<cargo.servlet.port>8082</cargo.servlet.port>
94+
</properties>
95+
</configuration>
96+
</configuration>
97+
</plugin>
98+
99+
</plugins>
100+
101+
</build>
102+
103+
<properties>
104+
<!-- Spring -->
105+
<org.springframework.version>3.2.4.RELEASE</org.springframework.version>
106+
<org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
107+
108+
<!-- persistence -->
109+
<hibernate.version>4.2.4.Final</hibernate.version>
110+
<mysql-connector-java.version>5.1.26</mysql-connector-java.version>
111+
112+
<!-- logging -->
113+
<org.slf4j.version>1.7.5</org.slf4j.version>
114+
<logback.version>1.0.11</logback.version>
115+
116+
<!-- various -->
117+
<hibernate-validator.version>5.0.1.Final</hibernate-validator.version>
118+
119+
<!-- util -->
120+
<guava.version>15.0</guava.version>
121+
<commons-lang3.version>3.1</commons-lang3.version>
122+
123+
<!-- testing -->
124+
<org.hamcrest.version>1.3</org.hamcrest.version>
125+
<junit.version>4.11</junit.version>
126+
<mockito.version>1.9.5</mockito.version>
127+
128+
<httpcore.version>4.2.4</httpcore.version>
129+
<httpclient.version>4.2.5</httpclient.version>
130+
131+
<rest-assured.version>1.8.1</rest-assured.version>
132+
<groovy.version>1.8.9</groovy.version>
133+
134+
<!-- Maven plugins -->
135+
<cargo-maven2-plugin.version>1.4.3</cargo-maven2-plugin.version>
136+
<maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
137+
</properties>
157138

158139
</project>

‎guava/src/main/java/org/baeldung/config/MvcConfig.java‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)