Skip to content

Commit b3c65c7

Browse files
phasenraum2010phasenraum2010
authored
Merge pull request #227 from phasenraum2010/master
Release 1.0.21
2 parents 582abd0 + 8914d9e commit b3c65c7

File tree

245 files changed

+8373
-3759
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

245 files changed

+8373
-3759
lines changed

‎.gitignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@ buildNumber.properties
1515
*.iml
1616
twitterwall.log
1717
twitterwall.log*
18+
maven-build.log
19+
maven-build.log.txt
20+
maven-testing.log.txt
21+
spring-boot.log.txt
22+
maven-testing-site.log.txt
23+
test.log.txt
1824
docs2
1925
.bundle
2026
.sass-cache

‎.mvn/wrapper/maven-wrapper.jar‎

100644100755
-1.85 KB
Binary file not shown.

‎.mvn/wrapper/maven-wrapper.properties‎

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip
1+
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip

‎mvnw‎

Lines changed: 43 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -54,38 +54,16 @@ case "`uname`" in
5454
CYGWIN*) cygwin=true ;;
5555
MINGW*) mingw=true;;
5656
Darwin*) darwin=true
57-
#
58-
# Look for the Apple JDKs first to preserve the existing behaviour, and then look
59-
# for the new JDKs provided by Oracle.
60-
#
61-
if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then
62-
#
63-
# Apple JDKs
64-
#
65-
export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
66-
fi
67-
68-
if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then
69-
#
70-
# Apple JDKs
71-
#
72-
export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
73-
fi
74-
75-
if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then
76-
#
77-
# Oracle JDKs
78-
#
79-
export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
80-
fi
81-
82-
if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then
83-
#
84-
# Apple JDKs
85-
#
86-
export JAVA_HOME=`/usr/libexec/java_home`
87-
fi
88-
;;
57+
# Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
58+
# See https://developer.apple.com/library/mac/qa/qa1170/_index.html
59+
if [ -z "$JAVA_HOME" ]; then
60+
if [ -x "/usr/libexec/java_home" ]; then
61+
export JAVA_HOME="`/usr/libexec/java_home`"
62+
else
63+
export JAVA_HOME="/Library/Java/Home"
64+
fi
65+
fi
66+
;;
8967
esac
9068

9169
if [ -z "$JAVA_HOME" ] ; then
@@ -184,27 +162,28 @@ fi
184162

185163
CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
186164

187-
# For Cygwin, switch paths to Windows format before running java
188-
if $cygwin; then
189-
[ -n "$M2_HOME" ] &&
190-
M2_HOME=`cygpath --path --windows "$M2_HOME"`
191-
[ -n "$JAVA_HOME" ] &&
192-
JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
193-
[ -n "$CLASSPATH" ] &&
194-
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
195-
fi
196-
197165
# traverses directory structure from process work directory to filesystem root
198166
# first directory with .mvn subdirectory is considered project base directory
199167
find_maven_basedir() {
200-
local basedir=$(pwd)
201-
local wdir=$(pwd)
168+
169+
if [ -z "$1" ]
170+
then
171+
echo "Path not specified to find_maven_basedir"
172+
return 1
173+
fi
174+
175+
basedir="$1"
176+
wdir="$1"
202177
while [ "$wdir" != '/' ] ; do
203178
if [ -d "$wdir"/.mvn ] ; then
204179
basedir=$wdir
205180
break
206181
fi
207-
wdir=$(cd "$wdir/.."; pwd)
182+
# workaround for JBEAP-8937 (on Solaris 10/Sparc)
183+
if [ -d "${wdir}" ]; then
184+
wdir=`cd "$wdir/.."; pwd`
185+
fi
186+
# end of workaround
208187
done
209188
echo "${basedir}"
210189
}
@@ -216,18 +195,31 @@ concat_lines() {
216195
fi
217196
}
218197

219-
export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)}
198+
BASE_DIR=`find_maven_basedir "$(pwd)"`
199+
if [ -z "$BASE_DIR" ]; then
200+
exit 1;
201+
fi
202+
203+
export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
204+
echo $MAVEN_PROJECTBASEDIR
220205
MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
221206

222-
# Provide a "standardized" way to retrieve the CLI args that will
223-
# work with both Windows and non-Windows executions.
224-
MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
225-
export MAVEN_CMD_LINE_ARGS
207+
# For Cygwin, switch paths to Windows format before running java
208+
if $cygwin; then
209+
[ -n "$M2_HOME" ] &&
210+
M2_HOME=`cygpath --path --windows "$M2_HOME"`
211+
[ -n "$JAVA_HOME" ] &&
212+
JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
213+
[ -n "$CLASSPATH" ] &&
214+
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
215+
[ -n "$MAVEN_PROJECTBASEDIR" ] &&
216+
MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
217+
fi
226218

