Skip to content

Commit

Permalink
Merge pull request #26 from rwth-acis/develop
Browse files Browse the repository at this point in the history 
Release version v0.3.0
  • Loading branch information
@hexTileX
hexTileX authored Jun 6, 2017
2 parents a541734 + b85bfc5 commit e032766
Show file tree
Hide file tree
Showing 34 changed files with 1,360 additions and 1,215 deletions.
9 changes: 6 additions & 3 deletions .classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,12 @@
<classpathentry kind="lib" path="lib/jersey-media-multipart-2.1.jar"/>
<classpathentry kind="lib" path="lib/jersey-server-2.23.2.jar"/>
<classpathentry kind="lib" path="lib/joda-time-2.2.jar"/>
<classpathentry kind="lib" path="service/jooq-3.8.2.jar"/>
<classpathentry kind="lib" path="service/jooq-codegen-3.8.2.jar"/>
<classpathentry kind="lib" path="service/jooq-meta-3.8.2.jar"/>
<classpathentry kind="lib" path="service/jodd-bean-3.8.5.jar"/>
<classpathentry kind="lib" path="service/jodd-core-3.8.5.jar"/>
<classpathentry kind="lib" path="service/jodd-vtor-3.8.5.jar"/>
<classpathentry kind="lib" path="service/jooq-3.9.1.jar"/>
<classpathentry kind="lib" path="service/jooq-codegen-3.9.1.jar"/>
<classpathentry kind="lib" path="service/jooq-meta-3.9.1.jar"/>
<classpathentry kind="lib" path="lib/json-smart-1.3.1.jar"/>
<classpathentry kind="lib" path="lib/junit-4.12.jar"/>
<classpathentry kind="lib" path="lib/lang-tag-1.4.jar"/>
Expand Down
2 changes: 1 addition & 1 deletion bin/JOOQGeneration/activitytracker_generation_info.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<configuration xmlns="http://www.jooq.org/xsd/jooq-codegen-3.6.0.xsd">
<configuration xmlns="http://www.jooq.org/xsd/jooq-codegen-3.9.0.xsd">
<!-- Configure the database connection here -->
<jdbc>
<driver>com.mysql.jdbc.Driver</driver>
Expand Down
2 changes: 1 addition & 1 deletion bin/JOOQGeneration/run.bat
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
java -classpath ../../lib/jooq-3.8.2.jar;../../lib/jooq-meta-3.8.2.jar;../../lib/jooq-codegen-3.8.2.jar;../../lib/mysql-connector-java-5.1.6.jar;. org.jooq.util.GenerationTool /activitytracker_generation_info.xml
java -classpath ../../service/jooq-3.9.1.jar;../../service/jooq-meta-3.9.1.jar;../../service/jooq-codegen-3.9.1.jar;../../service/mysql-connector-java-5.1.6.jar;. org.jooq.util.GenerationTool /activitytracker_generation_info.xml
2 changes: 1 addition & 1 deletion bin/JOOQGeneration/run.sh
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
java -classpath ../../lib/jooq-3.8.2.jar:../../lib/jooq-meta-3.8.2.jar:../../lib/jooq-codegen-3.8.2.jar:../../lib/mysql-connector-java-5.1.6.jar:. org.jooq.util.GenerationTool /reqbaz_generation_info.xml
java -classpath ../../service/jooq-3.9.1.jar:../../service/jooq-meta-3.9.1.jar:../../service/jooq-codegen-3.9.1.jar:../../service/mysql-connector-java-5.1.6.jar:. org.jooq.util.GenerationTool /reqbaz_generation_info.xml
6 changes: 5 additions & 1 deletion build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,8 +306,12 @@
<jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5432"/>
<arg value='-p'/>
<arg value='9012'/>
<!--
<arg value='-b'/>
<arg value='192.168.178.21:9011'/>
-->
<arg value='uploadStartupDirectory'/>
<arg value='startService(\"de.rwth.dbis.acis.activitytracker.service.ActivityTrackerService@0.2\",\"SampleServicePass\")'/>
<arg value='startService(\"de.rwth.dbis.acis.activitytracker.service.ActivityTrackerService@0.2\",\"Passphrase\")'/>
<arg value='startWebConnector'/>
<arg value='interactive'/>
</java>
Expand Down
27 changes: 16 additions & 11 deletions etc/activitytracker_create.sql
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
SET FOREIGN_KEY_CHECKS = 0;

