From ef6fcd045e6db580d76d535a39e7b88368819f0b Mon Sep 17 00:00:00 2001 From: pkupczyk <pkupczyk> Date: Mon, 14 Jul 2014 13:22:09 +0000 Subject: [PATCH] SSDM-133 : Remove .classpath, .project, build/ from gradle-built projects - convert more projects SVN: 32038 --- openbis-common/.classpath | 61 --------------------------- openbis-common/.project | 28 ------------ openbis-common/build/antrun.sh | 6 --- openbis-common/build/build-common.xml | 40 ------------------ openbis-common/build/build.xml | 9 ---- 5 files changed, 144 deletions(-) delete mode 100644 openbis-common/.classpath delete mode 100644 openbis-common/.project delete mode 100755 openbis-common/build/antrun.sh delete mode 100644 openbis-common/build/build-common.xml delete mode 100644 openbis-common/build/build.xml diff --git a/openbis-common/.classpath b/openbis-common/.classpath deleted file mode 100644 index 85e8c509cb9..00000000000 --- a/openbis-common/.classpath +++ /dev/null @@ -1,61 +0,0 @@ -<?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"/> - <classpathentry kind="lib" path="/libraries/testng/testng-jdk15.jar" sourcepath="/libraries/testng/src.zip"/> - <classpathentry kind="lib" path="/libraries/log4j/log4j.jar" sourcepath="/libraries/log4j/src.zip"/> - <classpathentry kind="lib" path="/libraries/jmock/jmock.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/common"/> - <classpathentry kind="lib" path="/libraries/restrictionchecker/restrictions.jar"/> - <classpathentry kind="lib" path="/libraries/commons-logging/commons-logging.jar" sourcepath="/libraries/commons-logging/src.zip"/> - <classpathentry kind="lib" path="/libraries/commons-lang/commons-lang.jar" sourcepath="/libraries/commons-lang/src.zip"/> - <classpathentry kind="lib" path="/libraries/cglib/cglib-nodep.jar"/> - <classpathentry kind="lib" path="/libraries/jmock/hamcrest/hamcrest-core.jar"/> - <classpathentry kind="lib" path="/libraries/jmock/hamcrest/hamcrest-library.jar"/> - <classpathentry kind="lib" path="/libraries/jmock/objenesis/objenesis-1.0.jar"/> - <classpathentry kind="lib" path="/libraries/commons-httpclient/commons-httpclient.jar" sourcepath="/libraries/commons-httpclient/src.zip"/> - <classpathentry kind="lib" path="/libraries/commons-io/commons-io.jar" sourcepath="/libraries/commons-io/src.zip"/> - <classpathentry kind="lib" path="/libraries/cisd-base/cisd-base.jar" sourcepath="/libraries/cisd-base/cisd-base-src.zip"/> - <classpathentry kind="lib" path="/libraries/spring/third-party/stream-supporting-httpinvoker.jar" sourcepath="/libraries/spring/third-party/stream-supporting-httpinvoker-src.zip"/> - <classpathentry kind="lib" path="/libraries/jetty8/lib/server/servlet-api-3.0.jar"/> - <classpathentry kind="lib" path="/libraries/hibernate-search/jms.jar"/> - <classpathentry kind="lib" path="/libraries/eodsql/eodsql.jar" sourcepath="/libraries/eodsql/eodsql_src.zip"/> - <classpathentry kind="lib" path="/libraries/gwt2.4/gwt-servlet.jar"/> - <classpathentry exported="true" kind="lib" path="/libraries/hibernate-search/jsr250-api.jar"/> - <classpathentry kind="lib" path="/libraries/spring/spring-core.jar"/> - <classpathentry kind="lib" path="/libraries/spring/spring-beans.jar"/> - <classpathentry kind="lib" path="/libraries/spring/spring-web.jar"/> - <classpathentry kind="lib" path="/libraries/spring/spring-context.jar"/> - <classpathentry kind="lib" path="/libraries/spring/spring-aop.jar" sourcepath="/libraries/spring/src.jar"/> - <classpathentry kind="lib" path="/libraries/spring/third-party/aopalliance.jar"/> - <classpathentry kind="lib" path="/libraries/spring/spring-jdbc.jar"/> - <classpathentry kind="lib" path="/libraries/spring/webmvc/spring-webmvc.jar"/> - <classpathentry kind="lib" path="/libraries/spring/spring.jar"/> - <classpathentry kind="lib" path="/libraries/hibernate-core/hibernate-core.jar"/> - <classpathentry kind="lib" path="/libraries/jetty8/lib/common/jetty-http.jar" sourcepath="/libraries/jetty8/src/jetty_src.zip"/> - <classpathentry kind="lib" path="/libraries/jetty8/lib/common/jetty-io.jar"/> - <classpathentry kind="lib" path="/libraries/jetty8/lib/common/jetty-util.jar"/> - <classpathentry kind="lib" path="/libraries/jetty8/lib/server/jetty-continuation.jar"/> - <classpathentry kind="lib" path="/libraries/jetty8/lib/server/jetty-security.jar"/> - <classpathentry kind="lib" path="/libraries/jetty8/lib/server/jetty-server.jar" sourcepath="/libraries/jetty8/src/jetty_src.zip"/> - <classpathentry kind="lib" path="/libraries/jetty8/lib/server/jetty-servlet.jar" sourcepath="/libraries/jetty8/src/jetty_src.zip"/> - <classpathentry kind="lib" path="/libraries/jmock/hamcrest/hamcrest-integration.jar"/> - <classpathentry kind="lib" path="/libraries/dom4j/dom4j.jar"/> - <classpathentry kind="lib" path="/libraries/javassist/javassist.jar" sourcepath="/libraries/javassist/src.zip"/> - <classpathentry kind="lib" path="/libraries/reflections/lib/gson-1.4.jar"/> - <classpathentry kind="lib" path="/libraries/reflections/lib/guava-r08.jar"/> - <classpathentry kind="lib" path="/libraries/reflections/lib/jboss-vfs-3.0.0.CR5.jar"/> - <classpathentry kind="lib" path="/libraries/reflections/lib/xml-apis-1.0.b2.jar"/> - <classpathentry kind="lib" path="/libraries/reflections/reflections.jar"/> - <classpathentry kind="lib" path="/libraries/slf4j/slf4j.jar" sourcepath="/libraries/slf4j/src.jar"/> - <classpathentry kind="lib" path="/libraries/jackson/jackson-annotations.jar" sourcepath="/libraries/jackson/jackson-annotations-src.zip"/> - <classpathentry kind="lib" path="/libraries/jackson/jackson-core.jar" sourcepath="/libraries/jackson/jackson-core-src.zip"/> - <classpathentry kind="lib" path="/libraries/jackson/jackson-databind.jar" sourcepath="/libraries/jackson/jackson-databind-src.zip"/> - <classpathentry kind="lib" path="/libraries/jsonrpc4j/jsonrpc4j.jar" sourcepath="/libraries/jsonrpc4j/jsonrpc4j-sources.jar"/> - <classpathentry kind="lib" path="/libraries/cisd-jhdf5/cisd-jhdf5-core.jar" sourcepath="/libraries/cisd-jhdf5/cisd-jhdf5-src.zip"/> - <classpathentry kind="lib" path="/libraries/cisd-jhdf5/cisd-jhdf5-tools.jar"/> - <classpathentry kind="lib" path="/libraries/truezip/truezip.jar" sourcepath="/libraries/truezip/truezip_src.zip"/> - <classpathentry kind="lib" path="/libraries/commons-compress/commons-compress.jar" sourcepath="/libraries/commons-compress/commons-compress-src.zip"/> - <classpathentry kind="output" path="targets/classes"/> -</classpath> diff --git a/openbis-common/.project b/openbis-common/.project deleted file mode 100644 index ad1038bd659..00000000000 --- a/openbis-common/.project +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>openbis-common</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> - <filteredResources> - <filter> - <id>0</id> - <name></name> - <type>26</type> - <matcher> - <id>org.eclipse.ui.ide.multiFilter</id> - <arguments>1.0-name-matches-true-false-.git</arguments> - </matcher> - </filter> - </filteredResources> -</projectDescription> diff --git a/openbis-common/build/antrun.sh b/openbis-common/build/antrun.sh deleted file mode 100755 index 5ff1a62b259..00000000000 --- a/openbis-common/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-common/build/build-common.xml b/openbis-common/build/build-common.xml deleted file mode 100644 index bf9307c4ef1..00000000000 --- a/openbis-common/build/build-common.xml +++ /dev/null @@ -1,40 +0,0 @@ -<project name="openbis-common-common" basedir=".."> - <import file="../../build_resources/ant/build-common.xml" /> - - <property name="original.dist" value="../${ant.project.name}/dist" /> - <property name="original.dist.server" value="${original.dist}/server" /> - - <property name="targets.www" value="../${ant.project.name}/targets/www" /> - <property name="targets.www.web-inf" value="${targets.www}/WEB-INF" /> - <property name="targets.www.web-inf.classes" value="${targets.www.web-inf}/classes" /> - <property name="gwt.tomcat.web-inf" value="../${ant.project.name}/tomcat/webapps/ROOT/WEB-INF" /> - <!-- - // Cleans and prepares the GWT specific directories, forcing a GWT rebuilding. - --> - <target name="prepare-gwt" - description="Cleans and prepares the GWT specific directories, forcing a GWT rebuilding."> - <delete failonerror="true" dir="../${ant.project.name}/.gwt-cache" /> - <delete failonerror="true" includeEmptyDirs="true" removeNotFollowedSymlinks="true" quiet="true"> - <fileset dir="${targets.www}" followsymlinks="false"/> - </delete> - <mkdir dir="${targets.www}" /> - <mkdir dir="${targets.www}/${module-test.module}" /> - <mkdir dir="${targets.www.web-inf}" /> - <copy todir="${targets.www.web-inf}" overwrite="true" failonerror="true"> - <fileset dir="../${ant.project.name}/${server-resource}" includes="*.xml" /> - <fileset dir="../common/${server-resource}" includes="*.xml"/> - </copy> - <!-- Clear 'gwt.xml' file. --> - <echo file="${targets.www.web-inf}/gwt.xml" message="" /> - <copy todir="${targets.www.web-inf.classes}" overwrite="true" failonerror="true"> - <fileset dir="${classes}" /> - </copy> - <!-- For system tests --> - <copy todir="${gwt.tomcat.web-inf}" overwrite="true" failonerror="true"> - <fileset dir="../${ant.project.name}/${server-resource}" includes="*.xml" /> - <fileset dir="../common/${server-resource}" includes="*.xml"/> - </copy> - </target> - - -</project> \ No newline at end of file diff --git a/openbis-common/build/build.xml b/openbis-common/build/build.xml deleted file mode 100644 index f0a6106e4da..00000000000 --- a/openbis-common/build/build.xml +++ /dev/null @@ -1,9 +0,0 @@ -<project name="openbis-common" basedir=".."> - <import file="../build/build-common.xml" /> - <project-classpath name="ecp" classes="${classes}" /> - <property name="mainfolder" value="openbis-common"/> - - - <target name="ci" depends="build-common.ci, check-dependencies"/> - -</project> \ No newline at end of file -- GitLab