SWE-22 / SP-970: Create admin-console in separate build file.

SVN: 30084

openbis_standard_technologies/admin-console.gradle

+configurations.create('adminConsolePartialLibs')
+configurations.create('adminConsoleLibs')
+
+dependencies {
+	adminConsolePartialLibs 'google:gwt-user:2.4'
+	
+	adminConsoleLibs 'cisd:cisd-base:+',
+					'apache:commons-httpclient:+',
+					'apache:commons-logging:+',
+					'apache:commons-io:+',
+					'apache:log4j:+',
+					'springframework:spring:+',
+					'marathon:marathon-spring-util:+',
+					'springframework:spring-beans:+',
+					'jline:jline:0.9.94'	
+}
+
+task adminConsole(type: Jar) {
+	archiveName 'openbis-admin-console.jar'
+	includeEmptyDirs false
+	from project(':common').compileJava.outputs.getFiles().getAsFileTree().plus(
+         project(':openbis-common').compileJava.outputs.getFiles().getAsFileTree().plus( 
+         project(':screening').compileJava.outputs.getFiles().getAsFileTree().plus( 
+         project(':openbis').compileJava.outputs.getFiles().getAsFileTree().plus(
+         project(':openbis_api').compileJava.outputs.getFiles().getAsFileTree().plus(
+         project(':screening').compileJava.outputs.getFiles().getAsFileTree().plus(
+         project(':rtd_phosphonetx').compileJava.outputs.getFiles().getAsFileTree().plus(
+         project(':datastore_server').compileJava.outputs.getFiles().getAsFileTree()))))))).matching {
+
+			include 'ch/systemsx/cisd/common/spring/HttpInvokerUtils.class'
+			include 'ch/systemsx/cisd/common/**/*.class'
+			include 'ch/systemsx/cisd/openbis/common/**/*.class'
+			include 'ch/systemsx/cisd/openbis/generic/client/console/**/*.class'
+			include '**/shared/I*.class'
+			include '**/dss/generic/shared/dto/*.class'
+			include '**/generic/shared/basic/**/*.class'
+			exclude '**/generic/shared/basic/annotation/**'
+			exclude '**/generic/shared/basic/util/**'
+			exclude '**/generic/shared/basic/utils/**'
+			include '**/generic/shared/dto/**/*.class'
+			exclude '**/generic/shared/dto/**/*PE.class'
+			include '**/plugin/**/shared/basic/**/*.class'
+			include '**/plugin/**/shared/dto/**/*.class'
+			include '**/shared/authorization/annotation/*.class'
+			include '**/shared/authorization/ISessionProvider.class'
+			include '**/*BuildAndEnvironmentInfo.class'
+		}
+
+	from zipTree(configurations.adminConsolePartialLibs.files.iterator().next()).matching {
+			include '**/com/google/gwt/user/client/rpc/IsSerializable.class'
+			include '**/com/google/gwt/user/client/rpc/SerializableException.class'
+	}
+	
+	for (File f : configurations.adminConsoleLibs.files) {
+		from zipTree(f).matching {
+			include '**/**'
+		}
+	}
+    manifest {
+	    attributes("Main-Class": "ch.systemsx.cisd.openbis.generic.client.console.AdminConsole",
+    	           "Class-Path": "openbis-admin-console.jar cisd-base.jar commons-codec.jar commons-httpclient.jar commons-io.jar commons-logging.jar log4j.jar jline.jar spring.jar marathon-spring-util.jar")
+    }	
+}
+
+task zipAdminConsole(type: Zip) {
+	archiveName 'openbis-admin-console.zip'
+	from adminConsole.archivePath
+	into 'openbis-admin-console'
+}
+zipAdminConsole.dependsOn adminConsole

openbis_standard_technologies/build.gradle

@@ -16,6 +16,7 @@ apply from: 'screening-api.gradle'
 apply from: 'proteomics-api.gradle'
 apply from: 'dss-client.gradle'
 apply from: 'dss-upload-gui.gradle'
+apply from: 'admin-console.gradle'
 
 apply plugin: 'war'
 
