iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup work

Browse Source
This commit is contained in:
eugenp 2015-10-26 14:59:43 +02:00
parent 1ef53e2f68
commit 1da86e7c83
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
httpclient/src/test/java/org/baeldung/httpclient/sec/HttpClientAuthLiveTest.java
View File

@ -32,7 +32,7 @@ import org.junit.Test;
public class HttpClientAuthLiveTest { public class HttpClientAuthLiveTest {
private static final String URL_SECURED_BY_BASIC_AUTHENTICATION = "http://localhost:8080/spring-security-rest-basic-auth/api/foos/1"; private static final String URL_SECURED_BY_BASIC_AUTHENTICATION = "http://localhost:8081/spring-security-rest-basic-auth/api/foos/1";
private static final String DEFAULT_USER = "user1"; private static final String DEFAULT_USER = "user1";
private static final String DEFAULT_PASS = "user1Pass"; private static final String DEFAULT_PASS = "user1Pass";
@ -99,7 +99,7 @@ public class HttpClientAuthLiveTest {
public final void givenAuthorizationHeaderIsSetManually_whenExecutingGetRequest_thenSuccess2() throws ClientProtocolException, IOException { public final void givenAuthorizationHeaderIsSetManually_whenExecutingGetRequest_thenSuccess2() throws ClientProtocolException, IOException {
final HttpGet request = new HttpGet(URL_SECURED_BY_BASIC_AUTHENTICATION); final HttpGet request = new HttpGet(URL_SECURED_BY_BASIC_AUTHENTICATION);
final String auth = DEFAULT_USER + ":" + DEFAULT_PASS; final String auth = DEFAULT_USER + ":" + DEFAULT_PASS;
final byte[] encodedAuth = Base64.encodeBase64(auth.getBytes(Charset.forName("US-ASCII"))); final byte[] encodedAuth = Base64.encodeBase64(auth.getBytes(Charset.forName("ISO-8859-1")));
final String authHeader = "Basic " + new String(encodedAuth); final String authHeader = "Basic " + new String(encodedAuth);
request.setHeader(HttpHeaders.AUTHORIZATION, authHeader); request.setHeader(HttpHeaders.AUTHORIZATION, authHeader);
@ -139,7 +139,7 @@ public class HttpClientAuthLiveTest {
private final String authorizationHeader(final String username, final String password) { private final String authorizationHeader(final String username, final String password) {
final String auth = username + ":" + password; final String auth = username + ":" + password;
final byte[] encodedAuth = Base64.encodeBase64(auth.getBytes(Charset.forName("US-ASCII"))); final byte[] encodedAuth = Base64.encodeBase64(auth.getBytes(Charset.forName("ISO-8859-1")));
final String authHeader = "Basic " + new String(encodedAuth); final String authHeader = "Basic " + new String(encodedAuth);
return authHeader; return authHeader;

6
spring-katharsis/.project
View File

@ -5,6 +5,11 @@
<projects> <projects>
</projects> </projects>
<buildSpec> <buildSpec>
<buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name> <name>org.eclipse.jdt.core.javabuilder</name>
<arguments> <arguments>
@ -25,5 +30,6 @@
<nature>org.springframework.ide.eclipse.core.springnature</nature> <nature>org.springframework.ide.eclipse.core.springnature</nature>
<nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
</natures> </natures>
</projectDescription> </projectDescription>

12
spring-security-rest-basic-auth/pom.xml
View File

@ -287,7 +287,7 @@
<properties> <properties>
<!-- Spring --> <!-- Spring -->
<org.springframework.version>4.2.0.RELEASE</org.springframework.version> <org.springframework.version>4.2.2.RELEASE</org.springframework.version>
<org.springframework.security.version>4.0.2.RELEASE</org.springframework.security.version> <org.springframework.security.version>4.0.2.RELEASE</org.springframework.security.version>
<!-- persistence --> <!-- persistence -->
@ -295,8 +295,8 @@
<mysql-connector-java.version>5.1.36</mysql-connector-java.version> <mysql-connector-java.version>5.1.36</mysql-connector-java.version>
<!-- http --> <!-- http -->
<httpcore.version>4.4.1</httpcore.version> <httpcore.version>4.4.3</httpcore.version>
<httpclient.version>4.5</httpclient.version> <httpclient.version>4.5.1</httpclient.version>
<!-- logging --> <!-- logging -->
<org.slf4j.version>1.7.12</org.slf4j.version> <org.slf4j.version>1.7.12</org.slf4j.version>
@ -314,13 +314,13 @@
<junit.version>4.11</junit.version> <junit.version>4.11</junit.version>
<mockito.version>1.10.19</mockito.version> <mockito.version>1.10.19</mockito.version>
<rest-assured.version>2.4.1</rest-assured.version> <rest-assured.version>2.6.0</rest-assured.version>
<!-- Maven plugins --> <!-- Maven plugins -->
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version> <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
<maven-war-plugin.version>2.6</maven-war-plugin.version> <maven-war-plugin.version>2.6</maven-war-plugin.version>
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version> <maven-surefire-plugin.version>2.19</maven-surefire-plugin.version>
<cargo-maven2-plugin.version>1.4.15</cargo-maven2-plugin.version> <cargo-maven2-plugin.version>1.4.16</cargo-maven2-plugin.version>
</properties> </properties>

4
spring-security-rest-basic-auth/src/main/resources/webSecurityConfig.xml
View File

@ -2,9 +2,9 @@
<beans:beans xmlns="http://www.springframework.org/schema/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" <beans:beans xmlns="http://www.springframework.org/schema/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation=" xsi:schemaLocation="
http://www.springframework.org/schema/security http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security-3.2.xsd http://www.springframework.org/schema/security/spring-security-4.0.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-4.1.xsd" http://www.springframework.org/schema/beans/spring-beans-4.2.xsd"
> >
<http create-session="stateless" use-expressions="true"> <http create-session="stateless" use-expressions="true">