Skip to content

Commit c8bc42c

Browse files
Merge pull request #280 from phasenraum2010/milestone-1.0.28
Milestone 1.0.28
2 parents 7775af1 + e8e4f86 commit c8bc42c

File tree

108 files changed

+2426
-1284
lines changed

Some content is hidden

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

108 files changed

+2426
-1284
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

test/db-count.sql renamed to etc/db-count.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ select count(*) from hashtag;
1616
select count(*) from tweet;
1717
select count(*) from userlist_members;
1818
select count(*) from userlist_subcriber;
19-
select count(*) from userprofile;
2019
select count(*) from userlist;
20+
select count(*) from userprofile;
2121
select count(*) from task_history;
2222
select count(*) from task;

test/db-drop-tables.sql renamed to etc/db-drop-tables.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ drop table mention;
1414
drop table media;
1515
drop table hashtag;
1616
drop table tweet;
17-
drop table userprofile;
1817
drop table userlist_members;
1918
drop table userlist_subcriber;
2019
drop table userlist;
20+
drop table userprofile;
2121
drop table task_history;
2222
drop table task;
2323
drop sequence hibernate_sequence;

test/db-reset.sql renamed to etc/db-reset.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ delete from mention;
1414
delete from media;
1515
delete from hashtag;
1616
delete from tweet;
17-
delete from userprofile;
1817
delete from userlist_members;
1918
delete from userlist_subcriber;
2019
delete from userlist;
20+
delete from userprofile;
2121
delete from task_history;
2222
delete from task;
2323

File renamed without changes.
File renamed without changes.
File renamed without changes.

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

0 commit comments

Comments
 (0)