Skip to content

Commit d7fda2b

Browse files
phasenraum2010phasenraum2010
authored
Merge pull request #220 from phasenraum2010/milestone-1.0.19
Milestone 1.0.19
2 parents 334d289 + 18d9823 commit d7fda2b

29 files changed

+1395
-122
lines changed

‎.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%

‎src/main/java/org/woehlke/twitterwall/oodm/entities/parts/TaskStatus.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ public enum TaskStatus {
99
RUNNING,
1010
FINISHED,
1111
ERROR,
12+
FINAL_ERROR,
1213
WARN,
1314
NULL
1415
}

‎src/main/java/org/woehlke/twitterwall/oodm/service/MediaService.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import org.woehlke.twitterwall.oodm.entities.Media;
44
import org.woehlke.twitterwall.oodm.service.common.DomainObjectEntityService;
55
import org.woehlke.twitterwall.oodm.service.common.DomainServiceWithIdTwitter;
6-
import org.woehlke.twitterwall.oodm.service.common.DomainServiceWithTask;
76
import org.woehlke.twitterwall.oodm.service.common.DomainServiceWithUrl;
87

98

‎src/main/java/org/woehlke/twitterwall/oodm/service/MentionService.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import org.woehlke.twitterwall.oodm.service.common.DomainObjectEntityService;
88
import org.woehlke.twitterwall.oodm.service.common.DomainServiceWithIdTwitter;
99
import org.woehlke.twitterwall.oodm.service.common.DomainServiceWithScreenName;
10-
import org.woehlke.twitterwall.oodm.service.common.DomainServiceWithTask;
1110

1211

1312
/**

‎src/main/java/org/woehlke/twitterwall/oodm/service/TaskHistoryService.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ public interface TaskHistoryService extends DomainObjectMinimalService<TaskHisto
1313

1414
TaskHistory store(TaskHistory domainObject);
1515

16-
TaskHistory create(TaskHistory domainObject);
17-
18-
TaskHistory update(TaskHistory domainObject);
19-
2016
Page<TaskHistory> findByTask(Task oneTask, Pageable pageRequest);
2117

2218
TaskHistory findById(long id);

‎src/main/java/org/woehlke/twitterwall/oodm/service/TweetService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public interface TweetService extends DomainObjectWithEntitiesService<Tweet>,Dom
2020

2121
Page<Tweet> findTweetsForUser(User user, Pageable pageRequest);
2222

23-
Page<Long> findAllTwitterIds(Pageable pageRequest);
23+
//Page<Long> findAllTwitterIds(Pageable pageRequest);
2424

2525
Page<Object2Entity> findAllTweet2HashTag(Pageable pageRequest);
2626

‎src/main/java/org/woehlke/twitterwall/oodm/service/UrlService.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import org.woehlke.twitterwall.oodm.entities.Url;
44
import org.woehlke.twitterwall.oodm.service.common.DomainObjectEntityService;
5-
import org.woehlke.twitterwall.oodm.service.common.DomainServiceWithTask;
65
import org.woehlke.twitterwall.oodm.service.common.DomainServiceWithUrl;
76

87

0 commit comments

Comments
 (0)