diff --git a/openbis_knime/.classpath b/openbis_knime/.classpath index c3513cd8d96a27277f0a19d100e987639f9a0a06..aea483a67d1e3a0bcda1da3d8d76c6f3e328d1ef 100644 --- a/openbis_knime/.classpath +++ b/openbis_knime/.classpath @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="source/java"/> + <classpathentry kind="src" path="sourceTest/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="lib" path="/libraries/knime/knime-base.jar"> <attributes> diff --git a/openbis_knime/build/build.xml b/openbis_knime/build/build.xml index d1c06b489b1c925ac0850a2efae1b5f7d7d80512..d35289c5ffb0ec723344ad8feba3971a81006606 100644 --- a/openbis_knime/build/build.xml +++ b/openbis_knime/build/build.xml @@ -29,9 +29,8 @@ // Creates build information. --> <target name="build-info" description="Creates build information."> - <!--build-info revision="revision.number" version="version.number" clean="clean.flag" /> - <echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo--> - <echo file="${build.info.file}">abc:123:d</echo> + <build-info revision="revision.number" version="version.number" clean="clean.flag" /> + <echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo> </target> <!-- @@ -56,7 +55,6 @@ --> <target name="dist" description="Makes a distribution file." depends="clean, jar"> - <!--property name="dist.file.name" value="ch.systemsx.cisd.openbis.knime-${version}.v${version.number}-r${revision.number}.zip" /--> <property name="dist.file.name" value="${dist}/ch.systemsx.cisd.openbis.knime-${version}.jar" /> <jar destfile="${dist.file.name}" manifest="${original.dist}/META-INF/MANIFEST.MF"> @@ -84,25 +82,4 @@ <target name="ci" depends="build-common.ci, check-dependencies, dist" description="Task for continuous integration server." /> - <!-- - // Compiles the javascript using GWT compiler. - --> - <target name="compile-javascript" description="Compiles the javascript using GWT compiler."> - <property name="application.gwt.path" value="ch.systemsx.cisd.datamover.console.DatamoverConsole" /> - <echo></echo> - <delete dir="${webapp.dist}" /> - <java classpath="${ecp}:${gwt.dev.lib}:${gwt.user.lib}:${sources}" - classname="com.google.gwt.dev.GWTCompiler" - fork="true"> - <jvmarg value="-Xmx512M" /> - <arg value="-out" /> - <arg value="${webapp.dist}" /> - <arg value="${application.gwt.path}" /> - </java> - <move todir="${webapp.dist}"> - <fileset dir="${webapp.dist}/${application.gwt.path}" /> - </move> - </target> - - </project> \ No newline at end of file diff --git a/openbis_knime/resource/dependency-structure.ddf b/openbis_knime/resource/dependency-structure.ddf new file mode 100644 index 0000000000000000000000000000000000000000..6500badf3d5638dcd1508c178db3bd65867af833 --- /dev/null +++ b/openbis_knime/resource/dependency-structure.ddf @@ -0,0 +1,3 @@ +#show allResults + +{project} = ch.systemsx.cisd.openbis.knime diff --git a/openbis_knime/sourceTest/java/tests.xml b/openbis_knime/sourceTest/java/tests.xml new file mode 100644 index 0000000000000000000000000000000000000000..a2945a02508d24df1883930b2f152592761acc87 --- /dev/null +++ b/openbis_knime/sourceTest/java/tests.xml @@ -0,0 +1,12 @@ +<suite name="All" verbose="2" > + <test name="All" annotations="JDK"> + <groups> + <run> + <exclude name="broken" /> + </run> + </groups> + <packages> + <package name="ch.systemsx.cisd.openbis.knime.*" /> + </packages> + </test> +</suite>