Skip to content

Commit

Permalink
Merge pull request #28 from rwth-acis/develop
Browse files Browse the repository at this point in the history
version v0.2.5-alpha
  • Loading branch information
hexTileX authored Jun 29, 2016
2 parents 10ed506 + dea5596 commit 7a2c97b
Show file tree
Hide file tree
Showing 29 changed files with 586 additions and 981 deletions.
123 changes: 73 additions & 50 deletions .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -3,54 +3,77 @@
<classpathentry kind="src" path="src/main"/>
<classpathentry kind="src" output="tmp/test" path="src/test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
<classpathentry kind="lib" path="lib/las2peer-0.4.0.jar"/>
<classpathentry kind="lib" path="lib/las2peer-rest-mapper-0.4-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/las2peer-web-connector-0.4-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/junit-4.11.jar"/>
<classpathentry kind="lib" path="lib/sqlite-jdbc-3.7.2.jar" sourcepath="lib/sqlite-jdbc-3.7.2.jar"/>
<classpathentry kind="lib" path="lib/gson-2.3.jar"/>
<classpathentry kind="lib" path="lib/jooq-3.7.2.jar"/>
<classpathentry kind="lib" path="lib/mysql-connector-java-5.1.33.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/activation-1.1.jar"/>
<classpathentry kind="lib" path="lib/ant-junit-1.6.5.jar"/>
<classpathentry kind="lib" path="lib/bcprov-jdk15on-1.50.jar"/>
<classpathentry kind="lib" path="lib/commons-codec-1.9.jar"/>
<classpathentry kind="lib" path="lib/commons-lang3-3.3.1.jar"/>
<classpathentry kind="lib" path="lib/FreePastry-2.1.jar"/>
<classpathentry kind="lib" path="lib/hamcrest-all-1.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/integration-1.6.1.jar"/>
<classpathentry kind="lib" path="lib/jcip-annotations-1.0.jar"/>
<classpathentry kind="lib" path="lib/integration-1.6.1.jar"/>
<classpathentry kind="lib" path="lib/jdbc-api-1.4.jar"/>
<classpathentry kind="lib" path="lib/json-simple-1.1.jar"/>
<classpathentry kind="lib" path="lib/json-smart-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/jooq-meta-3.7.2.jar"/>
<classpathentry kind="lib" path="lib/jooq-codegen-3.7.2.jar"/>
<classpathentry kind="lib" path="lib/jsr311-api-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/lang-tag-1.4.jar"/>
<classpathentry kind="lib" path="lib/nestedvm-1.0.jar"/>
<classpathentry kind="lib" path="lib/mail-1.4.7.jar"/>
<classpathentry kind="lib" path="lib/nimbus-jose-jwt-2.26.jar"/>
<classpathentry kind="lib" path="lib/oauth2-oidc-sdk-3.3.jar"/>
<classpathentry kind="lib" path="lib/persistence-api-1.0.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/xpp3-1.1.4c.jar"/>
<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-lang3-3.3.2.jar"/>
<classpathentry kind="lib" path="lib/commons-logging-1.1.3.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/gson-2.3.jar"/>
<classpathentry kind="lib" path="lib/guava-18.0.jar"/>
<classpathentry kind="lib" path="lib/hamcrest-all-1.3.jar"/>
<classpathentry kind="lib" path="lib/hamcrest-core-1.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"/>
<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-simple-1.1.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.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/mail-1.4.7.jar"/>
<classpathentry kind="lib" path="lib/mysql-connector-java-5.1.6.jar"/>
<classpathentry kind="lib" path="lib/nestedvm-1.0.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"/>
<classpathentry kind="lib" path="lib/sqlite-jdbc-3.7.2.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="output" path="tmp/classes"/>
</classpath>
</classpath>
8 changes: 4 additions & 4 deletions bin/JOOQGeneration/reqbaz_generation_info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<!-- Configure the database connection here -->
<jdbc>
<driver>com.mysql.jdbc.Driver</driver>
<url>jdbc:mysql://beckmann.informatik.rwth-aachen.de:3306/reqbazdev</url>
<user>bazaardevel</user>
<password>2gdtrf54ZT&amp;T</password>
<url>jdbc:mysql://localhost:3306/reqbaz</url>
<user>root</user>
<password>reqbaz</password>
</jdbc>

<generator>
Expand All @@ -20,7 +20,7 @@

<!-- The database schema (or in the absence of schema support, in your RDBMS this
can be the owner, user, database name) to be generated -->
<inputSchema>reqbazdev</inputSchema>
<inputSchema>reqbaz</inputSchema>

<!-- All elements that are generated from your schema
(A Java regular expression. Use the pipe to separate several expressions)
Expand Down
Empty file modified bin/start_ServiceAgentGenerator.bat
100755 → 100644
Empty file.
17 changes: 4 additions & 13 deletions bin/start_ServiceAgentGenerator.sh
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
#! /bin/bash
#!/bin/bash

SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd ${SCRIPTDIR}/../
BASE=${PWD}
export CLASSPATH="${PWD}/lib/*"

if [[ "$#" -ne 2 ]]; then
echo "Syntax error!"
echo ""
echo "Usage: start_ServiceAgentGenerator <service.canonical.class.name> <service.password>";
else
java -cp "${CLASSPATH}" i5.las2peer.tools.ServiceAgentGenerator $1 $2
fi
# this scripts generates a xml file for the specified ServiceClass with the desired ServicePass
# pls run the script form the root folder of your deployment, e. g. ./bin/start_ServiceAgentGenerator.sh

