Skip to content

Commit

Permalink
Merge pull request #4 from rwth-acis/develop
Browse files Browse the repository at this point in the history 
v0.1.1-alpha
  • Loading branch information
@gavronek
gavronek committed Jan 30, 2015
2 parents 835e461 + c2d0b69 commit d0d785c
Show file tree
Hide file tree
Showing 49 changed files with 5,430 additions and 4,602 deletions.
5 changes: 2 additions & 3 deletions .idea/misc.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions .idea/modules.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 4 additions & 6 deletions .project
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>Requirements Bazaar Service</name>
<comment></comment>
<projects>
</projects>
<name>Requirement Bazaar</name>
<comment/>
<projects/>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
<arguments/>
</buildCommand>
</buildSpec>
<natures>
Expand Down
28 changes: 28 additions & 0 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
FROM ubuntu:14.04
MAINTAINER István Koren <koren ÄT dbis.rwth-aachen.de>

# Let the container know that there is no tty
ENV DEBIAN_FRONTEND noninteractive

# Update base image
RUN sed -i 's/# \(.*multiverse$\)/\1/g' /etc/apt/sources.list
RUN apt-get update -y
RUN apt-get upgrade -y

# Install build tools
RUN apt-get install -y \
openjdk-7-jdk \
ant

# Set jdk7 as the default JDK
RUN ln -fs /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java /etc/alternatives/java

# create mount point
RUN mkdir /build
WORKDIR /build
VOLUME ["/build"]

# Build code on run
CMD ant clean_all && \
ant generate_configs && \
ant jar
3 changes: 0 additions & 3 deletions LAS2peer Sample Service.iml
View file

This file was deleted.

45 changes: 45 additions & 0 deletions Requirement Bazaar.eml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<component inheritJdk="true">
<exclude-output/>
<contentEntry url="file://$MODULE_DIR$">
<testFolder url="file://$MODULE_DIR$/src/test"/>
</contentEntry>
<lib name="hamcrest-core-1.3.jar" scope="COMPILE">
<relative-module-cls project-related="jar://$PROJECT_DIR$/lib/hamcrest-core-1.3.jar!/"/>
</lib>
<lib name="las2peer-0.3-SNAPSHOT.jar" scope="COMPILE">
<relative-module-cls project-related="jar://$PROJECT_DIR$/lib/las2peer-0.3-SNAPSHOT.jar!/"/>
</lib>
<lib name="las2peer-rest-mapper-0.3-SNAPSHOT.jar" scope="COMPILE">
<relative-module-cls project-related="jar://$PROJECT_DIR$/lib/las2peer-rest-mapper-0.3-SNAPSHOT.jar!/"/>
</lib>
<lib name="las2peer-web-connector-0.3-SNAPSHOT.jar" scope="COMPILE">
<relative-module-cls project-related="jar://$PROJECT_DIR$/lib/las2peer-web-connector-0.3-SNAPSHOT.jar!/"/>
</lib>
<lib name="junit-4.11.jar" scope="COMPILE">
<relative-module-cls project-related="jar://$PROJECT_DIR$/lib/junit-4.11.jar!/"/>
</lib>
<lib name="sqlite-jdbc-3.7.2.jar" scope="COMPILE">
<srcroot url="jar://$MODULE_DIR$/lib/sqlite-jdbc-3.7.2.jar!/"/>
<relative-module-src project-related="jar://$PROJECT_DIR$/lib/sqlite-jdbc-3.7.2.jar!/"/>
<relative-module-cls project-related="jar://$PROJECT_DIR$/lib/sqlite-jdbc-3.7.2.jar!/"/>
</lib>
<lib name="gson-2.3.jar" scope="COMPILE">
<relative-module-cls project-related="jar://$PROJECT_DIR$/lib/gson-2.3.jar!/"/>
</lib>
<lib name="jooq-3.4.2.jar" scope="COMPILE">
<relative-module-cls project-related="jar://$PROJECT_DIR$/lib/jooq-3.4.2.jar!/"/>
</lib>
<lib name="mysql-connector-java-5.1.33.jar" scope="COMPILE">
<relative-module-cls project-related="jar://$PROJECT_DIR$/lib/mysql-connector-java-5.1.33.jar!/"/>
</lib>
<lib name="jodd-bean-3.6.1.jar" scope="COMPILE">
<relative-module-cls project-related="jar://$PROJECT_DIR$/lib/jodd-bean-3.6.1.jar!/"/>
</lib>
<lib name="jodd-core-3.6.1.jar" scope="COMPILE">
<relative-module-cls project-related="jar://$PROJECT_DIR$/lib/jodd-core-3.6.1.jar!/"/>
</lib>
<lib name="jodd-vtor-3.6.1.jar" scope="COMPILE">
<relative-module-cls project-related="jar://$PROJECT_DIR$/lib/jodd-vtor-3.6.1.jar!/"/>
</lib>
</component>
123 changes: 123 additions & 0 deletions Requirement Bazaar.iml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
<?xml version="1.0" encoding="UTF-8"?>
<module classpath="eclipse" classpath-dir="$MODULE_DIR$" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/tmp/classes" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="inheritedJdk" />
<orderEntry type="module-library">
<library name="hamcrest-core-1.3.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/hamcrest-core-1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="las2peer-0.3-SNAPSHOT.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/las2peer-0.3-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="las2peer-rest-mapper-0.3-SNAPSHOT.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/las2peer-rest-mapper-0.3-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="las2peer-web-connector-0.3-SNAPSHOT.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/las2peer-web-connector-0.3-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="junit-4.11.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/junit-4.11.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="sqlite-jdbc-3.7.2.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/sqlite-jdbc-3.7.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/lib/sqlite-jdbc-3.7.2.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="gson-2.3.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/gson-2.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="jooq-3.4.2.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/jooq-3.4.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="mysql-connector-java-5.1.33.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/mysql-connector-java-5.1.33.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="jodd-bean-3.6.1.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/jodd-bean-3.6.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="jodd-core-3.6.1.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/jodd-core-3.6.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="jodd-vtor-3.6.1.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/jodd-vtor-3.6.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
</component>
</module>
6 changes: 4 additions & 2 deletions bin/JOOQGeneration/sqliteSchema.sql
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
-- Created by Vertabelo (http://vertabelo.com)
-- Script type: create
-- Scope: [tables, references, sequences, views, procedures]
-- Generated at Wed Oct 01 11:57:05 UTC 2014
-- Generated at Fri Jan 09 10:19:41 UTC 2015



Expand Down Expand Up @@ -81,7 +81,9 @@ CREATE TABLE Projects (
description varchar(255) NOT NULL,
visibility character(1) NOT NULL,
Leader_Id integer NOT NULL,
FOREIGN KEY (Leader_Id) REFERENCES Users (Id)
Default_Components_Id integer NOT NULL,
FOREIGN KEY (Leader_Id) REFERENCES Users (Id),
FOREIGN KEY (Default_Components_Id) REFERENCES Components (Id)
);

-- Table: Requirements
Expand Down
Loading

0 comments on commit d0d785c

Please sign in to comment.