Merge pull request #21 from rwth-acis/develop

release at-v0.1.3
rwth-acis · Nov 17, 2016 · 884ddc8 · 884ddc8
2 parents adaf495 + a6a867e
commit 884ddc8
Show file tree

Hide file tree

Showing 22 changed files with 272 additions and 163 deletions.
diff --git a/.classpath b/.classpath
@@ -5,26 +5,19 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/activation-1.1.jar"/>
 	<classpathentry kind="lib" path="lib/annotations-2.0.1.jar"/>
-	<classpathentry kind="lib" path="lib/ant-junit-1.6.5.jar"/>
-	<classpathentry kind="lib" path="lib/asm-4.0.jar"/>
-	<classpathentry kind="lib" path="lib/asm-tree-4.0.jar"/>
-	<classpathentry kind="lib" path="lib/asm-util-4.0.jar"/>
-	<classpathentry kind="lib" path="lib/cglib-3.0.jar"/>
-	<classpathentry kind="lib" path="lib/commons-codec-1.10.jar"/>
 	<classpathentry kind="lib" path="lib/commons-dbcp2-2.0.jar"/>
 	<classpathentry kind="lib" path="lib/commons-io-2.4.jar"/>
+	<classpathentry kind="lib" path="lib/commons-codec-1.10.jar"/>
 	<classpathentry kind="lib" path="lib/commons-lang3-3.3.2.jar"/>
 	<classpathentry kind="lib" path="lib/commons-logging-1.2.jar"/>
 	<classpathentry kind="lib" path="lib/commons-pool2-2.2.jar"/>
-	<classpathentry kind="lib" path="lib/FreePastry-2.1.jar"/>
-	<classpathentry kind="lib" path="lib/geronimo-jta_1.1_spec-1.1.1.jar"/>
+	<classpathentry kind="lib" path="lib/FreePastry-2.1.1.jar"/>
 	<classpathentry kind="lib" path="lib/gson-2.3.jar"/>
 	<classpathentry kind="lib" path="lib/guava-18.0.jar"/>
 	<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
 	<classpathentry kind="lib" path="lib/httpclient-4.5.1.jar"/>
 	<classpathentry kind="lib" path="lib/httpcore-4.4.3.jar"/>
 	<classpathentry kind="lib" path="lib/i5-simpleXML-0.2.jar"/>
-	<classpathentry kind="lib" path="lib/integration-1.6.1.jar"/>
 	<classpathentry kind="lib" path="lib/jackson-annotations-2.4.5.jar"/>
 	<classpathentry kind="lib" path="lib/jackson-core-2.4.5.jar"/>
 	<classpathentry kind="lib" path="lib/jackson-databind-2.4.5.jar"/>
@@ -44,22 +37,13 @@
 	<classpathentry kind="lib" path="lib/jsr311-api-1.1.1.jar"/>
 	<classpathentry kind="lib" path="lib/junit-4.12.jar"/>
 	<classpathentry kind="lib" path="lib/lang-tag-1.4.jar"/>
-	<classpathentry kind="lib" path="lib/las2peer-0.5.4.jar"/>
-	<classpathentry kind="lib" path="lib/las2peer-rest-mapper-0.5.4.jar"/>
-	<classpathentry kind="lib" path="lib/las2peer-web-connector-0.5.4.jar"/>
-	<classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
+	<classpathentry kind="lib" path="lib/las2peer-0.5.7.jar"/>
+	<classpathentry kind="lib" path="lib/las2peer-rest-mapper-0.5.7.jar"/>
+	<classpathentry kind="lib" path="lib/las2peer-web-connector-0.5.7.jar"/>
 	<classpathentry kind="lib" path="lib/mail-1.4.7.jar"/>
 	<classpathentry kind="lib" path="lib/mysql-connector-java-5.1.6.jar"/>
 	<classpathentry kind="lib" path="lib/nimbus-jose-jwt-4.0.jar"/>
 	<classpathentry kind="lib" path="lib/oauth2-oidc-sdk-4.17.jar"/>
