From 7016318c3fc0471ab4e0fd02ddbca21103c2de39 Mon Sep 17 00:00:00 2001
From: Yuriy Artamonov <artamonov@haulmont.com>
Date: Thu, 25 Feb 2016 18:27:26 +0400
Subject: [PATCH] PL-5838 Use jars for web content

---
 build.gradle | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/build.gradle b/build.gradle
index 52ecde4c97..fcfd466332 100644
--- a/build.gradle
+++ b/build.gradle
@@ -478,10 +478,6 @@ configure(webModule) {
 
     task enhance(type: CubaEnhancing)
 
-    jar {
-        from sourceSets.main.allJava
-    }
-
     task buildScssThemes(type: CubaWebScssThemeCreation) {
         themes = ['halo', 'havana']
 //        compress = true
@@ -518,29 +514,18 @@ configure(webModule) {
         exclude '**/web.xml'
     }
 
-    def webOutDir = file("$buildDir/web")
-    task webArchive(dependsOn: buildScssThemes, type: Zip) {
-        from file('web')
-        from webOutDir
-        exclude '**/web.xml', '**/app.properties'
-        classifier = 'web'
-    }
-
-    artifacts {
-        archives webArchive
+    jar.dependsOn buildScssThemes
+    jar {
+        with copySpec {
+            from sourceSets.main.allJava
+            include "com/haulmont/cuba/web/toolkit/ui/client/**"
+        }
     }
 
     task deploy(dependsOn: assemble, type: CubaDeployment) {
         appName = 'cuba'
         appJars('cuba-global', 'cuba-client', 'cuba-gui', 'cuba-web', 'cuba-web-auth')
     }
-
-    deploy << {
-        copy {
-            from "$buildDir/web"
-            into "$cuba.tomcat.dir/webapps/cuba"
-        }
-    }
 }
 
 configure(webModuleThemesModule) {