- refactoring, moved test code to resources/

Makefile

@@ -18,7 +18,7 @@ LOCALJARS=$(shell if [ -d lib ]; then find lib -name "*.jar" -print |xargs echo
 JAR:=XmlFormatValidationPlugin.jar
 
 # classpath
-JUNITCLASSPATH:=./java/:/usr/share/java/junit4.jar:$(shell find ${ROSETTASDKDEPOSIT} -name "*.jar" -print |xargs echo |sed -e "s/ /:/g"):$(JAR)
+JUNITCLASSPATH:=./java/:./resources/:/usr/share/java/junit4.jar:$(shell find ${ROSETTASDKDEPOSIT} -name "*.jar" -print |xargs echo |sed -e "s/ /:/g"):$(JAR)
 #SOURCESCLASSPATH=org/slub/rosetta/dps/repository/plugin/storage/nfs
 CLASSPATH:=${ROSETTASDKDEPOSIT}/dps-sdk-${ROSETTAVERSION}.jar:${LOCALJARS}
 #BUILDPATH=$(CLASSPATH)
@@ -28,6 +28,9 @@ SOURCES:=$(shell find java/ -name "*.java" -print | xargs echo )
 OBJS:=$(SOURCES:.java=.class)
 BUILD:=build/
 
+TESTSOURCES:=$(shell find resources/ -name "*.java" -print | xargs echo )
+TESTOBJS:=$(TESTSOURCES:.java=.class)
+
 all: $(BUILD) $(JAR)
 
 help:
@@ -40,16 +43,16 @@ help:
 jarclean:
 	@rm -Rf $(BUILD)
 
-test_dtd: $(JAR)
+test_dtd: $(TESTOBJS) $(JAR)
 	java -Djaxp.debug=1 -cp ${CLASSPATH}:$(JUNITCLASSPATH) org.junit.runner.JUnitCore  org.slub.rosetta.dps.repository.plugin.Validation.TestValidateDTD;
 
-test_schema: $(JAR)
+test_schema: $(TESTOBJS) $(JAR)
 	java -cp ${CLASSPATH}:$(JUNITCLASSPATH) org.junit.runner.JUnitCore  org.slub.rosetta.dps.repository.plugin.Validation.TestValidateSchema;
 
-test_relaxNG: $(JAR)
+test_relaxNG: $(TESTOBJS) $(JAR)
 	java -cp ${CLASSPATH}:$(JUNITCLASSPATH) org.junit.runner.JUnitCore  org.slub.rosetta.dps.repository.plugin.Validation.TestValidateRelaxNG;
 
-test_combined: $(JAR)
+test_combined: $(TESTOBJS) $(JAR)
 	java -cp ${CLASSPATH}:$(JUNITCLASSPATH) org.junit.runner.JUnitCore  org.slub.rosetta.dps.repository.plugin.TestXmlFormatValidationPlugin
 
 test: test_dtd test_schema test_relaxNG
@@ -68,9 +71,10 @@ $(BUILD):
 	@mkdir $@/lib
 
 $(JAR): $(OBJS)
-	@cp -r resources $(BUILD)
+	#@cp -r resources $(BUILD)
 	@cp -r PLUGIN-INF/ $(BUILD)
 	@cp -r META-INF/ $(BUILD)
+	@cp -r lib/ $(BUILD)
 	@cd java; find ./ -name "*.class" -print -exec cp --parents -r \{\} $(PWD)/$(BUILD) \; ; cd ..
 	@cd $(BUILD); ${JAVAPATH}/jar cfvM ../$@ ./* ; cd ..