Skip to content

Commit

Permalink
Merge pull request #36 from rwth-acis/develop
Browse files Browse the repository at this point in the history 
Release v0.3.0
  • Loading branch information
@hexTileX
hexTileX authored Dec 16, 2016
2 parents ab9d920 + b38cd46 commit 153c927
Show file tree
Hide file tree
Showing 14 changed files with 2,293 additions and 2,259 deletions.
128 changes: 74 additions & 54 deletions .classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,59 +4,79 @@
<classpathentry kind="src" output="tmp/test" path="src/test"/>
<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/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-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/emoji-java-3.1.3.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/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"/>
<classpathentry kind="lib" path="lib/jackson-dataformat-xml-2.4.5.jar"/>
<classpathentry kind="lib" path="lib/jackson-dataformat-yaml-2.4.5.jar"/>
<classpathentry kind="lib" path="lib/jackson-datatype-joda-2.4.5.jar"/>
<classpathentry kind="lib" path="lib/jackson-jaxrs-base-2.4.5.jar"/>
<classpathentry kind="lib" path="lib/jackson-jaxrs-json-provider-2.4.5.jar"/>
<classpathentry kind="lib" path="lib/jackson-module-jaxb-annotations-2.4.5.jar"/>
<classpathentry kind="lib" path="lib/javassist-3.18.2-GA.jar"/>
<classpathentry kind="lib" path="lib/jcip-annotations-1.0.jar"/>
<classpathentry kind="lib" path="lib/joda-time-2.2.jar"/>
<classpathentry kind="lib" path="lib/jodd-bean-3.6.1.jar"/>
<classpathentry kind="lib" path="lib/jodd-core-3.6.1.jar"/>
<classpathentry kind="lib" path="lib/jodd-vtor-3.6.1.jar"/>
<classpathentry kind="lib" path="lib/jooq-3.8.2.jar"/>
<classpathentry kind="lib" path="lib/jooq-codegen-3.8.2.jar"/>
<classpathentry kind="lib" path="lib/jooq-meta-3.8.2.jar"/>
<classpathentry kind="lib" path="lib/json-smart-1.3.1.jar"/>
<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.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/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"/>
<classpathentry kind="lib" path="lib/stax2-api-3.1.4.jar"/>
<classpathentry kind="lib" path="lib/swagger-annotations-1.5.4.jar"/>
<classpathentry kind="lib" path="lib/swagger-core-1.5.4.jar"/>
<classpathentry kind="lib" path="lib/swagger-jaxrs-1.5.4.jar"/>
<classpathentry kind="lib" path="lib/swagger-models-1.5.4.jar"/>
<classpathentry kind="lib" path="lib/validation-api-1.1.0.Final.jar"/>
<classpathentry kind="lib" path="lib/xpp3-1.1.4c.jar"/>
<classpathentry kind="lib" path="lib/annotations-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/aopalliance-repackaged-2.5.0-b05.jar"/>
<classpathentry kind="lib" path="lib/commons-codec-1.10.jar"/>
<classpathentry kind="lib" path="service/commons-codec-1.9.jar"/>
<classpathentry kind="lib" path="service/commons-dbcp2-2.0.jar"/>
<classpathentry kind="lib" path="service/commons-io-2.4.jar"/>
<classpathentry kind="lib" path="lib/commons-lang3-3.3.2.jar"/>
<classpathentry kind="lib" path="service/commons-logging-1.2.jar"/>
<classpathentry kind="lib" path="service/commons-pool2-2.2.jar"/>
<classpathentry kind="lib" path="service/emoji-java-3.1.3.jar"/>
<classpathentry kind="lib" path="lib/FreePastry-2.1.1.jar"/>
<classpathentry kind="lib" path="service/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/hk2-api-2.5.0-b05.jar"/>
<classpathentry kind="lib" path="lib/hk2-locator-2.5.0-b05.jar"/>
<classpathentry kind="lib" path="lib/hk2-utils-2.5.0-b05.jar"/>
<classpathentry kind="lib" path="service/httpclient-4.5.1.jar"/>
<classpathentry kind="lib" path="service/httpcore-4.4.3.jar"/>
<classpathentry kind="lib" path="lib/i5-simpleXML-0.2.jar"/>
<classpathentry kind="lib" path="lib/jackson-annotations-2.5.4.jar"/>
<classpathentry kind="lib" path="lib/jackson-core-2.5.4.jar"/>
<classpathentry kind="lib" path="lib/jackson-databind-2.5.4.jar"/>
<classpathentry kind="lib" path="lib/jackson-dataformat-xml-2.4.5.jar"/>
<classpathentry kind="lib" path="lib/jackson-dataformat-yaml-2.4.5.jar"/>
<classpathentry kind="lib" path="lib/jackson-datatype-joda-2.4.5.jar"/>
<classpathentry kind="lib" path="lib/jackson-jaxrs-base-2.5.4.jar"/>
<classpathentry kind="lib" path="lib/jackson-jaxrs-json-provider-2.5.4.jar"/>
<classpathentry kind="lib" path="lib/jackson-module-jaxb-annotations-2.5.4.jar"/>
<classpathentry kind="lib" path="lib/javassist-3.20.0-GA.jar"/>
<classpathentry kind="lib" path="lib/javax.annotation-api-1.2.jar"/>
<classpathentry kind="lib" path="lib/javax.inject-2.5.0-b05.jar"/>
<classpathentry kind="lib" path="lib/javax.ws.rs-api-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/jcip-annotations-1.0.jar"/>
<classpathentry kind="lib" path="lib/jersey-client-2.23.2.jar"/>
<classpathentry kind="lib" path="lib/jersey-common-2.23.2.jar"/>
<classpathentry kind="lib" path="lib/jersey-container-servlet-core-2.1.jar"/>
<classpathentry kind="lib" path="lib/jersey-entity-filtering-2.23.2.jar"/>
<classpathentry kind="lib" path="lib/jersey-guava-2.23.2.jar"/>
<classpathentry kind="lib" path="lib/jersey-media-jaxb-2.23.2.jar"/>
<classpathentry kind="lib" path="lib/jersey-media-json-jackson-2.23.2.jar"/>
<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/jodd-bean-3.6.1.jar"/>
<classpathentry kind="lib" path="service/jodd-core-3.6.1.jar"/>
<classpathentry kind="lib" path="service/jodd-vtor-3.6.1.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/json-20140107.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"/>
<classpathentry kind="lib" path="lib/las2peer-0.6.4.jar"/>
<classpathentry kind="lib" path="lib/las2peer-rest-mapper-0.6.4.jar"/>
<classpathentry kind="lib" path="lib/las2peer-web-connector-0.6.4.jar"/>
<classpathentry kind="lib" path="lib/mail-1.4.7.jar"/>
<classpathentry kind="lib" path="lib/mimepull-1.8.jar"/>
<classpathentry kind="lib" path="service/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/osgi-resource-locator-1.0.1.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"/>
<classpathentry kind="lib" path="lib/stax2-api-3.1.4.jar"/>
<classpathentry kind="lib" path="lib/swagger-annotations-1.5.10.jar"/>
<classpathentry kind="lib" path="lib/swagger-core-1.5.10.jar"/>
<classpathentry kind="lib" path="lib/swagger-jaxrs-1.5.10.jar"/>
<classpathentry kind="lib" path="lib/swagger-jersey2-jaxrs-1.5.10.jar"/>
<classpathentry kind="lib" path="lib/swagger-models-1.5.10.jar"/>
<classpathentry kind="lib" path="lib/validation-api-1.1.0.Final.jar"/>
<classpathentry kind="lib" path="lib/xpp3-1.1.4c.jar"/>
<classpathentry kind="output" path="tmp/classes"/>
</classpath>
28 changes: 14 additions & 14 deletions etc/ant_configuration/service.properties
View file
Original file line number Diff line number Diff line change
@@ -1,48 +1,48 @@
service.0.version=0.2
service.0.version=0.3
service.0.name=de.rwth.dbis.acis.bazaar.service
service.0.path=de/rwth/dbis/acis/bazaar/service
service.0.class=BazaarService
service.0.passphrase=Passphrase
service.0.dependencies=
service.0.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",emoji-java;version="3.1.3",gson;version="2.3",httpclient;version="4.5.1",httpcore;version="4.4.3",jodd-bean;version="3.6.1",jodd-core;version="3.6.1",jodd-vtor;version="3.6.1",jooq;version="3.8.2",jooq-codegen;version="3.8.2",jooq-meta;version="3.8.2",json;version="20140107",mysql-connector-java;version="5.1.6"

