summaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/project/README1
-rw-r--r--java/project/build.xml8
-rw-r--r--java/project/src/main/java/ch/asynk/Main.java (renamed from java/project/src/main/ch/asynk/Main.java)0
-rw-r--r--java/project/src/main/java/ch/asynk/MyClass.java (renamed from java/project/src/main/ch/asynk/MyClass.java)0
-rw-r--r--java/project/src/main/java/ch/asynk/MyException.java (renamed from java/project/src/main/ch/asynk/MyException.java)0
-rw-r--r--java/project/src/main/resources/Application.properties (renamed from java/project/src/resources/Application.properties)0
-rw-r--r--java/project/src/main/resources/logback-test.xml (renamed from java/project/src/resources/logback-test.xml)0
7 files changed, 5 insertions, 4 deletions
diff --git a/java/project/README b/java/project/README
new file mode 100644
index 0000000..39331f1
--- /dev/null
+++ b/java/project/README
@@ -0,0 +1 @@
+http://maven.apache.org/guides/introduction/introduction-to-the-standard-directory-layout.html
diff --git a/java/project/build.xml b/java/project/build.xml
index 0134266..d2788ee 100644
--- a/java/project/build.xml
+++ b/java/project/build.xml
@@ -5,7 +5,7 @@
default="test">
<target name="configure">
- <property file="${basedir}/src/resources/Application.properties"/>
+ <property file="${basedir}/src/main/resources/Application.properties"/>
<property name="src.dir" value="${basedir}/src" />
<property name="build.dir" value="${basedir}/build"/>
<property name="dist.dir" value="${basedir}/dist"/>
@@ -13,7 +13,7 @@
<property name="main.dir" value="${src.dir}/main" />
<property name="test.dir" value="${src.dir}/test" />
- <property name="resources.dir" value="${src.dir}/resources"/>
+ <property name="resources.dir" value="${main.dir}/resources"/>
<property name="classes.dir" value="${build.dir}/classes"/>
<property name="class.main" value="ch.asynk.Main"/>
@@ -120,7 +120,7 @@
<attribute name="Main-Class" value="${class.main}"/>
<attribute name="Class-Path" value="${cp.manifest}"/>
</manifest>
- <fileset dir="${src.dir}/resources"/>
+ <fileset dir="${resources.dir}"/>
</jar>
</target>
@@ -130,7 +130,7 @@
<attribute name="Main-Class" value="${class.main}"/>
<attribute name="Class-Path" value="."/>
</manifest>
- <fileset dir="${src.dir}/resources"/>
+ <fileset dir="${resources.dir}"/>
<!-- FIXES Invalid signature file digest for Manifest main attributes -->
<!-- TODO use filter.sign.out -->
<zipfileset src="${jar.name}-deps.jar" excludes="META-INF/*.SF" />
diff --git a/java/project/src/main/ch/asynk/Main.java b/java/project/src/main/java/ch/asynk/Main.java
index bb187bf..bb187bf 100644
--- a/java/project/src/main/ch/asynk/Main.java
+++ b/java/project/src/main/java/ch/asynk/Main.java
diff --git a/java/project/src/main/ch/asynk/MyClass.java b/java/project/src/main/java/ch/asynk/MyClass.java
index 57ef46f..57ef46f 100644
--- a/java/project/src/main/ch/asynk/MyClass.java
+++ b/java/project/src/main/java/ch/asynk/MyClass.java
diff --git a/java/project/src/main/ch/asynk/MyException.java b/java/project/src/main/java/ch/asynk/MyException.java
index 06203ae..06203ae 100644
--- a/java/project/src/main/ch/asynk/MyException.java
+++ b/java/project/src/main/java/ch/asynk/MyException.java
diff --git a/java/project/src/resources/Application.properties b/java/project/src/main/resources/Application.properties
index 34430cd..34430cd 100644
--- a/java/project/src/resources/Application.properties
+++ b/java/project/src/main/resources/Application.properties
diff --git a/java/project/src/resources/logback-test.xml b/java/project/src/main/resources/logback-test.xml
index 7f49e52..7f49e52 100644
--- a/java/project/src/resources/logback-test.xml
+++ b/java/project/src/main/resources/logback-test.xml