PL-10430 Fix beans.xml generation in test / themes modules

Author: jreznot

src/main/groovy/CubaPlugin.groovy

@@ -16,6 +16,7 @@
  */
 
 
+import com.haulmont.gradle.javaeecdi.CubaBeansXml
 import com.haulmont.gradle.polymer.CubaPolymerToolingInfoTask
 import com.haulmont.gradle.task.db.CubaHsqlStart
 import com.haulmont.gradle.task.db.CubaHsqlStop
@@ -676,29 +677,14 @@ class CubaPlugin implements Plugin<Project> {
 
     private void setJavaeeCdiNoScan(Project project) {
         if (!project.hasProperty('noBeansXml')) {
-            def beansXmlDir = new File(project.buildDir, 'beansXml')
-
             // create META-INF/beans.xml
-            def beansXmlTask = project.task('beansXml') {
-                group = 'Compile'
-                description = 'Generates beans.xml file to disable JavaEE CDI'
-
-                outputs.dir(beansXmlDir)
-
-                doLast {
-                    def file = new File(beansXmlDir, 'META-INF/beans.xml')
-                    file.parentFile.mkdirs()
-                    file.write(getClass().getResource('/javaeecdi/beans.xml').text)
-                }
-            }
+            def beansXmlTask = project.task([type: CubaBeansXml], CubaBeansXml.NAME)
 
             project.jar.dependsOn beansXmlTask
 
             project.jar {
                 // add META-INF/beans.xml
-                from(beansXmlDir) {
-                    include 'META-INF/beans.xml'
-                }
+                from(beansXmlTask)
             }
         }
     }

src/main/java/com/haulmont/gradle/javaeecdi/CubaBeansXml.java

@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2008-2018 Haulmont.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.haulmont.gradle.javaeecdi;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.gradle.api.DefaultTask;
+import org.gradle.api.GradleException;
+import org.gradle.api.tasks.OutputDirectory;
+import org.gradle.api.tasks.TaskAction;
+
+import java.io.File;
+import java.io.IOException;
+
+public class CubaBeansXml extends DefaultTask {
+
+    public static final String NAME = "beansXml";
+
+    public CubaBeansXml() {
+        setGroup("Compile");
+        setDescription("Generates beans.xml file to disable JavaEE CDI");
+    }
+
+    @OutputDirectory
+    public File getOutputDir() {
+        return new File(getProject().getBuildDir(), "beans-xml");
+    }
+
+    @TaskAction
+    public void generate() {
+        File beansXmlDir = getOutputDir();
+
+        File file = new File(beansXmlDir, "META-INF/beans.xml");
+        //noinspection ResultOfMethodCallIgnored
+        file.getParentFile().mkdirs();
+
+        try {
+            FileUtils.write(file, IOUtils.toString(CubaBeansXml.class.getResource("/javaeecdi/beans.xml")));
+        } catch (IOException e) {
+            throw new GradleException("Unable to create beans.xml", e);
+        }
+    }
+}