service.1.version=0.2
service.1.version=0.3
service.1.name=de.rwth.dbis.acis.bazaar.service
service.1.path=de/rwth/dbis/acis/bazaar/service
service.1.class=ProjectsResource
service.1.passphrase=Passphrase
service.1.dependencies=
service.1.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",emoji-java;version="3.1.3",gson;version="2.3",httpclient;version="4.5.1",httpcore;version="4.4.3",jodd-bean;version="3.6.1",jodd-core;version="3.6.1",jodd-vtor;version="3.6.1",jooq;version="3.8.2",jooq-codegen;version="3.8.2",jooq-meta;version="3.8.2",json;version="20140107",mysql-connector-java;version="5.1.6"

service.2.version=0.2
service.2.version=0.3
service.2.name=de.rwth.dbis.acis.bazaar.service
service.2.path=de/rwth/dbis/acis/bazaar/service
service.2.class=ComponentsResource
service.2.passphrase=Passphrase
service.2.dependencies=
service.2.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",emoji-java;version="3.1.3",gson;version="2.3",httpclient;version="4.5.1",httpcore;version="4.4.3",jodd-bean;version="3.6.1",jodd-core;version="3.6.1",jodd-vtor;version="3.6.1",jooq;version="3.8.2",jooq-codegen;version="3.8.2",jooq-meta;version="3.8.2",json;version="20140107",mysql-connector-java;version="5.1.6"

