Skip to content

Commit

Permalink
Merge pull request #24 from rwth-acis/development
Browse files Browse the repository at this point in the history 
Development
  • Loading branch information
@derjasper
derjasper authored Dec 10, 2016
2 parents 75d37a8 + 730937b commit 29177d6
Show file tree
Hide file tree
Showing 29 changed files with 1,755 additions and 736 deletions.
5 changes: 2 additions & 3 deletions .classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="src" path="src/test_help/java"/>
<classpathentry exported="true" kind="lib" path="lib/commons-codec-1.10.jar"/>
<classpathentry exported="true" kind="lib" path="lib/FreePastry-2.1.1.jar" sourcepath="/FreePastry"/>
<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/i5-simpleXML-0.2.jar"/>
<classpathentry kind="lib" path="lib/junit-4.11.jar"/>
<classpathentry kind="lib" path="lib/jaxp-api-1.4.5.jar"/>
<classpathentry kind="lib" path="lib/junit-4.12.jar"/>
<classpathentry exported="true" kind="lib" path="lib/xpp3-1.1.4c.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="output"/>
Expand Down
57 changes: 30 additions & 27 deletions build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<property name="ivy.organisation" value="i5" />
<property name="ivy.module" value="las2peer" />
<property name="ivy.revision" value="0.6" />
<property name="ivy.build.number" value="4" />
<property name="ivy.build.number" value="5" />
<property name="ivy.deliver.revision" value="${ivy.revision}" />
<property name="ivy.pom.version" value="${ivy.revision}" />

Expand All @@ -18,6 +18,8 @@
<property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" />
<property name="ivy.settings.file" value="${ivy.jar.dir}/ivysettings.xml" />
<property name="ivy.dep.file" value="${ivy.jar.dir}/ivy.xml" />
<property name="ivy.pom_template.file" value="${ivy.jar.dir}/pom_template.xml" />
<tstamp><format property="ivy.now" pattern="yyyyMMddHHmmss" /></tstamp>

<property name="src" location="src" />

Expand All @@ -41,8 +43,8 @@
<property name="export.junitdoc" location="${export}/junitdoc" />

<property name="lib.dir" value="lib" />
<property name="lib.cp" location="${lib.dir}/i5-simpleXML-0.2.jar:${lib.dir}/commons-codec-1.10.jar:${lib.dir}/FreePastry-2.1.1.jar:${lib.dir}/junit-4.11.jar:${lib.dir}/xpp3-1.1.4c.jar" />
<property name="lib.junit" location="${lib.dir}/junit-4.11.jar:${lib.dir}/hamcrest-core-1.3.jar" />
<property name="lib.cp" location="${lib.dir}/FreePastry-2.1.1.jar:${lib.dir}/xpp3-1.1.4c.jar" />
<property name="lib.junit" location="${lib.dir}/junit-4.12.jar:${lib.dir}/hamcrest-core-1.3.jar" />

<property name="main-class" value="i5.las2peer.tools.L2pNodeLauncher" />

Expand Down Expand Up @@ -90,6 +92,7 @@

<ivy:makepom
ivyfile="${ivy.dep.file}"
templatefile="${ivy.pom_template.file}"
pomfile="${export}/jars/${ivy.module}.pom"
artifactName="${ivy.module}"
artifactPackaging="jar"
Expand Down Expand Up @@ -317,13 +320,8 @@

<target name="main_jar" depends="compile_all">
<!-- constructs the external libraries classpath name -->
<pathconvert property="classpath.name" pathsep=" ">
<path refid="classpath" />
<mapper>
<chainedmapper>
<flattenmapper />
</chainedmapper>
</mapper>
<pathconvert property="manifest.classpath" refid="classpath" pathsep=" ">
<mapper><chainedmapper><flattenmapper /></chainedmapper></mapper>
</pathconvert>
<jar jarfile="${export.jars}/las2peer.jar">
<fileset dir="${tmp.classes}">
Expand All @@ -332,9 +330,14 @@
<fileset file="etc/las2peer.policy" />
<manifest>
<attribute name="Main-Class" value="${main-class}"/>
<attribute name="Class-Path" value="${classpath.name}" />
<attribute name="Class-Path" value="${manifest.classpath}" />
<attribute name="Implementation-Title" value="${main-class}"/>
<attribute name="Implementation-Version" value="${ivy.las2peer.version}"/>
<attribute name="Implementation-Vendor" value="${ivy.organisation}"/>
</manifest>
</jar>
<!-- create snapshot file -->
<copy file="${export.jars}/las2peer.jar" tofile="${export.jars}/las2peer-${ivy.las2peer.version}.jar"/>
</target>

<target name="test_service_jar" depends="compile_main">
Expand Down Expand Up @@ -391,7 +394,7 @@
windowtitle="las2peer Unit Test Documentation"
failonerror="yes"
encoding="utf8"
classpath="${lib.cp}:${tmp.classes}"
classpath="${lib.cp}:${tmp.classes}:${lib.junit}"
>
<packageset dir="${src.junit}" defaultexcludes="yes">
<include name="i5/las2peer/**" />
Expand Down Expand Up @@ -443,21 +446,21 @@
</target>

<target name="junit_tests" depends="init_junit, junit_jars, compile_all">
<foreach
target="execute.test"
maxthreads="9"
inheritall="true"
inheritrefs="true"
parallel="true"
param="test.source.absolute">
<path>
<fileset dir="${src.junit}">
<include name="**/*Test.java"/>
<exclude name="**/SandboxTest.java"/>
<exclude name="**/ReplicationTest.java"/>
</fileset>
</path>
</foreach>
<for threadCount="9" parallel="true" param="test.source.absolute">
<path>
<fileset dir="${src.junit}">
<include name="**/*Test.java"/>
<exclude name="**/SandboxTest.java"/>
<exclude name="**/ReplicationTest.java"/>
</fileset>
</path>
<sequential>
<antcall target="execute.test" inheritall="true">
<param name="target" value="build" />
<param name="test.source.absolute" value="@{test.source.absolute}" />
</antcall>
</sequential>
</for>
</target>

<target name="test_colored" depends="init_general">
Expand Down
35 changes: 35 additions & 0 deletions img/logo/README.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# las2peer logos

A collection of the las2peer logo

## Standard logo
![logo](https://rwth-acis.github.io/las2peer/logo/vector/las2peer-logo.svg)

| File | Resolution
| ------------- | ------------- |
| [.svg](logo/vector/las2peer-logo.svg) | |
| [.eps](logo/vector/las2peer-logo.eps) | |
| [.pdf](logo/vector/las2peer-logo.pdf) | |
| [.png](logo/bitmap/las2peer-logo-16x16.png) |16x16|
| [.png](logo/bitmap/las2peer-logo-32x32.png) |32x32|
| [.png](logo/bitmap/las2peer-logo-64x64.png) |64x64|
| [.png](logo/bitmap/las2peer-logo-128x128.png) |128x128|


## Logo with text

![logo with text](https://rwth-acis.github.io/las2peer/logo/text/logo_text_black.svg)


| File |
| ------------- |
| [Black text](logo/text/logo_text_black.svg) |

- White text

![logo with text](https://rwth-acis.github.io/las2peer/logo/text/logo_text_white.svg)


| File |
| ------------- |
| [White text](logo/text/logo_text_white.svg) |
Loading

0 comments on commit 29177d6

Please sign in to comment.