SWE-22 / SP-970: Create dss clients in openbis_standard_technologies instead of datastore_server.

SVN: 30067

datastore_server/build.gradle

@@ -7,10 +7,6 @@ evaluationDependsOn(':openbis')
 
 apply from: 'http://svncisd.ethz.ch/repos/cisd/gradle/trunk/javaproject.gradle'
 
-configurations.create('clients')
-configurations.create('clients_partial')
-
-
 dependencies {
 	compile project(':common'),
 			project(':openbis-common'),
@@ -18,10 +14,8 @@ dependencies {
 			// authentication and dbmigration are required as they contain later versions of 
 			// some classes than cisd-cifex.jar. They need to be in classpath before cisd-cifex.jar
 			project(':authentication'),
-			project(':dbmigration')
-			
-	
-	compile 'apache:ftpserver-core:+',
+			project(':dbmigration'),
+			'apache:ftpserver-core:+',
 			'apache:sshd-core:+',
 			'jfree:jfreechart:+',
 			'cisd:cisd-cifex:+',
@@ -34,20 +28,7 @@ dependencies {
 				
 	testCompile project(path: ':common', configuration: 'tests'),
 				project(path: ':openbis-common', configuration: 'tests'),
-				project(path: ':openbis', configuration: 'tests')
-				
-	clients	'cglib:cglib-nodep:+',
-			'cisd:cisd-args4j:+',
-			'cisd:cisd-base:+',
-			'apache:poi-ooxml:+',
-			'springframework:spring-context:+',
-			'python:jython:+',
-			'apache:commons-httpclient:+',
-			'marathon:marathon-spring-util:+',
-			'apache:log4j:+',
-			'dom4j:dom4j:+'
-			
-	clients_partial 'google:gwt-user:2.4'			
+				project(path: ':openbis', configuration: 'tests')						
 }
 
 sourceSets { 
@@ -70,107 +51,3 @@ jar {
         into 'datastore_server'
     }
 }
-
-task dssClient(type: Jar) {
-	baseName 'dss_client'
-	
-	from (project(':common').sourceSets.main.output.getAsFileTree().plus(
-		  project(':openbis-common').sourceSets.main.output.getAsFileTree().plus(
-		  project(':openbis_api').sourceSets.main.output.getAsFileTree().plus(
-		  project(':openbis').sourceSets.main.output.getAsFileTree().plus(
-		  sourceSets.main.output.getAsFileTree())))).matching {
-		include 'ch/systemsx/cisd/common/**/*.class'	
-      	include 'ch/systemsx/cisd/openbis/common/**/*.class'
-      	include 'ch/systemsx/cisd/openbis/generic/shared/**/*.class'
-      	include 'ch/systemsx/cisd/openbis/plugin/query/shared/**/*.class'
-        include 'ch/systemsx/cisd/openbis/dss/client/**/*.class'
-      	include 'ch/systemsx/cisd/openbis/dss/generic/shared/api/**/*.class'
-      	include 'ch/systemsx/cisd/openbis/dss/generic/shared/utils/**/*.class'
-      	include 'org/python/core/SyspathArchiveHack.class'
-	})
-	
-	from zipTree(configurations.clients_partial.files.iterator().next()).matching {
-			include '**/com/google/gwt/user/client/rpc/IsSerializable.class'
-			include '**/com/google/gwt/user/client/rpc/SerializableException.class'
-	}
-	
-    manifest {
-        def manifestClasspath = configurations.clients.collect { it.getName() }.join(',') 
-		attributes("Main-Class": "ch.systemsx.cisd.openbis.dss.client.api.cli.DssClient",
-                   "Version": versionNumber,
-                   "Build-Number": "${versionNumber} (r${revisionNumber},${cleanFlag})",
-                   "Class-Path": manifestClasspath )
-    }
-}	
-dssClient.dependsOn compileJava
-
-
-task dssGui(type: Jar) {
-	baseName 'dss_gui'
-	
-	from (project(':common').sourceSets.main.output.getAsFileTree().plus(
-		  project(':openbis-common').sourceSets.main.output.getAsFileTree().plus(
-		  project(':openbis_api').sourceSets.main.output.getAsFileTree().plus(
-		  project(':openbis').sourceSets.main.output.getAsFileTree().plus(
-		  sourceSets.main.output.getAsFileTree())))).matching {
-		include 'ch/systemsx/cisd/common/**/*.class'	
-      	include 'ch/systemsx/cisd/openbis/common/**/*.class'
-      	include 'ch/systemsx/cisd/openbis/generic/shared/**/*.class'
-      	include 'ch/systemsx/cisd/openbis/plugin/query/shared/**/*.class'
-        include 'ch/systemsx/cisd/openbis/dss/client/**/*.class'
-      	include 'ch/systemsx/cisd/openbis/dss/generic/shared/api/**/*.class'
-      	include 'ch/systemsx/cisd/openbis/dss/generic/shared/utils/**/*.class'
-      	include 'org/python/core/SyspathArchiveHack.class'
-	})
-	
-	from (fileTree(dir: 'resource', includes: ['ok.png', 'wrong.png', 'wait.gif']))
-	
-	from zipTree(configurations.clients_partial.files.iterator().next()).matching {
-			include '**/com/google/gwt/user/client/rpc/IsSerializable.class'
-			include '**/com/google/gwt/user/client/rpc/SerializableException.class'
-	}
-	
-    manifest {
-        def manifestClasspath = configurations.clients.collect { it.getName() }.join(',') 
-		attributes("Main-Class": "ch.systemsx.cisd.openbis.dss.client.api.gui.DataSetUploadClient",
-                   "Version": versionNumber,
-                   "Build-Number": "${versionNumber} (r${revisionNumber},${cleanFlag})",
-                   "Class-Path": manifestClasspath)                   
-    }	
-}	
-dssGui.dependsOn compileJava
-
-task dssClientZip(type: Zip) {
-	baseName 'dss_client'
-
-	from (configurations.clients) {
-		into 'dss_client/lib'
-	}
-	
-	from (dssClient.archivePath) {
-		into 'dss_client/lib'
-	}
-	
-	from('dist/dss_client.sh') {
-		into 'dss_client'
-	}
-}
-dssClientZip.dependsOn dssClient
-
-task dssGuiZip(type: Zip) {
-	baseName 'dss_upload_gui'
-
-	from (configurations.clients) {
-		into 'dss_upload_gui/lib'
-	}
-	
-	from (dssGui.archivePath) {
-		into 'dss_upload_gui/lib'
-	}
-}
-dssGuiZip.dependsOn dssGui
-
-
-build.dependsOn dssClientZip
-build.dependsOn dssGuiZip
-

openbis/build.gradle

@@ -69,24 +69,3 @@ task copyTestData(type: Copy, dependsOn: testClasses) {
 test.dependsOn(copyTestData)
 test.dependsOn(cleanDbSuite)
 
-
-/* for API packages in rtd_phosphonetx, screening */
-commonApiSources = project(':common').files('.').getAsFileTree().matching {
-	include "source/java/ch/systemsx/cisd/common/exceptions/**"
-    include "source/java/ch/systemsx/cisd/common/api/**"
-    include "source/java/ch/systemsx/cisd/common/spring/HttpInvokerUtils.java"
-}
-openBisApiApiSources = project(':openbis_api').files('.').getAsFileTree().matching {
-    include "source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/**"
-    include "source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/**"
-}
-openbisCommonApiSources = project(':openbis-common').files('.').getAsFileTree().matching {
-    include "source/java/ch/systemsx/cisd/common/api/client/**"
-}
-openbisApiSources = project(':openbis').files('.').getAsFileTree().matching {
-    include "source/java/ch/systemsx/cisd/openbis/plugin/query/client/api/v1/**"
-    include "source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/**"
-    include "source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/**"
-    include "source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/**"
-}
-

openbis_standard_technologies/build.gradle

@@ -14,6 +14,8 @@ apply from: 'http://svncisd.ethz.ch/repos/cisd/gradle/trunk/javaproject.gradle'
 apply from: 'query-api.gradle'
 apply from: 'screening-api.gradle'
 apply from: 'proteomics-api.gradle'
+apply from: 'dss-client.gradle'
+apply from: 'dss-upload-gui.gradle'
 
 apply plugin: 'war'
 
@@ -233,44 +235,6 @@ task createOpenbisJar(type: Jar) {
         }
 }
 
-dssUploadGuiJars = ['cisd-base.jar', 'spring.jar', 'stream-supporting-httpinvoker.jar',
-                    'commons-codec.jar', 'commons-httpclient.jar', 'commons-io.jar', 'commons-lang.jar',
-                     'commons-logging.jar', 'jython.jar', 'dss_upload_gui.jar', 'log4j.jar',
-                     'poi.jar', 'poi-ooxml.jar', 'poi-ooxml-schemas.jar', 'dom4j-1.6.1.jar',
-                     'geronimo-stax-api_1.0_spec-1.0.jar', 'xmlbeans-2.3.0.jar']
-                     
-task createDssUploadGuiJar(type: Jar) {
-    archiveName = 'dss_upload_gui.jar'
-    destinationDir = file(jarsToBeSignedFolder)
-    outputs.file new File(jarsToBeSignedFolder, archiveName)
-    from zipTree(project(':common').jar.archivePath).plus(
-         zipTree(project(':openbis-common').jar.archivePath).plus( 
-         zipTree(project(':openbis_api').jar.archivePath).plus( 
-         zipTree(project(':datastore_server').jar.archivePath).plus( 
-         zipTree(project(':openbis').jar.archivePath))))).matching {
-            include '**/ch/systemsx/cisd/common/**/*.class'
-            include '**/ch/systemsx/cisd/openbis/common/**/*.class'
-            include '**/ch/systemsx/cisd/openbis/generic/shared/**/*.class'
-            include '**/ch/systemsx/cisd/openbis/plugin/query/shared/**/*.class'
-            include '**/ch/systemsx/cisd/openbis/dss/client/**/*.class'
-            include '**/ch/systemsx/cisd/openbis/dss/generic/shared/api/**/*.class'
-            include '**/ch/systemsx/cisd/openbis/dss/generic/shared/utils/**/*.class'
-            include '**/org/python/core/SyspathArchiveHack.class'
-        }
-    from('../datastore_server/resource') {
-        include 'wait.gif'
-        include 'wrong.png'
-        include 'ok.png'
-    }
-    manifest {
-        def manifestClasspath = dssUploadGuiJars.collect { it }.join(',') 
-        attributes('Main-Class': 'ch.systemsx.cisd.openbis.dss.client.api.gui.DataSetUploadClient',
-                   'Version': versionNumber,
-                   'Build-Number': "${versionNumber} (r${revisionNumber},${cleanFlag})",
-                   'Class-Path' : manifestClasspath)
-    }
-}
-
 task copyJarsForWebStart(type: Copy) {
     from configurations.webStartJars.files
     into jarsToBeSignedFolder
@@ -285,7 +249,7 @@ task copyJarsForWebStart(type: Copy) {
 }
 
 keystoreFile = '../screening/etc/dev.keystore'
-task signWebStartJars(type: Copy, dependsOn: [createOpenbisJar, createDssUploadGuiJar, copyJarsForWebStart]) {
+task signWebStartJars(type: Copy, dependsOn: [createOpenbisJar, dssGui, copyJarsForWebStart]) {
     from jarsToBeSignedFolder
     into signedJarsFolder
     inputs.file keystoreFile
@@ -516,7 +480,7 @@ task zipDss(type: Zip, dependsOn: signWebStartJars) {
 		into 'datastore_server/server/etc'
 	}
 	
-	from(zipTree(project(':datastore_server').dssGuiZip.archivePath)) {
+	from(dssGuiZip.archivePath) {
 		into 'datastore_server/lib/'
 	}
 	
@@ -529,26 +493,26 @@ task zipDss(type: Zip, dependsOn: signWebStartJars) {
 
 task clientsAndApis(type: Zip) {
 	baseName 'openBIS-clients-and-APIs'
-	from (project(':datastore_server').dssClientZip.archivePath)
-	from (project(':datastore_server').dssGuiZip.archivePath)
-    from (queryApiZip.archivePath)
-    from (proteomicsApiZip.archivePath)
-    from (screeningApiZip.archivePath)
+	from dssClientZip.archivePath
+	from dssGuiZip.archivePath
+    from queryApiZip.archivePath
+    from proteomicsApiZip.archivePath
+    from screeningApiZip.archivePath
 
 
-	from (project(':datastore_server').dssClientZip.archivePath) {	
+	from (dssClientZip.archivePath) {	
 	    rename { String fileName -> fileName.replace('client', 'client-screening')}
     }
 
-	from (project(':datastore_server').dssGuiZip.archivePath) {	
+	from (dssGuiZip.archivePath) {	
 	    rename { String fileName -> fileName.replace('gui', 'gui-screening')}
     }
     
     from ('../openbis_all/dist/readme.txt')
     
 }
-clientsAndApis.dependsOn project(':datastore_server').dssClientZip
-clientsAndApis.dependsOn project(':datastore_server').dssGuiZip
+clientsAndApis.dependsOn dssClientZip
+clientsAndApis.dependsOn dssGuiZip
 clientsAndApis.dependsOn queryApiZip
 clientsAndApis.dependsOn proteomicsApiZip
 clientsAndApis.dependsOn screeningApiZip

openbis_standard_technologies/dss-client.gradle

+configurations.create('dssClientLibs')
+configurations.create('dssClientPartialLibs')
+
+dependencies {
+
+	dssClientLibs 'cglib:cglib-nodep:+',
+					'cisd:cisd-args4j:+',
+					'cisd:cisd-base:+',
+					'apache:poi-ooxml:+',
+					'springframework:spring:+',
+					'apache:commons-logging:+',
+					'python:jython:+',
+					'apache:commons-httpclient:+',
+					'marathon:marathon-spring-util:+',
+					'apache:log4j:+',
+					'dom4j:dom4j:+'
+
+	dssClientPartialLibs 'google:gwt-user:2.4'
+}
+
+task dssClient(type: Jar) {
+	baseName 'dss_client'
+	
+	from (project(':common').compileJava.outputs.getFiles().getAsFileTree().plus(
+		  project(':openbis-common').compileJava.outputs.getFiles().getAsFileTree().plus(
+		  project(':openbis_api').compileJava.outputs.getFiles().getAsFileTree().plus(
+		  project(':openbis').compileJava.outputs.getFiles().getAsFileTree().plus(
+		  project(':datastore_server').compileJava.outputs.getFiles().getAsFileTree())))).matching {
+		include 'ch/systemsx/cisd/common/**/*.class'	
+      	include 'ch/systemsx/cisd/openbis/common/**/*.class'
+      	include 'ch/systemsx/cisd/openbis/generic/shared/**/*.class'
+      	include 'ch/systemsx/cisd/openbis/plugin/query/shared/**/*.class'
+        include 'ch/systemsx/cisd/openbis/dss/client/**/*.class'
+      	include 'ch/systemsx/cisd/openbis/dss/generic/shared/api/**/*.class'
+      	include 'ch/systemsx/cisd/openbis/dss/generic/shared/utils/**/*.class'
+      	include 'ch/systemsx/cisd/openbis/dss/BuildAndEnvironmentInfo.class'
+	})
+	
+	from zipTree(configurations.dssClientPartialLibs.files.iterator().next()).matching {
+			include '**/com/google/gwt/user/client/rpc/IsSerializable.class'
+			include '**/com/google/gwt/user/client/rpc/SerializableException.class'
+	}
+	
+    manifest {
+        def manifestClasspath = configurations.dssClientLibs.collect { it.getName() }.join(',') 
+		attributes("Main-Class": "ch.systemsx.cisd.openbis.dss.client.api.cli.DssClient",
+                   "Version": versionNumber,
+                   "Build-Number": "${versionNumber} (r${revisionNumber},${cleanFlag})",
+                   "Class-Path": manifestClasspath )
+    }
+}	
+
+task dssClientZip(type: Zip, dependsOn: dssClient) {
+	baseName 'dss_client'
+
+	from (configurations.dssClientLibs) {
+		into 'dss_client/lib'
+	}
+	
+	from (dssClient.archivePath) {
+		into 'dss_client/lib'
+	}
+	
+	from(project(':datastore_server').file('dist/dss_client.sh')) {
+		into 'dss_client'
+	}
+}

openbis_standard_technologies/dss-upload-gui.gradle

+configurations.create('dssGuiLibs')
+configurations.create('dssGuiPartialLibs')
+
+dependencies {
+
+	dssGuiLibs 'cglib:cglib-nodep:+',
+				'cisd:cisd-args4j:+',
+				'cisd:cisd-base:+',
+				'apache:poi-ooxml:+',
+				'springframework:spring:+',
+				'apache:commons-logging:+',
+				'python:jython:+',
+				'apache:commons-httpclient:+',
+				'marathon:marathon-spring-util:+',
+				'apache:log4j:+',
+				'dom4j:dom4j:+'
+
+	dssGuiPartialLibs 'google:gwt-user:2.4'
+}
+
+dssUploadGuiJars = ['cisd-base.jar', 'spring.jar', 'stream-supporting-httpinvoker.jar',
+                    'commons-codec.jar', 'commons-httpclient.jar', 'commons-io.jar', 'commons-lang.jar',
+                     'commons-logging.jar', 'jython.jar', 'dss_upload_gui.jar', 'log4j.jar',
+                     'poi.jar', 'poi-ooxml.jar', 'poi-ooxml-schemas.jar', 'dom4j-1.6.1.jar',
+                     'geronimo-stax-api_1.0_spec-1.0.jar', 'xmlbeans-2.3.0.jar']
+
+jarsToBeSignedFolder = "${buildDir}/jars_to_be_signed"
+
+task dssGui(type: Jar) {
+	baseName 'dss_gui'
+    destinationDir = file(jarsToBeSignedFolder)
+    outputs.file new File(jarsToBeSignedFolder, archiveName)
+	
+	from (project(':common').compileJava.outputs.getFiles().getAsFileTree().plus(
+		  project(':openbis-common').compileJava.outputs.getFiles().getAsFileTree().plus(
+		  project(':openbis_api').compileJava.outputs.getFiles().getAsFileTree().plus(
+		  project(':openbis').compileJava.outputs.getFiles().getAsFileTree().plus(
+		  project(':datastore_server').compileJava.outputs.getFiles().getAsFileTree())))).matching {
+		include 'ch/systemsx/cisd/common/**/*.class'	
+      	include 'ch/systemsx/cisd/openbis/common/**/*.class'
+      	include 'ch/systemsx/cisd/openbis/generic/shared/**/*.class'
+      	include 'ch/systemsx/cisd/openbis/plugin/query/shared/**/*.class'
+        include 'ch/systemsx/cisd/openbis/dss/client/**/*.class'
+      	include 'ch/systemsx/cisd/openbis/dss/generic/shared/api/**/*.class'
+      	include 'ch/systemsx/cisd/openbis/dss/generic/shared/utils/**/*.class'
+      	include 'org/python/core/SyspathArchiveHack.class'
+      	include 'ch/systemsx/cisd/openbis/dss/BuildAndEnvironmentInfo.class'      	
+	})
+	
+	from (project(':datastore_server').fileTree(dir: 'resource', includes: ['ok.png', 'wrong.png', 'wait.gif']))
+	
+	from zipTree(configurations.dssGuiPartialLibs.files.iterator().next()).matching {
+			include '**/com/google/gwt/user/client/rpc/IsSerializable.class'
+			include '**/com/google/gwt/user/client/rpc/SerializableException.class'
+	}
+	
+    manifest {
+        def manifestClasspath = dssUploadGuiJars.collect { it }.join(',') 
+		attributes("Main-Class": "ch.systemsx.cisd.openbis.dss.client.api.gui.DataSetUploadClient",
+                   "Version": versionNumber,
+                   "Build-Number": "${versionNumber} (r${revisionNumber},${cleanFlag})",
+                   "Class-Path": manifestClasspath)                   
+    }	
+}	
+
+task dssGuiZip(type: Zip, dependsOn: dssGui) {
+	baseName 'dss_upload_gui'
+
+	from (configurations.dssGuiLibs) {
+		into 'dss_upload_gui/lib'
+	}
+	
+	from (dssGui.archivePath) {
+		into 'dss_upload_gui/lib'
+	}
+}

openbis_standard_technologies/proteomics-api.gradle

@@ -64,10 +64,8 @@ dependencies {
 	proteomicsApiDependencies 'cisd:cisd-base:+',
 								'apache:commons-httpclient:+',
 								'apache:log4j:+',
-								'springframework:spring-aop:+',
-								'springframework:spring-web:+',
-								'springframework:spring-jdbc:+',
-								'springframework:spring-orm:+',
+								'springframework:spring:+',
+								'apache:commons-logging:+',								
 								'marathon:marathon-spring-util:+'
 }
 

openbis_standard_technologies/query-api.gradle

@@ -68,10 +68,8 @@ dependencies {
 	queryApiDependencies 'cisd:cisd-base:+',
 					'apache:commons-httpclient:+',
 					'apache:log4j:+',
-					'springframework:spring-aop:+',
-					'springframework:spring-web:+',
-					'springframework:spring-jdbc:+',
-					'springframework:spring-orm:+',
+					'springframework:spring:+',
+					'apache:commons-logging:+',				
 					'marathon:marathon-spring-util:+'
 }
 

openbis_standard_technologies/screening-api.gradle

@@ -83,10 +83,8 @@ dependencies {
 	batteries 'cisd:cisd-base:+',
 				'apache:commons-httpclient:+',
 				'apache:log4j:+',
-				'springframework:spring-aop:+',
-				'springframework:spring-web:+',
-				'springframework:spring-jdbc:+',
-				'springframework:spring-orm:+',
+				'springframework:spring:+',
+				'apache:commons-logging:+',				
 				'marathon:marathon-spring-util:+',
 				'cisd:cisd-args4j:+',
 				'python:jython:+'