service.3.version=0.2
service.3.version=0.3
service.3.name=de.rwth.dbis.acis.bazaar.service
service.3.path=de/rwth/dbis/acis/bazaar/service
service.3.class=RequirementsResource
service.3.passphrase=Passphrase
service.3.dependencies=
service.3.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",emoji-java;version="3.1.3",gson;version="2.3",httpclient;version="4.5.1",httpcore;version="4.4.3",jodd-bean;version="3.6.1",jodd-core;version="3.6.1",jodd-vtor;version="3.6.1",jooq;version="3.8.2",jooq-codegen;version="3.8.2",jooq-meta;version="3.8.2",json;version="20140107",mysql-connector-java;version="5.1.6"

service.4.version=0.2
service.4.version=0.3
service.4.name=de.rwth.dbis.acis.bazaar.service
service.4.path=de/rwth/dbis/acis/bazaar/service
service.4.class=CommentsResource
service.4.passphrase=Passphrase
service.4.dependencies=
service.4.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",emoji-java;version="3.1.3",gson;version="2.3",httpclient;version="4.5.1",httpcore;version="4.4.3",jodd-bean;version="3.6.1",jodd-core;version="3.6.1",jodd-vtor;version="3.6.1",jooq;version="3.8.2",jooq-codegen;version="3.8.2",jooq-meta;version="3.8.2",json;version="20140107",mysql-connector-java;version="5.1.6"

service.5.version=0.2
service.5.version=0.3
service.5.name=de.rwth.dbis.acis.bazaar.service
service.5.path=de/rwth/dbis/acis/bazaar/service
service.5.class=AttachmentsResource
service.5.passphrase=Passphrase
service.5.dependencies=
service.5.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",emoji-java;version="3.1.3",gson;version="2.3",httpclient;version="4.5.1",httpcore;version="4.4.3",jodd-bean;version="3.6.1",jodd-core;version="3.6.1",jodd-vtor;version="3.6.1",jooq;version="3.8.2",jooq-codegen;version="3.8.2",jooq-meta;version="3.8.2",json;version="20140107",mysql-connector-java;version="5.1.6"

service.6.version=0.2
service.6.version=0.3
service.6.name=de.rwth.dbis.acis.bazaar.service
service.6.path=de/rwth/dbis/acis/bazaar/service
service.6.class=UsersResource
service.6.passphrase=Passphrase
service.6.dependencies=
service.6.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",emoji-java;version="3.1.3",gson;version="2.3",httpclient;version="4.5.1",httpcore;version="4.4.3",jodd-bean;version="3.6.1",jodd-core;version="3.6.1",jodd-vtor;version="3.6.1",jooq;version="3.8.2",jooq-codegen;version="3.8.2",jooq-meta;version="3.8.2",json;version="20140107",mysql-connector-java;version="5.1.6"
2 changes: 1 addition & 1 deletion etc/de.rwth.dbis.acis.bazaar.service.BazaarService.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ lang=eng
country=us
baseURL=http://localhost:8080/bazaar/
frontendBaseURL=http://localhost:5000/
activityTrackerService=de.rwth.dbis.acis.activitytracker.service.ActivityTrackerService@0.1
activityTrackerService=de.rwth.dbis.acis.activitytracker.service.ActivityTrackerService@0.2
smtpServer=
emailFromAddress=
26 changes: 13 additions & 13 deletions etc/ivy/ivy.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@
</publications>
<dependencies>
<!-- 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="i5" name="las2peer" rev="0.6.4" changing="true" conf="platform->*"/>
<dependency org="i5" name="las2peer-web-connector" rev="0.6.4" 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->*"/>
<dependency org="org.jooq" name="jooq" rev="3.8.2" conf="platform->*"/>
<dependency org="org.jooq" name="jooq-codegen" rev="3.8.2" conf="platform->*"/>
<dependency org="org.jooq" name="jooq-meta" rev="3.8.2" conf="platform->*"/>
<dependency org="com.google.code.gson" name="gson" rev="2.3" conf="platform->*"/>
<dependency org="org.apache.httpcomponents" name="httpclient" rev="4.5.1" conf="platform->*"/>
<dependency org="commons-io" name="commons-io" rev="2.4" conf="platform->*"/>
<dependency org="org.jodd" name="jodd-vtor" rev="3.6.1" conf="platform->*"/>
<dependency org="com.vdurmont" name="emoji-java" rev="3.1.3" conf="platform->*"/>
<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="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.6.1" conf="bundle->default"/>
<dependency org="com.vdurmont" name="emoji-java" rev="3.1.3" conf="bundle->default"/>
</dependencies>
</ivy-module>
Loading

0 comments on commit 153c927

Please sign in to comment.