Skip to content

Commit c514654

Browse files
viczianivicziani
committed
Verzióemelések
1 parent 1383747 commit c514654

File tree

9 files changed

+43
-53
lines changed

9 files changed

+43
-53
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Ez a program a JTechLog (<http://jtechlog.blogspot.com>) blog "Spring Security"
55
Prezentálja a autorizációt és autentikációt. Kétrétegű alkalmazás, JPA perzisztens réteggel és Spring MVC
66
web réteggel. Maven-nel build-elhető, és a letöltést követően a 'mvn jetty:run' paranccsal futtatható.
77

8-
Felhasznált technológiák: Spring 3.0.6, Spring Security 3.0.7, JSP 2.2, JSTL 1.1.2, JPA 2.0, Hibernate 3.6.8,
9-
HSQLDB 2.2.4, SLF4J 1.6.4, Maven 3.0.3, Jetty 8.0.4
8+
Felhasznált technológiák: Spring 3.2.6, Spring Security 3.2.0, JSP 2.3.1, JSTL 1.2, JPA 2.1, Hibernate 4.3.0,
9+
HSQLDB 2.3.1, SLF4J 1.7.5, Maven 3.0.3, Jetty 9.1.0
1010

1111
viczian.istvan a gmail-en

‎pom.xml

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
44
<modelVersion>4.0.0</modelVersion>
5+
56
<groupId>jtechlog.jtechlog-spring-security</groupId>
67
<artifactId>jtechlog-spring-security</artifactId>
78
<packaging>war</packaging>
89
<version>1.0-SNAPSHOT</version>
9-
<name>jtechlog-spring-security</name>
10-
<description>JTechLog Spring Security tutorial.</description>
10+
11+
<name>${project.artifactId}</name>
1112
<url>http://jtechlog.blogspot.com</url>
12-
<inceptionYear>2011</inceptionYear>
13+
<inceptionYear>2011 - 2014</inceptionYear>
1314

1415
<developers>
1516
<developer>
@@ -24,22 +25,22 @@
2425

2526
<properties>
2627
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
27-
<spring.version>3.0.6.RELEASE</spring.version>
28-
<spring.security.version>3.0.7.RELEASE</spring.security.version>
28+
<spring.version>3.2.6.RELEASE</spring.version>
29+
<spring.security.version>3.2.0.RELEASE</spring.security.version>
30+
<slf4j.version>1.7.5</slf4j.version>
2931
</properties>
3032

3133
<dependencies>
3234
<dependency>
3335
<groupId>javax.servlet.jsp</groupId>
34-
<artifactId>jsp-api</artifactId>
35-
<version>2.2</version>
36-
<scope>provided</scope>
36+
<artifactId>javax.servlet.jsp-api</artifactId>
37+
<version>2.3.1</version>
3738
</dependency>
3839

3940
<dependency>
4041
<groupId>javax.servlet</groupId>
4142
<artifactId>jstl</artifactId>
42-
<version>1.1.2</version>
43+
<version>1.2</version>
4344
</dependency>
4445

4546
<dependency>
@@ -117,37 +118,37 @@
117118
<dependency>
118119
<groupId>org.hibernate</groupId>
119120
<artifactId>hibernate-entitymanager</artifactId>
120-
<version>3.6.8.Final</version>
121+
<version>4.3.0.Final</version>
121122
</dependency>
122123

123124
<dependency>
124125
<groupId>org.hibernate.javax.persistence</groupId>
125-
<artifactId>hibernate-jpa-2.0-api</artifactId>
126-
<version>1.0.1.Final</version>
126+
<artifactId>hibernate-jpa-2.1-api</artifactId>
127+
<version>1.0.0.Final</version>
127128
</dependency>
128129

129130
<dependency>
130131
<groupId>org.hsqldb</groupId>
131132
<artifactId>hsqldb</artifactId>
132-
<version>2.2.4</version>
133+
<version>2.3.1</version>
133134
</dependency>
134135

135136
<dependency>
136137
<groupId>org.slf4j</groupId>
137138
<artifactId>slf4j-api</artifactId>
138-
<version>1.6.4</version>
139+
<version>${slf4j.version}</version>
139140
</dependency>
140-
141+
141142
<dependency>
142143
<groupId>org.slf4j</groupId>
143-
<artifactId>slf4j-log4j12</artifactId>
144-
<version>1.6.4</version>
145-
</dependency>
144+
<artifactId>slf4j-simple</artifactId>
145+
<version>${slf4j.version}</version>
146+
</dependency>
146147

147148
<dependency>
148149
<groupId>junit</groupId>
149150
<artifactId>junit</artifactId>
150-
<version>4.10</version>
151+
<version>4.11</version>
151152
<scope>test</scope>
152153
</dependency>
153154

@@ -158,33 +159,33 @@
158159
<plugin>
159160
<groupId>org.apache.maven.plugins</groupId>
160161
<artifactId>maven-compiler-plugin</artifactId>
161-
<version>2.3.2</version>
162+
<version>3.1</version>
162163
<configuration>
163-
<source>1.6</source>
164-
<target>1.6</target>
164+
<source>1.7</source>
165+
<target>1.7</target>
165166
<encoding>UTF-8</encoding>
166167
</configuration>
167168
</plugin>
168169
<plugin>
169170
<groupId>org.apache.maven.plugins</groupId>
170171
<artifactId>maven-resources-plugin</artifactId>
171-
<version>2.5</version>
172+
<version>2.6</version>
172173
<configuration>
173174
<encoding>UTF-8</encoding>
174175
</configuration>
175176
</plugin>
176177
<plugin>
177178
<groupId>org.apache.maven.plugins</groupId>
178179
<artifactId>maven-war-plugin</artifactId>
179-
<version>2.1.1</version>
180+
<version>2.4</version>
180181
<configuration>
181182
<failOnMissingWebXml>false</failOnMissingWebXml>
182183
</configuration>
183184
</plugin>
184185
<plugin>
185-
<groupId>org.mortbay.jetty</groupId>
186+
<groupId>org.eclipse.jetty</groupId>
186187
<artifactId>jetty-maven-plugin</artifactId>
187-
<version>8.0.4.v20111024</version>
188+
<version>9.1.0.v20131115</version>
188189
</plugin>
189190
</plugins>
190191
</build>

‎src/main/java/jtechlog/springsecurity/service/DefaultUserService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public UserDetails loadUserByUsername(String username) throws UsernameNotFoundEx
3636

3737
@Override
3838
public List<User> listUsers() {
39-
return entityManager.createQuery("select u from User u").getResultList();
39+
return entityManager.createQuery("select u from User u", User.class).getResultList();
4040
}
4141

4242
@Override

‎src/main/java/jtechlog/springsecurity/service/User.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import javax.persistence.Id;
99
import javax.persistence.Table;
1010
import org.springframework.security.core.GrantedAuthority;
11-
import org.springframework.security.core.authority.GrantedAuthorityImpl;
11+
import org.springframework.security.core.authority.SimpleGrantedAuthority;
1212
import org.springframework.security.core.userdetails.UserDetails;
1313

1414
/**
@@ -37,9 +37,9 @@ public User(String username, String password, String roles) {
3737

3838
@Override
3939
public Collection<GrantedAuthority> getAuthorities() {
40-
Collection<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>();
40+
Collection<GrantedAuthority> authorities = new ArrayList<>();
4141
for (String s: roles.split(", ")) {
42-
authorities.add(new GrantedAuthorityImpl("ROLE_" + s.toUpperCase()));
42+
authorities.add(new SimpleGrantedAuthority("ROLE_" + s.toUpperCase()));
4343
}
4444
return authorities;
4545
}

‎src/main/resources/log4j.properties

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

‎src/main/webapp/WEB-INF/applicationContext-security.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<beans:beans xmlns="http://www.springframework.org/schema/security"
3-
xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
5-
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.0.xsd">
3+
xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
5+
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd">
66

77
<global-method-security pre-post-annotations="enabled" />
88

‎src/main/webapp/WEB-INF/applicationContext-servlet.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xmlns:context="http://www.springframework.org/schema/context"
55
xmlns:p="http://www.springframework.org/schema/p"
6-
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
7-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
6+
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
7+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd">
88

99
<context:annotation-config/>
1010

‎src/main/webapp/WEB-INF/applicationContext.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22
<beans xmlns="http://www.springframework.org/schema/beans"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xmlns:context="http://www.springframework.org/schema/context"
5-
xmlns:p="http://www.springframework.org/schema/p"
65
xmlns:tx="http://www.springframework.org/schema/tx"
76
xmlns:jdbc="http://www.springframework.org/schema/jdbc"
8-
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
9-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
10-
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
11-
http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd">
7+
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
8+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd
9+
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.2.xsd
10+
http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.2.xsd">
1211

1312
<context:annotation-config/>
1413

‎src/main/webapp/WEB-INF/web.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<web-app version="2.5" 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/web-app_2_5.xsd">
2+
<web-app version="3.0" 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/web-app_3_0.xsd">
33
<display-name>JTechLog Spring Security tutorial</display-name>
44

55
<context-param>

0 commit comments

Comments
 (0)