-    <classpathentry kind="lib" path="lib/org.apache.felix.bundlerepository-1.4.2.jar"/>
-    <classpathentry kind="lib" path="lib/org.apache.felix.framework-2.0.2.jar"/>
-    <classpathentry kind="lib" path="lib/org.apache.felix.main-2.0.2.jar"/>
-	<classpathentry kind="lib" path="lib/org.apache.felix.shell.tui-1.4.1.jar"/>
-	<classpathentry kind="lib" path="lib/org.apache.felix.shell-1.4.1.jar"/>
-	<classpathentry kind="lib" path="lib/org.osgi.core-1.0.1.jar"/>
-	<classpathentry kind="lib" path="lib/org.osgi.service.obr-1.0.2.jar"/>
-	<classpathentry kind="lib" path="lib/persistence-api-1.0.jar"/>
 	<classpathentry kind="lib" path="lib/reflections-0.9.10.jar"/>
 	<classpathentry kind="lib" path="lib/slf4j-api-1.6.3.jar"/>
 	<classpathentry kind="lib" path="lib/snakeyaml-1.12.jar"/>

diff --git a/.gitignore b/.gitignore
@@ -21,10 +21,12 @@ etc/ivy/ivy.jar
 restMapping.xml
 /out
 /output/
+bin/start_network.bat
+bin/start_network.sh
 
 # IntelliJ
 .idea/
 
 # Eclipse
 .metadata
-.idea/workspace.xml
+.idea/workspace.xml
diff --git a/bin/JOOQGeneration/run.bat b/bin/JOOQGeneration/run.bat
@@ -1 +1 @@
-java -classpath ../../lib/jooq-3.6.2.jar;../../lib/jooq-meta-3.6.2.jar;../../lib/jooq-codegen-3.6.2.jar;../../lib/mysql-connector-java-5.1.6.jar;. org.jooq.util.GenerationTool /activitytracker_generation_info.xml
+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
diff --git a/bin/JOOQGeneration/run.sh b/bin/JOOQGeneration/run.sh
@@ -1 +1 @@
-java -classpath ../../lib/jooq-3.4.2.jar:../../lib/jooq-meta-3.4.2.jar:../../lib/jooq-codegen-3.4.2.jar:../../lib/mysql-connector-java-5.1.33.jar:. org.jooq.util.GenerationTool /reqbaz_generation_info.xml
+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
diff --git a/bin/start_network.bat b/bin/start_network.bat
diff --git a/bin/start_network.sh b/bin/start_network.sh
diff --git a/etc/activitytracker_demo_data.sql b/etc/activitytracker_demo_data.sql
@@ -18,7 +18,7 @@ VALUES
    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 07:00:00', 'CREATE', 'http://localhost:8080/bazaar/components/2', 'COMPONENT',
+  ('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',
    'PROJECT', 'http://localhost:8080/bazaar/users/2'),
   ('8', '2015-10-21 11:00:00', 'CREATE', 'http://localhost:8080/bazaar/requirements/2', 'REQUIREMENT',

diff --git a/etc/ant_configuration/service.properties b/etc/ant_configuration/service.properties
@@ -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=
+service.dependencies=
diff --git a/etc/de.rwth.dbis.acis.activitytracker.service.ActivityTrackerService.properties b/etc/de.rwth.dbis.acis.activitytracker.service.ActivityTrackerService.properties
@@ -3,3 +3,4 @@ dbPassword=reqbaz
 dbUrl=jdbc:mysql://localhost:3306/reqbaztrack
 lang=BAZAAR_LANG
 country=BAZAAR_COUNTRY
+baseURL=https://localhost:8080/activities/
diff --git a/etc/ivy/ivy.xml b/etc/ivy/ivy.xml
@@ -9,9 +9,11 @@
         <artifact type="jar" ext="jar" conf="*"/>
     </publications>
     <dependencies>
-        <dependency org="i5" name="las2peer" rev="0.5.4" changing="true" conf="platform->*"/>
-        <dependency org="i5" name="las2peer-web-connector" rev="0.5.4" changing="true" conf="platform->*"/>
-        <dependency org="junit" name="junit" rev="4.11" conf="platform->*"/>
+        <!-- platform dependencies -->
+        <dependency org="i5" name="las2peer" rev="0.5.7" changing="true" conf="platform->*"/>
+        <dependency org="i5" name="las2peer-web-connector" rev="0.5.7" changing="true" conf="platform->*"/>
+        <dependency org="junit" name="junit" rev="4.12" conf="platform->*"/>
+        <!-- service dependencies -->
         <dependency org="mysql" name="mysql-connector-java" rev="5.1.6" conf="platform->*"/>
         <dependency org="org.apache.commons" name="commons-pool2" rev="2.2" conf="platform->*"/>
         <dependency org="org.apache.commons" name="commons-dbcp2" rev="2.0" conf="platform->*"/>