CREATE DATABASE IF NOT EXISTS reqbaztrack;

DROP TABLE IF EXISTS reqbaztrack.activity;

-- tables
-- Table activity
CREATE TABLE IF NOT EXISTS activity (
Id INT NOT NULL AUTO_INCREMENT,
creation_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
activity_action VARCHAR(255) NOT NULL,
data_url VARCHAR(255) NULL,
data_type VARCHAR(255) NOT NULL,
data_frontend_url VARCHAR(255) NULL,
parent_data_url VARCHAR(255) NULL,
parent_data_type VARCHAR(255) NULL,
user_url VARCHAR(255) NULL,
CONSTRAINT activity_pk PRIMARY KEY (Id)
CREATE TABLE IF NOT EXISTS reqbaztrack.activity (
id INT NOT NULL AUTO_INCREMENT,
creation_date TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
activity_action VARCHAR(255) NOT NULL,
origin VARCHAR(255) NOT NULL,
data_url VARCHAR(255) NULL,
data_type VARCHAR(255) NULL,
data_frontend_url VARCHAR(255) NULL,
parent_data_url VARCHAR(255) NULL,
parent_data_type VARCHAR(255) NULL,
user_url VARCHAR(255) NULL,
CONSTRAINT activity_pk PRIMARY KEY (id)
);

SET FOREIGN_KEY_CHECKS = 1;
68 changes: 36 additions & 32 deletions etc/activitytracker_demo_data.sql
View file
Original file line number Diff line number Diff line change
@@ -1,43 +1,47 @@
SET FOREIGN_KEY_CHECKS = 0;

REPLACE INTO `reqbaztrack`.`activity` (`Id`, `creation_time`, `activity_action`, `data_url`, `data_type`,
`data_frontend_url`, `parent_data_url`, `parent_data_type`, `user_url`)
TRUNCATE TABLE reqbaztrack.activity;

REPLACE INTO reqbaztrack.activity (id, creation_date, activity_action, origin, data_url, data_type,
data_frontend_url, parent_data_url, parent_data_type, user_url)
VALUES
('1', '2015-10-21 07:00:00', 'CREATE', 'http://localhost:8080/bazaar/projects/1', 'PROJECT',
'http://localhost:5000/#!/projects/1', NULL, NULL, 'http://localhost:8080/bazaar/users/2'),
('2', '2015-10-21 07:00:00', 'CREATE', 'http://localhost:8080/bazaar/components/1', 'COMPONENT',
'http://localhost:5000/#!/projects/1/components/1', 'http://localhost:8080/bazaar/projects/1',
(1, '2015-10-21 07:00:00', 'CREATE', 'https://www.requirements-bazaar.org/betabazaar',
'http://localhost:8080/bazaar/projects/1', 'PROJECT',
'http://localhost:5000/projects/1', NULL, NULL, 'http://localhost:8080/bazaar/users/2'),
(2, '2015-10-21 07:00:00', 'CREATE', 'https://www.requirements-bazaar.org/betabazaar', 'http://localhost:8080/bazaar/categories/1', 'CATEGORY',
'http://localhost:5000/projects/1/categories/1', 'http://localhost:8080/bazaar/projects/1',
'PROJECT', 'http://localhost:8080/bazaar/users/2'),
('3', '2015-10-21 08:00:00', 'CREATE', 'http://localhost:8080/bazaar/requirements/1', 'REQUIREMENT',
'http://localhost:5000/#!/projects/1/components/1/requirements/1', 'http://localhost:8080/bazaar/components/1',
'COMPONENT', 'http://localhost:8080/bazaar/users/2'),
('4', '2015-10-21 09:00:00', 'UPDATE', 'http://localhost:8080/bazaar/requirements/1', 'REQUIREMENT',
'http://localhost:5000/#!/projects/1/components/1/requirements/1', 'http://localhost:8080/bazaar/components/1',
'COMPONENT', 'http://localhost:8080/bazaar/users/2'),
('5', '2015-10-21 10:00:00', 'DELETE', NULL, 'REQUIREMENT',
NULL, 'http://localhost:8080/bazaar/components/1', 'COMPONENT', 'http://localhost:8080/bazaar/users/2'),
('6', '2015-10-21 10:00:00', 'CREATE', 'http://localhost:8080/bazaar/projects/2', 'PROJECT',
'http://localhost:5000/#!/projects/2', NULL, NULL, 'http://localhost:8080/bazaar/users/2'),
('7', '2015-10-21 10:00:00', 'CREATE', 'http://localhost:8080/bazaar/components/2', 'COMPONENT',
'http://localhost:5000/#!/projects/2/components/2', 'http://localhost:8080/bazaar/projects/2',
(3, '2015-10-21 08:00:00', 'CREATE', 'https://www.requirements-bazaar.org/betabazaar', 'http://localhost:8080/bazaar/requirements/1', 'REQUIREMENT',
'http://localhost:5000/projects/1/categories/1/requirements/1', 'http://localhost:8080/bazaar/categories/1',
'CATEGORY', 'http://localhost:8080/bazaar/users/2'),
(4, '2015-10-21 09:00:00', 'UPDATE', 'https://www.requirements-bazaar.org/betabazaar', 'http://localhost:8080/bazaar/requirements/1', 'REQUIREMENT',
'http://localhost:5000/projects/1/categories/1/requirements/1', 'http://localhost:8080/bazaar/categories/1',
'CATEGORY', 'http://localhost:8080/bazaar/users/2'),
(5, '2015-10-21 10:00:00', 'DELETE', 'https://www.requirements-bazaar.org/betabazaar', NULL, 'REQUIREMENT',
NULL, 'http://localhost:8080/bazaar/categories/1', 'CATEGORY', 'http://localhost:8080/bazaar/users/2'),
(6, '2015-10-21 10:00:00', 'CREATE', 'https://www.requirements-bazaar.org/betabazaar', 'http://localhost:8080/bazaar/projects/2', 'PROJECT',
'http://localhost:5000/projects/2', NULL, NULL, 'http://localhost:8080/bazaar/users/2'),
(7, '2015-10-21 10:00:00', 'CREATE', 'https://www.requirements-bazaar.org/betabazaar', 'http://localhost:8080/bazaar/categories/2', 'CATEGORY',
'http://localhost:5000/projects/2/categories/2', 'http://localhost:8080/bazaar/projects/2',
'PROJECT', 'http://localhost:8080/bazaar/users/2'),
('8', '2015-10-21 11:00:00', 'CREATE', 'http://localhost:8080/bazaar/requirements/2', 'REQUIREMENT',
'http://localhost:5000/#!/projects/1/components/1/requirements/1', 'http://localhost:8080/bazaar/components/1',
'COMPONENT', 'http://localhost:8080/bazaar/users/2'),
('9', '2015-10-21 12:00:00', 'UPDATE', 'http://localhost:8080/bazaar/requirements/2', 'REQUIREMENT',
'http://localhost:5000/#!/projects/1/components/1/requirements/1', 'http://localhost:8080/bazaar/components/1',
'COMPONENT', 'http://localhost:8080/bazaar/users/2'),
('10', '2015-10-21 13:00:00', 'CREATE', 'http://localhost:8080/bazaar/comments/1', 'COMMENT',
'http://localhost:5000/#!/projects/1/components/1/requirements/1', 'http://localhost:8080/bazaar/requirements/1',
(8, '2015-10-21 11:00:00', 'CREATE', 'https://www.requirements-bazaar.org/betabazaar', 'http://localhost:8080/bazaar/requirements/2', 'REQUIREMENT',
'http://localhost:5000/projects/1/categories/1/requirements/1', 'http://localhost:8080/bazaar/categories/1',
'CATEGORY', 'http://localhost:8080/bazaar/users/2'),
(9, '2015-10-21 12:00:00', 'UPDATE', 'https://www.requirements-bazaar.org/betabazaar', 'http://localhost:8080/bazaar/requirements/2', 'REQUIREMENT',
'http://localhost:5000/projects/1/categories/1/requirements/1', 'http://localhost:8080/bazaar/categories/1',
'CATEGORY', 'http://localhost:8080/bazaar/users/2'),
(10, '2015-10-21 13:00:00', 'CREATE', 'https://www.requirements-bazaar.org/betabazaar', 'http://localhost:8080/bazaar/comments/1', 'COMMENT',
'http://localhost:5000/projects/1/categories/1/requirements/1', 'http://localhost:8080/bazaar/requirements/1',
'REQUIREMENT', 'http://localhost:8080/bazaar/users/2'),
('11', '2015-10-21 14:00:00', 'CREATE', 'http://localhost:8080/bazaar/comments/2', 'COMMENT',
'http://localhost:5000/#!/projects/1/components/1/requirements/2', 'http://localhost:8080/bazaar/requirements/2',
(11, '2015-10-21 14:00:00', 'CREATE', 'https://www.requirements-bazaar.org/betabazaar', 'http://localhost:8080/bazaar/comments/2', 'COMMENT',
'http://localhost:5000/projects/1/categories/1/requirements/2', 'http://localhost:8080/bazaar/requirements/2',
'REQUIREMENT', 'http://localhost:8080/bazaar/users/2'),
('12', '2015-10-21 15:00:00', 'CREATE', 'http://localhost:8080/bazaar/requirements/1', 'VOTE',
'http://localhost:5000/#!/projects/1/components/1/requirements/1', 'http://localhost:8080/bazaar/requirements/1',
(12, '2015-10-21 15:00:00', 'CREATE', 'https://www.requirements-bazaar.org/betabazaar',
'http://localhost:8080/bazaar/requirements/1', 'VOTE',
'http://localhost:5000/projects/1/categories/1/requirements/1', 'http://localhost:8080/bazaar/requirements/1',
'REQUIREMENT', 'http://localhost:8080/bazaar/users/2'),
('13', '2015-10-21 15:00:00', 'DELETE', NULL, 'VOTE',
'http://localhost:5000/#!/projects/1/components/1/requirements/1', 'http://localhost:8080/bazaar/requirements/1',
(13, '2015-10-21 15:00:00', 'DELETE', 'https://www.requirements-bazaar.org/betabazaar', NULL, 'VOTE',
'http://localhost:5000/projects/1/categories/1/requirements/1', 'http://localhost:8080/bazaar/requirements/1',
'REQUIREMENT', 'http://localhost:8080/bazaar/users/2');

SET FOREIGN_KEY_CHECKS = 1;
Expand Down
2 changes: 1 addition & 1 deletion etc/ant_configuration/service.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ service.name=de.rwth.dbis.acis.activitytracker.service
service.path=de/rwth/dbis/acis/activitytracker/service
service.class=ActivityTrackerService
service.passphrase=Passphrase
service.dependencies=commons-codec;version="1.9",commons-dbcp2;version="2.0",commons-io;version="2.4",commons-logging;version="1.2",commons-pool2;version="2.2",gson;version="2.3",httpclient;version="4.5.1",httpcore;version="4.4.3",jooq;version="3.8.2",jooq-codegen;version="3.8.2",jooq-meta;version="3.8.2",mysql-connector-java;version="5.1.6"
service.dependencies=commons-codec;version="1.9",commons-dbcp2;version="2.0",commons-io;version="2.4",commons-logging;version="1.2",commons-pool2;version="2.2",gson;version="2.3",httpclient;version="4.5.1",httpcore;version="4.4.3",jodd-bean;version="3.8.5",jodd-core;version="3.8.5",jodd-vtor;version="3.8.5",jooq;version="3.9.1",jooq-codegen;version="3.9.1",jooq-meta;version="3.9.1",mysql-connector-java;version="5.1.6"
7 changes: 4 additions & 3 deletions etc/ivy/ivy.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@
<dependency org="mysql" name="mysql-connector-java" rev="5.1.6" conf="bundle->default"/>
<dependency org="org.apache.commons" name="commons-pool2" rev="2.2" conf="bundle->default"/>
<dependency org="org.apache.commons" name="commons-dbcp2" rev="2.0" conf="bundle->default"/>
<dependency org="org.jooq" name="jooq" rev="3.8.2" conf="bundle->default"/>
<dependency org="org.jooq" name="jooq-codegen" rev="3.8.2" conf="bundle->default"/>
<dependency org="org.jooq" name="jooq-meta" rev="3.8.2" conf="bundle->default"/>
<dependency org="org.jooq" name="jooq" rev="3.9.1" conf="bundle->default"/>
<dependency org="org.jooq" name="jooq-codegen" rev="3.9.1" conf="bundle->default"/>
<dependency org="org.jooq" name="jooq-meta" rev="3.9.1" conf="bundle->default"/>
<dependency org="com.google.code.gson" name="gson" rev="2.3" conf="bundle->default"/>
<dependency org="org.apache.httpcomponents" name="httpclient" rev="4.5.1" conf="bundle->default"/>
<dependency org="commons-io" name="commons-io" rev="2.4" conf="bundle->default"/>
<dependency org="org.jodd" name="jodd-vtor" rev="3.8.5" conf="bundle->default"/>
</dependencies>
</ivy-module>
Loading

0 comments on commit e032766

Please sign in to comment.