Skip to content

Commit dfa5605

Browse files
phasenraum2010phasenraum2010
committed
fixed #276 
1 parent 2edd075 commit dfa5605

File tree

75 files changed

+1392
-978
lines changed

Some content is hidden

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

75 files changed

+1392
-978
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ buildNumber.properties
1212
!/.mvn/wrapper/maven-wrapper.jar
1313

1414
.idea
15+
*.iml
1516
todo.txt
1617
tw.txt
1718
twitterwall.log

‎.mvn/jvm.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
-Xmx1024m
1+
-Xmx350m -Xss512k -Dfile.encoding=UTF-8

‎.travis.yml‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,25 @@
1-
sudo: false
21
language: java
32
jdk:
4-
- oraclejdk8
5-
script:
6-
- test/run-travis.sh
3+
- oraclejdk8
4+
addons:
5+
apt:
6+
packages:
7+
- oracle-java8-installer
8+
services:
9+
- postgresql
10+
before_install:
11+
- sudo apt-get update
12+
- sudo apt-get install language-pack-de
13+
- sudo /etc/init.d/postgresql stop
14+
- sudo /etc/init.d/postgresql start 9.6
15+
before_script:
16+
- psql -c "CREATE USER twitterwall2test WITH PASSWORD 'twitterwall2testpwd' LOGIN SUPERUSER INHERIT CREATEDB CREATEROLE NOREPLICATION;" -U postgres
17+
- psql -c 'GRANT pg_signal_backend, postgres TO twitterwall2test WITH ADMIN OPTION;' -U postgres
18+
- psql -c "CREATE DATABASE twitterwall2test WITH OWNER = twitterwall2test TEMPLATE = template0 ENCODING = 'UTF8' LC_COLLATE = 'de_DE.UTF-8' LC_CTYPE = 'de_DE.UTF-8' CONNECTION LIMIT = -1;" -U postgres
19+
- psql -c '\l' -U postgres
20+
- psql -c '\dg' -U postgres
21+
- psql -c '\dn' -U postgres
22+
- psql -c 'select * from version();' -U postgres
23+
- psql -c 'select * from version();' -U twitterwall2test
24+
sudo: false
25+
script: ./mvnw clean site site:deploy -Ptravis -Dtest=AlphaTopLevelSuiteIT -B -V

‎heroku.sh‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#!/opt/local/bin/bash
2+
3+
export PORT=8080
4+
export JAVA_OPTS='-Xmx350m -Xss512k'
5+
6+
export DATABASE_URL='jdbc:postgresql://localhost:5432/twitterwall2?user=twitterwall2&password=twitterwall2pwd'
7+
export DATABASE_URL_TEST='jdbc:postgresql://localhost:5432/twitterwall2test?user=twitterwall2test&password=twitterwall2testpwd'
8+
export TWITTERWALL_FRONTEND_MAX_RESULTS=200
9+
export TWITTERWALL_SHOW_USERS_MENU=true
10+
export TWITTERWALL_CONTEXT_TEST=true
11+
export TWITTER_PAGE_SIZE=500
12+
export TWITTER_FETCH_TESTDATA=false
13+
export TWITTERWALL_WAIT_FOR_TEST=120000
14+
export TWITTERWALL_URL_TEST_DATA_VERBOSE=false
15+
export TWITTERWALL_SCHEDULER_ALLOW_UPDATE_TWEETS=false
16+
export TWITTERWALL_SCHEDULER_ALLOW_UPDATE_USERS=false
17+
export TWITTERWALL_SCHEDULER_ALLOW_UPDATE_USERS_FROM_MENTION=false
18+
export TWITTERWALL_SCHEDULER_ALLOW_REMOVE_OLD_DATA_FROM_STORAGE=false
19+
export TWITTERWALL_SCHEDULER_ALLOW_SEARCH=false
20+
export TWITTER_SEARCH_TERM='#hibernate OR #java OR #TYPO3'
21+
export TWITTERWALL_INFO_WEBPAGE=https://github.com/phasenraum2010/twitterwall2
22+
export TWITTERWALL_THEME=typo3
23+
export TWITTERWALL_APP_NAME=Twitterwall
24+
export TWITTERWALL_INFO_IMPRINT_SCREEN_NAME=port80guru
25+
export TWITTERWALL_GOOGLE_ANALYTICS_ID=TWITTERWALL_GOOGLE_ANALYTICS_ID
26+
export TWITTERWALL_SCHEDULER_HEROKU_DB_LIMIT=false
27+
export TWITTERWALL_SCHEDULER_USER_LIST_NAME=test-typo3-hibernate-java
28+
export TWITTERWALL_SCHEDULER_USER_LIST_ALLOW=false
29+
export TWITTERWALL_JPA_HIBERNATE_DDL_AUTO=update
30+
#export TWITTERWALL_JPA_HIBERNATE_DDL_AUTO=create-drop
31+
export TWITTERWALL_LOGIN_USERNAME=tw
32+
export TWITTERWALL_LOGIN_PASSWORD=vbfvjdgar64r67tf7a46tf76rgtfgf7d6g
33+
34+
./mvnw clean install
35+
36+
java -Dserver.port=$PORT $JAVA_OPTS -jar target/twitterwall2-1.0.28-SNAPSHOT.jar