java -cp "lib/*" i5.las2peer.tools.ServiceAgentGenerator "$@"
Empty file modified bin/start_UserAgentGenerator.bat
100755 → 100644
Empty file.
16 changes: 4 additions & 12 deletions bin/start_UserAgentGenerator.sh
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
#! /bin/bash
#!/bin/bash

SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd ${SCRIPTDIR}/../
BASE=${PWD}
export CLASSPATH="${PWD}/lib/*"
# this scripts generates an user agent as xml file in order to upload it via the startup folder
# pls run the script form the root folder of your deployment, e. g. ./bin/start_UserAgentGenerator.sh

if [[ "$#" -ne 3 ]]; then
echo "Syntax error!"
echo ""
echo "Usage: start_UserAgentGenerator <user.name> <user.pass> <user.mail>";
else
java -cp "${CLASSPATH}" i5.las2peer.tools.UserAgentGenerator $2 $1 $3
fi
java -cp "lib/*" i5.las2peer.tools.UserAgentGenerator "$@"
21 changes: 12 additions & 9 deletions bin/start_network.bat
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
:: this script starts a las2peer node providing the example service of this project
:: pls execute it from the bin folder of your deployment by double-clicking on it
:: this script is autogenerated by 'ant startscripts'
:: it starts a LAS2peer node providing the service '${service.name}.${service.class}' of this project
:: pls execute it from the bin folder of your deployment by double-clicking on it

%~d0
cd %~p0
cd ..
set BASE=%CD%
set CLASSPATH="%BASE%/lib/*;"
%~d0
cd %~p0
cd ..
set BASE=%CD%
set CLASSPATH="%BASE%/lib/*;"

java -cp %CLASSPATH% i5.las2peer.tools.L2pNodeLauncher -w -p 9011 uploadStartupDirectory('etc/startup') startService('de.rwth.dbis.acis.bazaar.service.BazaarService','SampleServicePass') startService('de.rwth.dbis.acis.bazaar.service.UsersResource','SampleServicePass') startService('de.rwth.dbis.acis.bazaar.service.ProjectsResource','SampleServicePass') startService('de.rwth.dbis.acis.bazaar.service.ComponentsResource','SampleServicePass') startService('de.rwth.dbis.acis.bazaar.service.RequirementsResource','SampleServicePass') startService('de.rwth.dbis.acis.bazaar.service.CommentsResource','SampleServicePass') startService('de.rwth.dbis.acis.bazaar.service.AttachmentsResource','SampleServicePass') startWebConnector interactive
pause
java -cp %CLASSPATH% i5.las2peer.tools.L2pNodeLauncher -p 9011 uploadStartupDirectory startService('de.rwth.dbis.acis.bazaar.service.BazaarService@0.2','Passphrase') startService('de.rwth.dbis.acis.bazaar.service.ProjectsResource@0.2','Passphrase') startService('de.rwth.dbis.acis.bazaar.service.ComponentsResource@0.2','Passphrase') startService('de.rwth.dbis.acis.bazaar.service.RequirementsResource@0.2','Passphrase') startService('de.rwth.dbis.acis.bazaar.service.CommentsResource@0.2','Passphrase') startService('de.rwth.dbis.acis.bazaar.service.AttachmentsResource@0.2','Passphrase') startService('de.rwth.dbis.acis.bazaar.service.UsersResource@0.2','Passphrase') startWebConnector interactive

pause

8 changes: 5 additions & 3 deletions bin/start_network.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#!/bin/bash

# this script starts a las2peer node providing the example service of this project
# pls execute it from the root folder of your deployment, e. g. ./bin/start_network.sh
# this script is autogenerated by 'ant startscripts'
# it starts a LAS2peer node providing the service '${service.name}.${service.class}' of this project
# pls execute it from the root folder of your deployment, e. g. ./bin/start_network.sh

java -cp "lib/*" i5.las2peer.tools.L2pNodeLauncher -p 9011 uploadStartupDirectory\(\'etc/startup\'\) startService\(\'de.rwth.dbis.acis.bazaar.service.BazaarService\',\'SampleServicePass\'\) startService\(\'de.rwth.dbis.acis.bazaar.service.UsersResource\',\'SampleServicePass\'\) startService\(\'de.rwth.dbis.acis.bazaar.service.ProjectsResource\',\'SampleServicePass\'\) startService\(\'de.rwth.dbis.acis.bazaar.service.ComponentsResource\',\'SampleServicePass\'\) startService\(\'de.rwth.dbis.acis.bazaar.service.RequirementsResource\',\'SampleServicePass\'\) startService\(\'de.rwth.dbis.acis.bazaar.service.CommentsResource\',\'SampleServicePass\'\) startService\(\'de.rwth.dbis.acis.bazaar.service.AttachmentsResource\',\'SampleServicePass\'\) startWebConnector interactive
java -cp "lib/*" i5.las2peer.tools.L2pNodeLauncher -p 9011 uploadStartupDirectory startService\(\'[email protected]\',\'Passphrase\'\) startService\(\'[email protected]\',\'Passphrase\'\) startService\(\'[email protected]\',\'Passphrase\'\) startService\(\'[email protected]\',\'Passphrase\'\) startService\(\'[email protected]\',\'Passphrase\'\) startService\(\'[email protected]\',\'Passphrase\'\) startService\(\'[email protected]\',\'Passphrase\'\) startWebConnector interactive

11 changes: 0 additions & 11 deletions bin/start_network_debug.bat

This file was deleted.

6 changes: 0 additions & 6 deletions bin/start_network_debug.sh

This file was deleted.

Loading

0 comments on commit 7a2c97b

Please sign in to comment.