From 4f51ccb9f0dfa079a69fb12260168af34f352a3c Mon Sep 17 00:00:00 2001
From: pkupczyk <pkupczyk>
Date: Mon, 14 Jul 2014 13:25:53 +0000
Subject: [PATCH] SSDM-133 : Remove .classpath, .project, build/ from
gradle-built projects - convert more projects
SVN: 32040
---
openbis_api/.classpath | 10 ++--------
openbis_api/.project | 1 +
openbis_api/build/antrun.sh | 6 ------
openbis_api/build/build.xml | 36 ------------------------------------
4 files changed, 3 insertions(+), 50 deletions(-)
delete mode 100755 openbis_api/build/antrun.sh
delete mode 100644 openbis_api/build/build.xml
diff --git a/openbis_api/.classpath b/openbis_api/.classpath
index 160fd600e2e..d215efaed68 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 47cf991eb35..9c7b1bd2abb 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 5ff1a62b259..00000000000
--- 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 9b7fcf46b3c..00000000000
--- 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
--
GitLab