‎run.sh‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#!/opt/local/bin/bash
2+
3+
export DATABASE_URL='jdbc:postgresql://localhost:5432/twitterwall2?user=twitterwall2&password=twitterwall2pwd'
4+
export DATABASE_URL_TEST='jdbc:postgresql://localhost:5432/twitterwall2test?user=twitterwall2test&password=twitterwall2testpwd'
5+
export TWITTERWALL_FRONTEND_MAX_RESULTS=200
6+
export TWITTERWALL_SHOW_USERS_MENU=true
7+
export TWITTERWALL_CONTEXT_TEST=true
8+
export TWITTER_PAGE_SIZE=500
9+
export TWITTER_FETCH_TESTDATA=false
10+
export TWITTERWALL_WAIT_FOR_TEST=120000
11+
export TWITTERWALL_URL_TEST_DATA_VERBOSE=false
12+
export TWITTERWALL_SCHEDULER_ALLOW_UPDATE_TWEETS=false
13+
export TWITTERWALL_SCHEDULER_ALLOW_UPDATE_USERS=false
14+
export TWITTERWALL_SCHEDULER_ALLOW_UPDATE_USERS_FROM_MENTION=false
15+
export TWITTERWALL_SCHEDULER_ALLOW_REMOVE_OLD_DATA_FROM_STORAGE=false
16+
export TWITTERWALL_SCHEDULER_ALLOW_SEARCH=false
17+
export TWITTER_SEARCH_TERM='#hibernate OR #java OR #TYPO3'
18+
export TWITTERWALL_INFO_WEBPAGE=https://github.com/phasenraum2010/twitterwall2
19+
export TWITTERWALL_THEME=typo3
20+
export TWITTERWALL_APP_NAME=Twitterwall
21+
export TWITTERWALL_INFO_IMPRINT_SCREEN_NAME=port80guru
22+
export TWITTERWALL_GOOGLE_ANALYTICS_ID=TWITTERWALL_GOOGLE_ANALYTICS_ID
23+
export TWITTERWALL_SCHEDULER_HEROKU_DB_LIMIT=false
24+
export TWITTERWALL_SCHEDULER_USER_LIST_NAME=test-typo3-hibernate-java
25+
export TWITTERWALL_SCHEDULER_USER_LIST_ALLOW=false
26+
export TWITTERWALL_JPA_HIBERNATE_DDL_AUTO=update
27+
#export TWITTERWALL_JPA_HIBERNATE_DDL_AUTO=create-drop
28+
export TWITTERWALL_LOGIN_USERNAME=tw
29+
export TWITTERWALL_LOGIN_PASSWORD=vbfvjdgar64r67tf7a46tf76rgtfgf7d6g
30+
31+
./mvnw clean spring-boot:run

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public void createImprintUserAsync(){
2121
String msg = "create Imprint User (Async) ";
2222
if(!schedulerProperties.getSkipFortesting()) {
2323
Task task = mqTaskStartFireAndForget.createImprintUserAsync();
24-
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
24+
log.debug(msg+ "SCHEDULED: task "+task.getUniqueId());
2525
}
2626
}
2727

@@ -30,7 +30,7 @@ public void fetchTweetsFromTwitterSearch() {
3030
String msg = "fetch Tweets From TwitterSearch ";
3131
if((schedulerProperties.getAllowFetchTweetsFromTwitterSearch()) && (!schedulerProperties.getSkipFortesting())) {
3232
Task task = mqTaskStartFireAndForget.fetchTweetsFromSearch();
33-
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
33+
log.debug(msg+ "SCHEDULED: task "+task.getUniqueId());
3434
}
3535
}
3636

