From eee15099d04df88682ecaad1b524c683f767f52a Mon Sep 17 00:00:00 2001
From: anttil <anttil>
Date: Wed, 30 Oct 2013 11:54:47 +0000
Subject: [PATCH] SWE-22 / SP-970: Create openBIS-proteomics-API.zip in
openbis_standard_technologies instead of datastore_server
SVN: 30061
---
.../proteomics-api.gradle | 84 ++++++++++++++++++
.../query-api.gradle | 85 +++++++++----------
rtd_phosphonetx/build.gradle | 83 ------------------
3 files changed, 126 insertions(+), 126 deletions(-)
create mode 100644 openbis_standard_technologies/proteomics-api.gradle
diff --git a/openbis_standard_technologies/proteomics-api.gradle b/openbis_standard_technologies/proteomics-api.gradle
new file mode 100644
index 00000000000..90761ed82eb
--- /dev/null
+++ b/openbis_standard_technologies/proteomics-api.gradle
@@ -0,0 +1,84 @@
+
+task proteomicsApiJar(type: Jar) {
+ baseName 'openBIS-proteomics-API'
+ includeEmptyDirs false
+ from project(':common').compileJava.outputs.getFiles().getAsFileTree().plus(
+ project(':openbis-common').compileJava.outputs.getFiles().getAsFileTree().plus(
+ project(':openbis').compileJava.outputs.getFiles().getAsFileTree().plus(
+ project(':openbis_api').compileJava.outputs.getFiles().getAsFileTree().plus(
+ project(':rtd_phosphonetx').compileJava.outputs.getFiles().getAsFileTree() )))).matching {
+ include "ch/systemsx/cisd/common/exceptions/**/*.class"
+ include "ch/systemsx/cisd/common/spring/HttpInvokerUtils.class"
+ include "ch/systemsx/cisd/common/api/**/*.class"
+ exclude "ch/systemsx/cisd/common/api/server/**/*.class"
+ include "ch/systemsx/cisd/openbis/common/api/**/*.class"
+ exclude "ch/systemsx/cisd/openbis/common/api/server/**/*.class"
+ include "ch/systemsx/cisd/openbis/plugin/proteomics/**/api/**/*.class"
+ exclude "ch/systemsx/cisd/openbis/**/server/api/**/*.class"
+ include "ch/systemsx/cisd/openbis/generic/shared/api/**/*.class"
+ include "ch/systemsx/cisd/openbis/plugin/proteomics/*BuildAndEnvironmentInfo.class"
+ include "*.INFO"
+ }
+}
+
+task proteomicsApiSources(type: Zip) {
+ archiveName 'sources-proteomics-api.zip'
+ from project(':common').files('source/java').getAsFileTree().plus(
+ project(':openbis-common').files('source/java').getAsFileTree().plus(
+ project(':openbis').files('source/java').getAsFileTree().plus(
+ project(':openbis_api').files('source/java').getAsFileTree().plus(
+ project(':rtd_phosphonetx').files('source/java').getAsFileTree())))).matching {
+ include "ch/systemsx/cisd/common/exceptions/**/*.java"
+ include "ch/systemsx/cisd/common/spring/HttpInvokerUtils.java"
+ include "ch/systemsx/cisd/common/api/**/*.java"
+ exclude "ch/systemsx/cisd/common/api/server/**/*.java"
+ include "ch/systemsx/cisd/openbis/common/api/**/*.java"
+ exclude "ch/systemsx/cisd/openbis/common/api/server/**/*.java"
+ include "ch/systemsx/cisd/openbis/plugin/proteomics/**/api/**/*.java"
+ exclude "ch/systemsx/cisd/openbis/**/server/api/**/*.java"
+ include "ch/systemsx/cisd/openbis/generic/shared/api/**/*.java"
+ include "ch/systemsx/cisd/openbis/plugin/proteomics/*BuildAndEnvironmentInfo.java"
+ }
+}
+
+configurations.create('proteomicsApiJavadoc')
+dependencies {
+ proteomicsApiJavadoc project(':rtd_phosphonetx')
+}
+
+task proteomicsApiJavaDoc(type: Javadoc) {
+ source proteomicsApiSources.inputs.getFiles().getAsFileTree().matching {
+ include "**/*.java"
+ }
+ classpath = configurations.proteomicsApiJavadoc
+}
+
+task proteomicsApiJavaDocZip(type: Zip, dependsOn: proteomicsApiJavaDoc) {
+ archiveName 'javadoc-proteomics-api.zip'
+ from proteomicsApiJavaDoc.destinationDir
+}
+
+
+configurations.create('proteomicsApiDependencies')
+dependencies {
+ proteomicsApiDependencies 'cisd:cisd-base:+',
+ 'apache:commons-httpclient:+',
+ 'apache:log4j:+',
+ 'springframework:spring-aop:+',
+ 'springframework:spring-web:+',
+ 'springframework:spring-jdbc:+',
+ 'springframework:spring-orm:+',
+ 'marathon:marathon-spring-util:+'
+}
+
+task proteomicsApiZip(type: Zip) {
+ baseName 'openBIS-proteomics-API'
+ from proteomicsApiJar.archivePath
+ from proteomicsApiSources.archivePath
+ from proteomicsApiJavaDocZip.archivePath
+ from configurations.proteomicsApiDependencies
+ into 'openBIS-proteomics-API'
+}
+proteomicsApiZip.dependsOn proteomicsApiJar
+proteomicsApiZip.dependsOn proteomicsApiSources
+proteomicsApiZip.dependsOn proteomicsApiJavaDocZip
diff --git a/openbis_standard_technologies/query-api.gradle b/openbis_standard_technologies/query-api.gradle
index 68617a98e85..b355b107e6a 100644
--- a/openbis_standard_technologies/query-api.gradle
+++ b/openbis_standard_technologies/query-api.gradle
@@ -1,66 +1,65 @@
task queryApiJar(type: Jar) {
baseName 'openBIS-query-API'
includeEmptyDirs false
- from zipTree(project(':common').classes).plus(
- zipTree(project(':openbis-common').classes).plus(
- zipTree(project(':openbis').classes).plus(
- zipTree(project(':openbis_api').classes).plus(
- zipTree(project(':datastore_server').classes))))).matching {
- include "ch/systemsx/cisd/common/exceptions/**/*.class"
- include "ch/systemsx/cisd/common/spring/HttpInvokerUtils.class"
- include "ch/systemsx/cisd/common/api/**/*.class"
- exclude "ch/systemsx/cisd/common/api/server/**/*.class"
- include "ch/systemsx/cisd/openbis/common/api/**/*.class"
- exclude "ch/systemsx/cisd/openbis/common/api/server/**/*.class"
- include "ch/systemsx/cisd/openbis/generic/shared/api/**/*.class"
- include "ch/systemsx/cisd/openbis/generic/shared/basic/**/*.class"
- include "ch/systemsx/cisd/openbis/plugin/query/**/api/**/*.class"
- exclude "ch/systemsx/cisd/openbis/**/server/api/**/*.class"
- include "ch/systemsx/cisd/openbis/dss/client/api/v1/**/*.class"
- include "ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/**/*.class"
- include "ch/systemsx/cisd/openbis/BuildAndEnvironmentInfo.class"
- include "*.INFO"
+ from project(':common').compileJava.outputs.getFiles().getAsFileTree().plus(
+ project(':openbis-common').compileJava.outputs.getFiles().getAsFileTree().plus(
+ project(':openbis').compileJava.outputs.getFiles().getAsFileTree().plus(
+ project(':openbis_api').compileJava.outputs.getFiles().getAsFileTree().plus(
+ project(':datastore_server').compileJava.outputs.getFiles().getAsFileTree())))).matching {
+ include "ch/systemsx/cisd/common/exceptions/**/*.class"
+ include "ch/systemsx/cisd/common/spring/HttpInvokerUtils.class"
+ include "ch/systemsx/cisd/common/api/**/*.class"
+ exclude "ch/systemsx/cisd/common/api/server/**/*.class"
+ include "ch/systemsx/cisd/openbis/common/api/**/*.class"
+ exclude "ch/systemsx/cisd/openbis/common/api/server/**/*.class"
+ include "ch/systemsx/cisd/openbis/generic/shared/api/**/*.class"
+ include "ch/systemsx/cisd/openbis/generic/shared/basic/**/*.class"
+ include "ch/systemsx/cisd/openbis/plugin/query/**/api/**/*.class"
+ exclude "ch/systemsx/cisd/openbis/**/server/api/**/*.class"
+ include "ch/systemsx/cisd/openbis/dss/client/api/v1/**/*.class"
+ include "ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/**/*.class"
+ include "ch/systemsx/cisd/openbis/BuildAndEnvironmentInfo.class"
+ include "*.INFO"
}
}
task queryApiSources(type: Zip) {
- archiveName 'src.zip'
- from project(':common').files('.').getAsFileTree().plus(
- project(':openbis-common').files('.').getAsFileTree().plus(
- project(':openbis').files('.').getAsFileTree().plus(
- project(':openbis_api').files('.').getAsFileTree().plus(
- project(':datastore_server').files('.').getAsFileTree())))).matching {
- include "source/java/ch/systemsx/cisd/common/exceptions/**/*.java"
- include "source/java/ch/systemsx/cisd/common/spring/HttpInvokerUtils.java"
- include "source/java/ch/systemsx/cisd/common/api/**/*.java"
- exclude "source/java/ch/systemsx/cisd/common/api/server/**/*.java"
- include "source/java/ch/systemsx/cisd/openbis/common/api/**/*.java"
- exclude "source/java/ch/systemsx/cisd/openbis/common/api/server/**/*.java"
- include "source/java/ch/systemsx/cisd/openbis/generic/shared/api/**/*.java"
- include "source/java/ch/systemsx/cisd/openbis/generic/shared/basic/**/*.java"
- include "source/java/ch/systemsx/cisd/openbis/plugin/query/**/api/**/*.java"
- exclude "source/java/ch/systemsx/cisd/openbis/**/server/api/**/*.java"
- include "source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/**/*.java"
- include "source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/**/*.java"
- include "source/java/ch/systemsx/cisd/openbis/BuildAndEnvironmentInfo.java"
+ archiveName 'sources-query-api.zip'
+ from project(':common').files('source/java').getAsFileTree().plus(
+ project(':openbis-common').files('source/java').getAsFileTree().plus(
+ project(':openbis').files('source/java').getAsFileTree().plus(
+ project(':openbis_api').files('source/java').getAsFileTree().plus(
+ project(':datastore_server').files('source/java').getAsFileTree())))).matching {
+ include "ch/systemsx/cisd/common/exceptions/**/*.java"
+ include "ch/systemsx/cisd/common/spring/HttpInvokerUtils.java"
+ include "ch/systemsx/cisd/common/api/**/*.java"
+ exclude "ch/systemsx/cisd/common/api/server/**/*.java"
+ include "ch/systemsx/cisd/openbis/common/api/**/*.java"
+ exclude "ch/systemsx/cisd/openbis/common/api/server/**/*.java"
+ include "ch/systemsx/cisd/openbis/generic/shared/api/**/*.java"
+ include "ch/systemsx/cisd/openbis/generic/shared/basic/**/*.java"
+ include "ch/systemsx/cisd/openbis/plugin/query/**/api/**/*.java"
+ exclude "ch/systemsx/cisd/openbis/**/server/api/**/*.java"
+ include "ch/systemsx/cisd/openbis/dss/client/api/v1/**/*.java"
+ include "ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/**/*.java"
+ include "ch/systemsx/cisd/openbis/BuildAndEnvironmentInfo.java"
}
}
-configurations.create('javadoc')
+configurations.create('queryApiJavadoc')
dependencies {
- javadoc 'springframework:spring-tx:+'
+ queryApiJavadoc project(':datastore_server')
}
task queryApiJavaDoc(type: Javadoc) {
source queryApiSources.inputs.getFiles().getAsFileTree().matching {
include "**/*.java"
}
-
- classpath = sourceSets.main.output + sourceSets.main.compileClasspath + configurations.javadoc
+ classpath = configurations.queryApiJavadoc
}
task queryApiJavaDocZip(type: Zip, dependsOn: queryApiJavaDoc) {
- archiveName 'doc.zip'
+ archiveName 'javadoc-query-api.zip'
from queryApiJavaDoc.destinationDir
}
diff --git a/rtd_phosphonetx/build.gradle b/rtd_phosphonetx/build.gradle
index 6da54138865..160cec74013 100644
--- a/rtd_phosphonetx/build.gradle
+++ b/rtd_phosphonetx/build.gradle
@@ -45,86 +45,3 @@ task zip(type: Zip) {
}
zip.dependsOn jar
build.dependsOn zip
-
-
-task apiJar(type: Jar) {
- baseName 'openBIS-proteomics-API'
- includeEmptyDirs false
- from zipTree(project(':common').jar.archivePath).plus(
- zipTree(project(':openbis-common').jar.archivePath).plus(
- zipTree(project(':openbis').jar.archivePath).plus(
- zipTree(project(':openbis_api').jar.archivePath).plus(
- zipTree(jar.archivePath))))).matching {
- include "ch/systemsx/cisd/common/exceptions/**/*.class"
- include "ch/systemsx/cisd/common/spring/HttpInvokerUtils.class"
- include "ch/systemsx/cisd/common/api/**/*.class"
- exclude "ch/systemsx/cisd/common/api/server/**/*.class"
- include "ch/systemsx/cisd/openbis/common/api/**/*.class"
- exclude "ch/systemsx/cisd/openbis/common/api/server/**/*.class"
- include "ch/systemsx/cisd/openbis/plugin/proteomics/**/api/**/*.class"
- exclude "ch/systemsx/cisd/openbis/**/server/api/**/*.class"
- include "ch/systemsx/cisd/openbis/generic/shared/api/**/*.class"
- include "ch/systemsx/cisd/openbis/plugin/proteomics/*BuildAndEnvironmentInfo.class"
- include "*.INFO"
- }
-}
-
-proteomicsApiSources = fileTree('.').matching {
- include "source/java/ch/systemsx/cisd/openbis/plugin/proteomics/client/api/v1/**"
- include "source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/api/v1/**"
-}
-
-allApiSources = project(':openbis').commonApiSources.plus(
- project(':openbis').openBisApiApiSources.plus(
- project(':openbis').openbisCommonApiSources.plus(
- proteomicsApiSources)))
-
-task apiSources(type: Zip) {
- archiveName 'src.zip'
- from allApiSources
-}
-
-configurations.create('javadoc')
-dependencies {
- javadoc 'springframework:spring-tx:+'
-}
-
-task apiJavaDoc(type: Javadoc) {
- source allApiSources.matching{
- include "**/*.java"
- }
-
- classpath = sourceSets.main.output + sourceSets.main.compileClasspath + configurations.javadoc
-}
-
-task apiJavaDocZip(type: Zip) {
- archiveName 'doc.zip'
- from apiJavaDoc.destinationDir
-}
-apiJavaDocZip.dependsOn apiJavaDoc
-
-
-configurations.create('apiDependencies')
-dependencies {
- apiDependencies 'cisd:cisd-base:+',
- 'apache:commons-httpclient:+',
- 'apache:log4j:+',
- 'springframework:spring-aop:+',
- 'springframework:spring-web:+',
- 'springframework:spring-tx:+',
- 'marathon:marathon-spring-util:+'
-}
-
-task apiZip(type: Zip) {
- baseName 'openBIS-proteomics-API'
- from apiJar.archivePath
- from apiSources.archivePath
- from apiJavaDocZip.archivePath
- from configurations.apiDependencies
- into 'openBIS-proteomics-API'
-}
-apiZip.dependsOn apiJar
-apiZip.dependsOn apiSources
-apiZip.dependsOn apiJavaDocZip
-
-build.dependsOn apiZip
--
GitLab