227219
WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
228220

229221
exec "$JAVACMD" \
230222
$MAVEN_OPTS \
231223
-classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
232224
"-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
233-
${WRAPPER_LAUNCHER} "$@"
225+
${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

‎mvnw.cmd‎

100644100755
Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,6 @@ goto error
8080

8181
:init
8282

83-
set MAVEN_CMD_LINE_ARGS=%*
84-
8583
@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
8684
@REM Fallback to current working directory if not found.
8785

@@ -118,10 +116,10 @@ for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do s
118116

119117
SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
120118

121-
set WRAPPER_JAR="".\.mvn\wrapper\maven-wrapper.jar""
119+
set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
122120
set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
123121

124-
%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
122+
%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
125123
if ERRORLEVEL 1 goto error
126124
goto end
127125

@@ -142,4 +140,4 @@ if "%MAVEN_BATCH_PAUSE%" == "on" pause
142140

143141
if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
144142

145-
exit /B %ERROR_CODE%
143+
exit /B %ERROR_CODE%

‎pom.xml‎

Lines changed: 59 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>org.woehlke.twitterwall</groupId>
66
<artifactId>twitterwall2</artifactId>
7-
<version>1.0.18-SNAPSHOT</version>
7+
<version>1.0.23-SNAPSHOT</version>
88
<name>twitterwall2</name>
99

1010
<description>Twitterwall with spring:boot for heroku</description>
@@ -111,6 +111,15 @@
111111
<artifactId>spring-boot-configuration-processor</artifactId>
112112
<optional>true</optional>
113113
</dependency>
114+
<dependency>
115+
<groupId>org.springframework.security</groupId>
116+
<artifactId>spring-security-web</artifactId>
117+
</dependency>
118+
<dependency>
119+
<groupId>org.springframework.security</groupId>
120+
<artifactId>spring-security-test</artifactId>
121+
<scope>test</scope>
122+
</dependency>
114123
<dependency>
115124
<groupId>org.thymeleaf.extras</groupId>
116125
<artifactId>thymeleaf-extras-springsecurity4</artifactId>
@@ -175,6 +184,42 @@
175184

176185
<build>
177186
<plugins>
187+
188+
<plugin>
189+
<groupId>org.apache.maven.plugins</groupId>
190+
<artifactId>maven-compiler-plugin</artifactId>
191+
<configuration>
192+
<source>${java.version}</source>
193+
<target>${java.version}</target>
194+
<encoding>${project.build.sourceEncoding}</encoding>
195+
</configuration>
196+
</plugin>
197+
198+
<plugin>
199+
<groupId>org.apache.maven.plugins</groupId>
200+
<artifactId>maven-source-plugin</artifactId>
201+
</plugin>
202+
203+
<plugin>
204+
<groupId>org.apache.maven.plugins</groupId>
205+
<artifactId>maven-javadoc-plugin</artifactId>
206+
<version>2.10.4</version>
207+
<configuration>
208+
<!--
209+
<linksource>true</linksource>
210+
-->
211+
<maxmemory>2048m</maxmemory>
212+
<source>1.8</source>
213+
<encoding>${project.build.sourceEncoding}</encoding>
214+
<javadocExecutable>${java.home}/../bin/javadoc</javadocExecutable>
215+
</configuration>
216+
</plugin>
217+
218+
<plugin>
219+
<groupId>org.apache.maven.plugins</groupId>
220+
<artifactId>maven-dependency-plugin</artifactId>
221+
</plugin>
222+
178223
<plugin>
179224
<groupId>org.springframework.boot</groupId>
180225
<artifactId>spring-boot-maven-plugin</artifactId>
@@ -289,7 +334,6 @@
289334
<plugin>
290335
<groupId>org.apache.maven.plugins</groupId>
291336
<artifactId>maven-release-plugin</artifactId>
292-
<!-- <version>2.5.3</version> -->
293337
<configuration>
294338
<preparationGoals>clean</preparationGoals>
295339
<autoVersionSubmodules>true</autoVersionSubmodules>
@@ -300,7 +344,6 @@
300344
<plugin>
301345
<groupId>org.apache.maven.plugins</groupId>
302346
<artifactId>maven-site-plugin</artifactId>
303-
<!-- <version>3.6</version> -->
304347
<inherited>true</inherited>
305348
<configuration>
306349
<locales>en</locales>
@@ -323,26 +366,19 @@
323366
</dependency>
324367
</dependencies>
325368
</plugin>
326-
<plugin>
327-
<groupId>org.apache.maven.plugins</groupId>
328-
<artifactId>maven-dependency-plugin</artifactId>
329-
<!-- <version>3.0.1</version> -->
330-
</plugin>
369+
331370
<plugin>
332371
<groupId>org.apache.maven.plugins</groupId>
333372
<artifactId>maven-changelog-plugin</artifactId>
334373
<version>2.3</version>
335374
</plugin>
375+
336376
<plugin>
337377
<groupId>org.codehaus.mojo</groupId>
338378
<artifactId>cobertura-maven-plugin</artifactId>
339379
<version>2.7</version>
340380
</plugin>
341-
<plugin>
342-
<groupId>org.apache.maven.plugins</groupId>
343-
<artifactId>maven-source-plugin</artifactId>
344-
<!-- <version>3.0.1</version> -->
345-
</plugin>
381+
346382
</plugins>
347383
</build>
348384

@@ -354,36 +390,33 @@
354390
</activation>
355391
<build>
356392
<plugins>
357-
<plugin>
358-
<groupId>org.apache.maven.plugins</groupId>
359-
<artifactId>maven-dependency-plugin</artifactId>
360-
<!-- <version>2.10</version> -->
361-
</plugin>
393+
362394
<plugin>
363395
<groupId>org.apache.maven.plugins</groupId>
364396
<artifactId>maven-surefire-plugin</artifactId>
365-
<!-- <version>2.16</version> -->
366397
<configuration>
367398
<skipTests>true</skipTests>
368399
</configuration>
369400
</plugin>
401+
370402
</plugins>
371403
</build>
372404
</profile>
373405
<profile>
374406
<id>testing</id>
375407
<build>
376408
<plugins>
377-
<plugin>
378-
<groupId>org.apache.maven.plugins</groupId>
379-
<artifactId>maven-dependency-plugin</artifactId>
380-
<!-- <version>2.10</version> -->
381-
</plugin>
409+
382410
<plugin>
383411
<groupId>org.apache.maven.plugins</groupId>
384412
<artifactId>maven-surefire-plugin</artifactId>
385-
<!-- <version>2.16</version> -->
413+
<configuration>
414+
<systemPropertyVariables>
415+
<spring.profiles.active>testing</spring.profiles.active>
416+
</systemPropertyVariables>
417+
</configuration>
386418
</plugin>
419+
387420
</plugins>
388421
</build>
389422
</profile>
@@ -403,41 +436,12 @@
403436
</configuration>
404437
</plugin>
405438

406-
<plugin>
407-
<groupId>org.apache.maven.plugins</groupId>
408-
<artifactId>maven-compiler-plugin</artifactId>
409-
<!-- <version>2.5.1</version> -->
410-
<configuration>
411-
<source>${java.version}</source>
412-
<target>${java.version}</target>
413-
<encoding>${project.build.sourceEncoding}</encoding>
414-
</configuration>
415-
</plugin>
416-
417-
<plugin>
418-
<groupId>org.apache.maven.plugins</groupId>
419-
<artifactId>maven-javadoc-plugin</artifactId>
420-
<configuration>
421-
<!--
422-
<linksource>true</linksource>
423-
-->
424-
<maxmemory>2048m</maxmemory>
425-
<source>1.8</source>
426-
<encoding>${project.build.sourceEncoding}</encoding>
427-
<javadocExecutable>${java.home}/../bin/javadoc</javadocExecutable>
428-
</configuration>
429-
</plugin>
430-
431-
<plugin>
432-
<groupId>org.apache.maven.plugins</groupId>
433-
<artifactId>maven-surefire-plugin</artifactId>
434-
<!-- <version>2.2</version> -->
435-
</plugin>
436439
<plugin>
437440
<groupId>org.apache.maven.plugins</groupId>
438441
<artifactId>maven-surefire-report-plugin</artifactId>
439442
<version>2.20</version>
440443
</plugin>
444+
441445
<plugin>
442446
<groupId>org.apache.maven.plugins</groupId>
443447
<artifactId>maven-checkstyle-plugin</artifactId>

‎src/main/java/org/woehlke/twitterwall/Application.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@
77
import org.springframework.context.annotation.ImportResource;
88
import org.springframework.data.web.config.EnableSpringDataWebSupport;
99
import org.springframework.scheduling.annotation.EnableScheduling;
10-
import org.woehlke.twitterwall.conf.properties.TwitterProperties;
11-
import org.woehlke.twitterwall.conf.properties.BackendProperties;
12-
import org.woehlke.twitterwall.conf.properties.FrontendProperties;
13-
import org.woehlke.twitterwall.conf.properties.SchedulerProperties;
10+
import org.woehlke.twitterwall.conf.properties.*;
1411

1512

1613
/**
@@ -22,7 +19,8 @@
2219
BackendProperties.class,
2320
FrontendProperties.class,
2421
SchedulerProperties.class,
25-
TwitterProperties.class
22+
TwitterProperties.class,
23+
TestdataProperties.class
2624
})
2725
@EnableSpringDataWebSupport
2826
@ImportResource("classpath:integration.xml")

0 commit comments

Comments
 (0)