@@ -39,7 +39,7 @@ public void fetchUsersFromDefinedUserList(){
3939
String msg = "fetch Users from Defined User List ";
4040
if((schedulerProperties.getFetchUsersFromDefinedUserListAllow()) && (!schedulerProperties.getSkipFortesting())) {
4141
Task task = mqTaskStartFireAndForget.fetchUsersFromList();
42-
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
42+
log.debug(msg+ "SCHEDULED: task "+task.getUniqueId());
4343
}
4444
}
4545

@@ -48,7 +48,7 @@ public void getHomeTimeline() {
4848
String msg = "get Home Timeline Tweets ";
4949
if((schedulerProperties.getAllowGetHomeTimeline()) && (!schedulerProperties.getSkipFortesting())) {
5050
Task task = mqTaskStartFireAndForget.getHomeTimeline();
51-
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
51+
log.debug(msg+ "SCHEDULED: task "+task.getUniqueId());
5252
}
5353
}
5454

@@ -57,7 +57,7 @@ public void getUserTimeline() {
5757
String msg = " get User Timeline Tweets ";
5858
if((schedulerProperties.getAllowGetUserTimeline()) && (!schedulerProperties.getSkipFortesting())) {
5959
Task task = mqTaskStartFireAndForget.getUserTimeline();
60-
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
60+
log.debug(msg+ "SCHEDULED: task "+task.getUniqueId());
6161
}
6262
}
6363

@@ -66,7 +66,7 @@ public void getMentions() {
6666
String msg = " get Mentions ";
6767
if((schedulerProperties.getAllowGetMentions()) && (!schedulerProperties.getSkipFortesting())) {
6868
Task task = mqTaskStartFireAndForget.getMentions();
69-
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
69+
log.debug(msg+ "SCHEDULED: task "+task.getUniqueId());
7070
}
7171
}
7272

@@ -75,7 +75,7 @@ public void getFavorites() {
7575
String msg = " get Favorites ";
7676
if((schedulerProperties.getAllowGetFavorites()) && (!schedulerProperties.getSkipFortesting())) {
7777
Task task = mqTaskStartFireAndForget.getFavorites();
78-
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
78+
log.debug(msg+ "SCHEDULED: task "+task.getUniqueId());
7979
}
8080
}
8181

@@ -84,7 +84,7 @@ public void getRetweetsOfMe() {
8484
String msg = " get Retweets Of Me ";
8585
if((schedulerProperties.getAllowGetRetweetsOfMe()) && (!schedulerProperties.getSkipFortesting())) {
8686
Task task = mqTaskStartFireAndForget.getRetweetsOfMe();
87-
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
87+
log.debug(msg+ "SCHEDULED: task "+task.getUniqueId());
8888
}
8989
}
9090

@@ -93,9 +93,9 @@ public void getLists() {
9393
String msg = " get Lists ";
9494
if((schedulerProperties.getAllowGetLists()) && (!schedulerProperties.getSkipFortesting())) {
9595
Task task = mqTaskStartFireAndForget.getLists();
96-
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
96+
log.debug(msg+ "SCHEDULED: task "+task.getUniqueId());
9797
task = mqTaskStartFireAndForget.fetchUserlistOwners();
98-
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
98+
log.debug(msg+ "SCHEDULED: task "+task.getUniqueId());
9999
}
100100
}
101101

@@ -104,7 +104,7 @@ public void fetchFollower(){
104104
String msg = "fetch Follower ";
105105
if((schedulerProperties.getFetchFollowerAllow()) && (!schedulerProperties.getSkipFortesting())) {
106106
Task task = mqTaskStartFireAndForget.fetchFollower();
107-
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
107+
log.debug(msg+ "SCHEDULED: task "+task.getUniqueId());
108108
}
109109
}
110110

@@ -113,7 +113,7 @@ public void fetchFriends(){
113113
String msg = "fetch Friends ";
114114
if((schedulerProperties.getFetchFriendsAllow()) && (!schedulerProperties.getSkipFortesting())) {
115115
Task task = mqTaskStartFireAndForget.fetchFriends();
116-
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
116+
log.debug(msg+ "SCHEDULED: task "+task.getUniqueId());
117117
}
118118
}
119119

@@ -122,7 +122,7 @@ public void removeOldDataFromStorage(){
122122
String msg = "remove Old Data From Storage: ";
123123
if((schedulerProperties.getRemoveOldDataFromStorageAllow()) && (!schedulerProperties.getSkipFortesting())) {
124124
Task task = mqTaskStartFireAndForget.removeOldDataFromStorage();
125-
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
125+
log.debug(msg+ "SCHEDULED: task "+task.getUniqueId());
126126
}
127127
}
128128