@@ -23,8 +24,6 @@ archivesBaseName = 'openBIS-server-standard-technologies'
 
 configurations.create('gwt')
 configurations.create('zipping')
-configurations.create('admin_partial')
-configurations.create('admin_full')
 configurations.create('datastore_server')
 configurations.create('webStartJars')
 
@@ -43,23 +42,7 @@ dependencies {
                 'google:gwt-dev:+'
 	
 	zipping "eclipse:jetty-distribution:${jettyVersion}@zip"
-	
-	admin_partial 'google:gwt-user:2.4'
-	
-	admin_full 'cisd:cisd-base:+',
-				'apache:commons-httpclient:+',
-				'apache:commons-logging:+',
-				'apache:commons-io:+',
-				'apache:log4j:+',
-				'springframework:spring-core:+',
-				'springframework:spring-context:+',
-				'springframework:spring-jdbc:+',
-				'springframework:spring-orm:+',
-				'springframework:spring-aop:+',
-				'marathon:marathon-spring-util:+',
-				'springframework:spring-beans:+',
-				'jline:jline:0.9.94'	
-	
+		
 	datastore_server project(':deep_sequencing_unit'),
 					 project(':rtd_yeastx'),
 					 project(':screening'),
@@ -96,8 +79,7 @@ dependencies {
                  'springframework:spring-core:+',
                  'springframework:spring-web:+',
                  'marathon:marathon-spring-util:+',
-                 'aopalliance:aopalliance:+'
-                 
+                 'aopalliance:aopalliance:+'                 
 }
 
 buildscript {
@@ -325,52 +307,6 @@ task zipCorePlugins(type: Zip) {
 	into 'core-plugins'
 }
 
-task adminConsole(type: Jar) {
-	archiveName 'openbis-admin-console.jar'
-	includeEmptyDirs false
-	from zipTree(project(':common').jar.archivePath).plus(
-         zipTree(project(':openbis-common').jar.archivePath).plus( 
-         zipTree(project(':screening').jar.archivePath).plus( 
-         zipTree(project(':openbis').jar.archivePath)))).matching {
-			include '**/ch/systemsx/cisd/common/spring/HttpInvokerUtils.class'
-			include '**/ch/systemsx/cisd/common/**/*.class'
-			include '**/ch/systemsx/cisd/openbis/common/**/*.class'
-			include '**/ch/systemsx/cisd/openbis/generic/client/console/**/*.class'
-			include '**/shared/I*.class'
-			include '**/shared/basic/dto/**/*.class'
-			include '**/shared/basic/*.class'
-			include '**/shared/dto/**/*.class'
-			include '**/shared/dto/*PE.class'
-			include '**/shared/authorization/annotation/*.class'
-			include '**/shared/authorization/ISessionProvider.class'
-			include '**/*BuildAndEnvironmentInfo.class'
-		}
-
-	from zipTree(configurations.admin_partial.files.iterator().next()).matching {
-			include '**/com/google/gwt/user/client/rpc/IsSerializable.class'
-			include '**/com/google/gwt/user/client/rpc/SerializableException.class'
-	}
-	
-	for (File f : configurations.admin_full.files) {
-		from zipTree(f).matching {
-			include '**/**'
-		}
-	}
-    manifest {
-	    attributes("Main-Class": "ch.systemsx.cisd.openbis.generic.client.console.AdminConsole",
-    	           "Class-Path": "openbis-admin-console.jar cisd-base.jar commons-codec.jar commons-httpclient.jar commons-io.jar commons-logging.jar log4j.jar jline.jar spring.jar marathon-spring-util.jar")
-    }	
-}
-adminConsole.dependsOn war
-
-task zipAdminConsole(type: Zip) {
-	archiveName 'openbis-admin-console.zip'
-	from adminConsole.archivePath
-	into 'openbis-admin-console'
-}
-zipAdminConsole.dependsOn adminConsole
-
-
 def generateMD5(final file) {
    java.security.MessageDigest digest = java.security.MessageDigest.getInstance("MD5")
    file.withInputStream(){is->