diff --git a/.gitignore b/.gitignore index 0f182a0..2af7cef 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,24 @@ -*.class +target/ +!.mvn/wrapper/maven-wrapper.jar -# Package Files # -*.jar -*.war -*.ear +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ \ No newline at end of file diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..9cc84ea Binary files /dev/null and b/.mvn/wrapper/maven-wrapper.jar differ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..9dda3b6 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1 @@ +distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.2/apache-maven-3.5.2-bin.zip diff --git a/README.md b/README.md index 28ec3a7..feed056 100644 --- a/README.md +++ b/README.md @@ -5,16 +5,15 @@ java config版本 (developing) Spring与Oauth2的整合示例 项目用Maven管理 +
+Base on Spring-Boot 使用的技术与版本号
  1. JDK (1.8.0_40)
  2. Servlet (3.1.0)
    3. -
  3. Spring (4.1.6.RELEASE)
    4. -
  4. Spring Security (4.0.1.RELEASE)
    5. -
  5. spring-security-oauth2 (2.0.7.RELEASE)
    6. -
  6. Log4j (1.2.14)
    7. +
  7. Spring Boot(1.5.9.RELEASE)
@@ -198,7 +197,6 @@ java config版本 (developing) URL: /unity/user_info Login: Yes (ROLE_UNITY) Data Format: JSON - URL: /m/user_info Login: Yes (ROLE_MOBILE) Data Format: JSON @@ -214,7 +212,6 @@ java config版本 (developing)

  • #93 - 将默认的 oauth_code存入数据库(当前是存入内存)

  • spring-oauth-server project add Bootstrap CSS

  • #95 - Add 'client-details' management; create/delete, show testing links

    • - diff --git a/mvnw b/mvnw new file mode 100644 index 0000000..5bf251c --- /dev/null +++ b/mvnw @@ -0,0 +1,225 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven2 Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Migwn, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" + # TODO classpath? +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +echo $MAVEN_PROJECTBASEDIR +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..019bd74 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,143 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven2 Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" + +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml index 03b0dff..2bcdc5f 100644 --- a/pom.xml +++ b/pom.xml @@ -1,365 +1,97 @@ - 4.0.0 com.monkeyk spring-oauth-server - 0.1-config - spring-oauth-server + 2.0.0 war - Spring Oauth Server - - UTF-8 + ${project.artifactId} + Spring Oauth Server (Spring Boot) - 4.1.6.RELEASE - 4.0.1.RELEASE - 2.0.7.RELEASE - 2.5.4 + + org.springframework.boot + spring-boot-starter-parent + 1.5.9.RELEASE + + - 1.8.6 - - - com.mysql.jdbc.Driver - jdbc:mysql://localhost:3306/oauth2_test?autoReconnect=true&useUnicode=true&characterEncoding=utf8 - andaily - andaily - - false - false + + UTF-8 + UTF-8 + 1.8 - - - shengzhao - shengzhao@shengzhaoli.com - - - - - - - spring-oauth-server - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.2 - - UTF-8 - 1.8 - 1.8 - - - - - maven-war-plugin - 2.6 - - */classes/spring-oauth-server.properties - */classes/spring-oauth-server.properties - - - - ${project.version} - - - ${project.name} - - - ${project.version} - - - - - - - - org.codehaus.mojo - sql-maven-plugin - 1.4 - - - mysql - mysql-connector-java - 5.1.35 - - - - - ${jdbc.driver} - ${jdbc.url} - ${jdbc.user} - ${jdbc.pass} - ${jdbc.execute.skip} - - - - - init db - initialize - - execute - - - ${jdbc.url} - true - - others/database/initial_db.ddl - others/database/oauth.ddl - - continue - - - - - - maven-surefire-plugin - 2.4 - - ${test.skip} - none - - **/*Test.java - - - - jdbc.url - ${jdbc.url} - - - jdbc.username - ${jdbc.user} - - - jdbc.password - ${jdbc.pass} - - - - - - - - - src/main/resources - - **/* - - - - - - - - - - src/test/resources - - **/* - - - - - - - - javax.servlet - javax.servlet-api - 3.1.0 - provided - - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - - - opensymphony - sitemesh - 2.4 - - - org.aspectj - aspectjrt - ${aspectj.version} - compile - - - org.aspectj - aspectjweaver - ${aspectj.version} - compile - - - - commons-dbcp - commons-dbcp - 1.4 - - - commons-lang - commons-lang - 2.6 - - - - commons-io - commons-io - 2.4 - - - - org.springframework - spring-aop - ${spring.version} - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - org.springframework - spring-core - ${spring.version} + org.springframework.boot + spring-boot-starter-security - org.springframework - spring-tx - ${spring.version} + org.springframework.boot + spring-boot-starter-thymeleaf - org.springframework - spring-expression - ${spring.version} + org.springframework.boot + spring-boot-starter-web - org.springframework - spring-web - ${spring.version} - - - org.springframework - spring-webmvc - ${spring.version} - - - org.springframework - spring-context-support - ${spring.version} - - - - org.springframework.security - spring-security-core - ${spring.security.version} - - - org.springframework.security - spring-security-web - ${spring.security.version} - - - org.springframework.security - spring-security-taglibs - ${spring.security.version} - - - - - - - - - - - - - org.springframework.security - spring-security-config - ${spring.security.version} + org.springframework.boot + spring-boot-starter-jdbc + org.springframework.security.oauth spring-security-oauth2 - ${spring.security.oauth.version} - - - - - com.fasterxml.jackson.core - jackson-databind - ${fasterxml.jackson.version} mysql mysql-connector-java - 5.1.6 - compile - - - - - log4j - log4j - 1.2.14 - compile - - - org.slf4j - slf4j-log4j12 - 1.7.5 - compile + runtime - javax.servlet - jstl - 1.1.2 - - - taglibs - standard - 1.1.2 - compile + commons-lang + commons-lang + 2.6 - + - org.springframework - spring-test - ${spring.version} + org.springframework.boot + spring-boot-starter-test test - org.testng - testng - 6.1.1 + org.springframework.security + spring-security-test test - - - junit - junit - - + + + ${project.artifactId} + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + + shengzhao + shengzhao@shengzhaoli.com + + + - \ No newline at end of file + diff --git a/src/main/java/com/monkeyk/sos/config/ContextConfigurer.java b/src/main/java/com/monkeyk/sos/config/ContextConfigurer.java index 35ff483..01f3d6f 100644 --- a/src/main/java/com/monkeyk/sos/config/ContextConfigurer.java +++ b/src/main/java/com/monkeyk/sos/config/ContextConfigurer.java @@ -1,6 +1,5 @@ package com.monkeyk.sos.config; -import org.apache.commons.dbcp.BasicDataSource; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -9,6 +8,7 @@ import org.springframework.context.annotation.PropertySource; import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.DataSourceTransactionManager; +import org.springframework.jdbc.datasource.DriverManagerDataSource; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.annotation.EnableTransactionManagement; @@ -48,18 +48,18 @@ public class ContextConfigurer { @Bean(name = "dataSource") public DataSource dataSource() { - BasicDataSource dataSource = new BasicDataSource(); + DriverManagerDataSource dataSource = new DriverManagerDataSource(); dataSource.setDriverClassName(driverClassName); dataSource.setUrl(jdbcUrl); dataSource.setUsername(jdbcUsername); dataSource.setPassword(jdbcPassword); - dataSource.setValidationQuery("SELECT 1"); - dataSource.setTestOnReturn(false); - dataSource.setTestOnBorrow(true); - - dataSource.setMaxActive(20); - dataSource.setMaxIdle(5); +// dataSource.setValidationQuery("SELECT 1"); +// dataSource.setTestOnReturn(false); +// dataSource.setTestOnBorrow(true); +// +// dataSource.setMaxActive(20); +// dataSource.setMaxIdle(5); return dataSource; } diff --git a/src/main/java/com/monkeyk/sos/config/ServletInitializer.java b/src/main/java/com/monkeyk/sos/config/ServletInitializer.java index 0ee1db5..5e666d1 100644 --- a/src/main/java/com/monkeyk/sos/config/ServletInitializer.java +++ b/src/main/java/com/monkeyk/sos/config/ServletInitializer.java @@ -1,7 +1,6 @@ package com.monkeyk.sos.config; import com.monkeyk.sos.web.filter.CharacterEncodingIPFilter; -import com.opensymphony.sitemesh.webapp.SiteMeshFilter; import org.springframework.web.filter.DelegatingFilterProxy; import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer; import org.springframework.web.util.Log4jConfigListener; @@ -46,8 +45,8 @@ public class ServletInitializer extends AbstractAnnotationConfigDispatcherServle DelegatingFilterProxy securityFilter = new DelegatingFilterProxy("springSecurityFilterChain"); servletContext.addFilter("springSecurityFilterChain", securityFilter).addMappingForUrlPatterns(null, false, "/*"); - SiteMeshFilter siteMeshFilter = new SiteMeshFilter(); - servletContext.addFilter("sitemesh", siteMeshFilter).addMappingForUrlPatterns(null, false, "/*"); +// SiteMeshFilter siteMeshFilter = new SiteMeshFilter(); +// servletContext.addFilter("sitemesh", siteMeshFilter).addMappingForUrlPatterns(null, false, "/*"); //Add Listeners diff --git a/src/test/java/com/monkeyk/sos/ContextTest.java b/src/test/java/com/monkeyk/sos/ContextTest.java index efc0438..0f27159 100644 --- a/src/test/java/com/monkeyk/sos/ContextTest.java +++ b/src/test/java/com/monkeyk/sos/ContextTest.java @@ -1,14 +1,14 @@ package com.monkeyk.sos; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.testng.AbstractTransactionalTestNGSpringContextTests; +import org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests; import org.springframework.test.context.transaction.BeforeTransaction; /** * @author Shengzhao Li */ -@ContextConfiguration(locations = {"classpath:/spring/*.xml"}, initializers = {TestApplicationContextInitializer.class}) -public abstract class ContextTest extends AbstractTransactionalTestNGSpringContextTests { +@ContextConfiguration(locations = {""}, initializers = {TestApplicationContextInitializer.class}) +public abstract class ContextTest extends AbstractTransactionalJUnit4SpringContextTests { @BeforeTransaction public void beforeTest() { diff --git a/src/test/java/com/monkeyk/sos/infrastructure/DateUtilsTest.java b/src/test/java/com/monkeyk/sos/infrastructure/DateUtilsTest.java index 1edec67..f86237c 100644 --- a/src/test/java/com/monkeyk/sos/infrastructure/DateUtilsTest.java +++ b/src/test/java/com/monkeyk/sos/infrastructure/DateUtilsTest.java @@ -11,14 +11,15 @@ */ package com.monkeyk.sos.infrastructure; -import org.testng.annotations.Test; + +import org.junit.Test; import java.sql.Timestamp; import java.time.LocalDate; import java.time.LocalDateTime; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; +import static org.junit.Assert.*; + /* * @author Shengzhao Li diff --git a/src/test/java/com/monkeyk/sos/infrastructure/PasswordHandlerTest.java b/src/test/java/com/monkeyk/sos/infrastructure/PasswordHandlerTest.java index 8f40670..e533215 100644 --- a/src/test/java/com/monkeyk/sos/infrastructure/PasswordHandlerTest.java +++ b/src/test/java/com/monkeyk/sos/infrastructure/PasswordHandlerTest.java @@ -1,8 +1,9 @@ package com.monkeyk.sos.infrastructure; -import org.testng.annotations.Test; -import static org.testng.Assert.*; +import org.junit.Test; + +import static org.junit.Assert.assertNotNull; /* * @author Shengzhao Li diff --git a/src/test/java/com/monkeyk/sos/infrastructure/jdbc/OauthRepositoryJdbcTest.java b/src/test/java/com/monkeyk/sos/infrastructure/jdbc/OauthRepositoryJdbcTest.java index b6a2f9f..dcdd731 100644 --- a/src/test/java/com/monkeyk/sos/infrastructure/jdbc/OauthRepositoryJdbcTest.java +++ b/src/test/java/com/monkeyk/sos/infrastructure/jdbc/OauthRepositoryJdbcTest.java @@ -15,12 +15,14 @@ import com.monkeyk.sos.domain.oauth.OauthClientDetails; import com.monkeyk.sos.domain.oauth.OauthRepository; import com.monkeyk.sos.domain.shared.GuidGenerator; import com.monkeyk.sos.infrastructure.AbstractRepositoryTest; +import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.testng.annotations.Test; + import java.util.List; -import static org.testng.Assert.*; +import static org.junit.Assert.*; + /* * @author Shengzhao Li diff --git a/src/test/java/com/monkeyk/sos/infrastructure/jdbc/UserRepositoryJdbcTest.java b/src/test/java/com/monkeyk/sos/infrastructure/jdbc/UserRepositoryJdbcTest.java index 7d871e4..5160f93 100644 --- a/src/test/java/com/monkeyk/sos/infrastructure/jdbc/UserRepositoryJdbcTest.java +++ b/src/test/java/com/monkeyk/sos/infrastructure/jdbc/UserRepositoryJdbcTest.java @@ -14,14 +14,14 @@ package com.monkeyk.sos.infrastructure.jdbc; import com.monkeyk.sos.domain.user.User; import com.monkeyk.sos.domain.user.UserRepository; import com.monkeyk.sos.infrastructure.AbstractRepositoryTest; +import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.testng.annotations.Test; + import java.util.List; -import static org.testng.AssertJUnit.assertEquals; -import static org.testng.AssertJUnit.assertNotNull; -import static org.testng.AssertJUnit.assertNull; +import static org.junit.Assert.*; + /* * @author Shengzhao Li @@ -97,7 +97,7 @@ public class UserRepositoryJdbcTest extends AbstractRepositoryTest { /* * Run the test must initial db firstly * */ - @Test(enabled = false) +// @Test() public void testPrivilege() { String guid = "55b713df1c6f423e842ad68668523c49";