@@ -131,7 +131,7 @@ public void updateUserProfilesFromMentions(){
131131
String msg = "update User Profiles From Mentions";
132132
if((schedulerProperties.getAllowUpdateUserProfilesFromMention()) && (!schedulerProperties.getSkipFortesting())) {
133133
Task task = mqTaskStartFireAndForget.updateUsersFromMentions();
134-
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
134+
log.debug(msg+ "SCHEDULED: task "+task.getUniqueId());
135135
}
136136
}
137137

@@ -140,7 +140,7 @@ public void updateTweets() {
140140
String msg = "update Tweets ";
141141
if((schedulerProperties.getAllowUpdateTweets()) && (!schedulerProperties.getSkipFortesting())){
142142
Task task = mqTaskStartFireAndForget.updateTweets();
143-
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
143+
log.debug(msg+ "SCHEDULED: task "+task.getUniqueId());
144144
}
145145
}
146146

@@ -149,7 +149,7 @@ public void updateUserProfiles() {
149149
String msg = "update User Profiles ";
150150
if((schedulerProperties.getAllowUpdateUserProfiles()) && (!schedulerProperties.getSkipFortesting())) {
151151
Task task = mqTaskStartFireAndForget.updateUsers();
152-
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
152+
log.debug(msg+ "SCHEDULED: task "+task.getUniqueId());
153153
}
154154
}
155155

@@ -158,7 +158,7 @@ public void startUpdateUrls(){
158158
String msg = "start UpdateUrls ";
159159
if(!schedulerProperties.getSkipFortesting()) {
160160
Task task = mqTaskStartFireAndForget.startUpdateUrls();
161-
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
161+
log.debug(msg+ "SCHEDULED: task "+task.getUniqueId());
162162
}
163163
}
164164

@@ -168,7 +168,7 @@ public void startGarbageCollection(){
168168
if(!schedulerProperties.getSkipFortesting()) {
169169
//TODO:
170170
//Task task = mqTaskStartFireAndForget.startGarbageCollection();
171-
//log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
171+
//log.debug(msg+ "SCHEDULED: task "+task.getUniqueId());
172172
}
173173
}
174174

‎src/main/java/org/woehlke/twitterwall/backend/mq/mentions/endpoint/serviceactivator/impl/MentionFinisherImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public void finishAsnyc(Message<List<MentionMessage>> incomingMessageList) {
6060
Task task = taskService.findById(taskId);
6161
String msgDone = "Sucessfully finished task "+task.getTaskType()+" via MQ by FIRE_AND_FORGET_SENDER";
6262
taskService.done(msgDone,task,countedEntities);
63-
log.info(msgDone);
63+
log.debug(msgDone);
6464
}
6565

6666
private final TaskService taskService;

‎src/main/java/org/woehlke/twitterwall/backend/mq/mentions/endpoint/serviceactivator/impl/UpdateMentionWithUserImpl.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.woehlke.twitterwall.backend.mq.mentions.endpoint.serviceactivator.impl;
22

33
import org.springframework.beans.factory.annotation.Autowired;
4-
import org.springframework.integration.support.MessageBuilder;
54
import org.springframework.messaging.Message;
65
import org.springframework.stereotype.Component;
76
import org.woehlke.twitterwall.oodm.model.Mention;

‎src/main/java/org/woehlke/twitterwall/backend/mq/mentions/endpoint/serviceactivator/impl/UserforMentionPersistorImpl.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.woehlke.twitterwall.backend.mq.mentions.endpoint.serviceactivator.impl;
22

33
import org.springframework.beans.factory.annotation.Autowired;
4-
import org.springframework.integration.support.MessageBuilder;
54
import org.springframework.messaging.Message;
65
import org.springframework.stereotype.Component;
76
import org.woehlke.twitterwall.oodm.model.Task;

‎src/main/java/org/woehlke/twitterwall/backend/mq/tasks/impl/TaskStartFireAndForgetImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public Task startFetchListsForUsers() {
156156
private Task send(TaskType taskType){
157157
TaskSendType taskSendType = TaskSendType.FIRE_AND_FORGET;
158158
String msg = "START Task "+taskType+" via MQ by "+ taskSendType;
159-
log.info(msg);
159+
log.debug(msg);
160160
CountedEntities countedEntities = countedEntitiesService.countAll();
161161
Task task = taskService.create(msg, taskType, taskSendType, countedEntities);
162162

0 commit comments

Comments
 (0)