diff --git a/openbis_api/.classpath b/openbis_api/.classpath index 160fd600e2ec372056168902450419803816a990..d215efaed684e967de00a66359688053c25dfb74 100644 --- a/openbis_api/.classpath +++ b/openbis_api/.classpath @@ -2,14 +2,8 @@ <classpath> <classpathentry kind="src" path="source/java"/> <classpathentry kind="src" path="sourceTest/java"/> + <classpathentry exported="true" kind="src" path="/common"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="lib" path="/libraries/commons-lang/commons-lang.jar" sourcepath="/libraries/commons-lang/src.zip"/> - <classpathentry combineaccessrules="false" kind="src" path="/common"/> - <classpathentry kind="lib" path="/libraries/spring/spring-core.jar"/> - <classpathentry kind="lib" path="/libraries/cisd-base/cisd-base.jar" sourcepath="/libraries/cisd-base/cisd-base-src.zip"/> - <classpathentry kind="lib" path="/libraries/jackson/jackson-annotations.jar"/> - <classpathentry kind="lib" path="/libraries/jackson/jackson-core.jar"/> - <classpathentry kind="lib" path="/libraries/jackson/jackson-databind.jar"/> - <classpathentry kind="lib" path="/libraries/testng/testng-jdk15.jar" sourcepath="/libraries/testng/src.zip"/> + <classpathentry exported="true" kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer"/> <classpathentry kind="output" path="targets/classes"/> </classpath> diff --git a/openbis_api/.project b/openbis_api/.project index 47cf991eb35bf190b50e4f2a975353d9ac568fe7..9c7b1bd2abb04e27081fa06ebae0497f58d1d13f 100644 --- a/openbis_api/.project +++ b/openbis_api/.project @@ -12,6 +12,7 @@ </buildCommand> </buildSpec> <natures> + <nature>org.springsource.ide.eclipse.gradle.core.nature</nature> <nature>org.eclipse.jdt.core.javanature</nature> </natures> <filteredResources> diff --git a/openbis_api/build/antrun.sh b/openbis_api/build/antrun.sh deleted file mode 100755 index 5ff1a62b259d6011d228440f2fb89ec0dbecf747..0000000000000000000000000000000000000000 --- a/openbis_api/build/antrun.sh +++ /dev/null @@ -1,6 +0,0 @@ -#! /bin/bash - -ME="$0" -MYDIR=${ME%/*} -cd $MYDIR -ant -lib ../../build_resources/lib/ecj.jar "$@" diff --git a/openbis_api/build/build.xml b/openbis_api/build/build.xml deleted file mode 100644 index 9b7fcf46b3c5ef6b1ace6ecf60db062495d556f4..0000000000000000000000000000000000000000 --- a/openbis_api/build/build.xml +++ /dev/null @@ -1,36 +0,0 @@ -<project name="openbis_api" default="ci" basedir=".."> - <import file="../../build_resources/ant/build-common.xml" /> - <project-classpath name="ecp" classes="${classes}" /> - - <property name="mainfolder" value="openbis_api" /> - - <target name="compile" depends="build-common.compile" /> - - <target name="run-tests"> - <antcall target="build-common.run-tests"> - <param name="test.suite" value="tests.xml" /> - </antcall> - </target> - - <!-- - // Task for creating distributions - --> - <target name="dist" depends="compile"> - <!-- create an empty dist folder to avoid confusions from external build scripts --> - <mkdir dir="${dist}"/> - </target> - - <!-- - // Task for continuous integration server. - --> - <target name="ci" depends="build-common.ci, dist, check-dependencies" /> - - <!-- - // Cleans distribution directory. - --> - <target name="clean" description="Cleans distribution directory."> - <delete dir="${dist}" failonerror="true" /> - <mkdir dir="${dist}" /> - </target> - -</project> \ No newline at end of file