Merge pull request #1 from thijslemmens/master

DEVEM-330 Fix configuration of amp task with plugin

src/integration-test/resources/examples/simple-alfresco-project/build.gradle

@@ -1,4 +1,21 @@
 plugins {
     id 'eu.xenit.alfresco'
     id 'eu.xenit.amp'
+}
+
+description = "HelloWorld Webscript, very useful"
+version = "0.0.1"
+
+ext.alfrescoVersion = "5.2.g"
+
+repositories {
+    mavenCentral()
+    jcenter()
+    maven {
+        url "https://artifacts.alfresco.com/nexus/content/groups/public/"
+    }
+}
+
+dependencies {
+    alfrescoProvided "org.alfresco:alfresco-repository:${alfrescoVersion}"
 }

src/integration-test/resources/examples/simple-alfresco-project/src/main/amp/config/alfresco/extension/templates/webscripts/eu/xenit/alfresco/gradle/sample/helloworld.get.desc.xml

@@ -0,0 +1,8 @@
+<webscript>
+  <shortname>Hello World</shortname>
+  <description>Hello World Sample Web Script that responds back with a greeting</description>
+  <url>/eu/xenit/helloworld</url>
+  <format default="html"></format>
+  <authentication>user</authentication>
+  <family>Xenit Samples</family>
+</webscript>

src/integration-test/resources/examples/simple-alfresco-project/src/main/amp/config/alfresco/module/example-default-amp/module-context.xml

@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
+<beans>
+  <bean id="webscript.eu.xenit.alfresco.gradle.sample.helloworld.get"
+    class="eu.xenit.alfresco.gradle.sample.HelloWorldWebScript"
+    parent="webscript">
+  </bean>
+</beans>

src/integration-test/resources/examples/simple-alfresco-project/src/main/amp/module.properties

@@ -0,0 +1,4 @@
+module.id=$project.name
+module.description=$project.description
+module.version=$project.version
+module.title=$project.name

src/integration-test/resources/examples/simple-alfresco-project/src/main/java/eu/xenit/alfresco/gradle/sample/HelloWorldWebScript.java

@@ -0,0 +1,15 @@
+package eu.xenit.alfresco.gradle.sample;
+
+import java.io.IOException;
+import org.springframework.extensions.webscripts.AbstractWebScript;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+
+public class HelloWorldWebScript extends AbstractWebScript {
+
+    @Override
+    public void execute(WebScriptRequest req, WebScriptResponse res) throws IOException {
+        res.getWriter().write("<h1>Hello World</h1>");
+    }
+}

src/main/java/eu/xenit/gradle/alfrescosdk/config/AmpConfig.java

@@ -7,6 +7,9 @@
 
 public class AmpConfig {
 
+    public static final String DEFAULT_CONFIG_DIR = "src/main/amp/config";
+    public static final String DEFAULT_MODULE_PROPERTIES = "src/main/amp/module.properties";
+    public static final String DEFAULT_WEB_DIR = "src/main/amp/web";
     private Supplier<File> moduleProperties;
     private Supplier<File> configDir;
     private Supplier<File> webDir;
@@ -15,17 +18,17 @@ public class AmpConfig {
     private final Project project;
     public AmpConfig(Project project){
         this.project = project;
-        moduleProperties = () -> new File("src/main/amp/module.properties");
+        moduleProperties = () -> project.file(DEFAULT_MODULE_PROPERTIES);
         configDir =  () -> {
-            File file = new File("src/main/amp/config");
+            File file = project.file(DEFAULT_CONFIG_DIR);
             if(file.exists()) {
                 return file;
             } else {
                 return null;
             }
         };
         webDir =  () -> {
-            File file = new File("src/main/amp/web");
+            File file = project.file(DEFAULT_WEB_DIR);
             if(file.exists()) {
                 return file;
             } else {

src/test/java/eu/xenit/gradle/alfrescosdk/AmpPluginTest.java

@@ -0,0 +1,37 @@
+package eu.xenit.gradle.alfrescosdk;
+
+import eu.xenit.gradle.alfrescosdk.config.AmpConfig;
+import eu.xenit.gradle.alfrescosdk.tasks.Amp;
+import java.io.File;
+import org.gradle.api.internal.project.DefaultProject;
+import org.gradle.testfixtures.ProjectBuilder;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class AmpPluginTest {
+
+    private DefaultProject getDefaultProject() {
+        DefaultProject project = (DefaultProject) ProjectBuilder.builder().build();
+        project.getPluginManager().apply(AmpPlugin.class);
+        return project;
+    }
+
+    @Test
+    public void testConfigFolderEmpty(){
+        DefaultProject defaultProject = getDefaultProject();
+        Amp ampTask = (Amp) defaultProject.getTasks().getByName("amp");
+        assertNull(ampTask.getConfig());
+    }
+
+    @Test
+    public void testConfigDirectoryExists(){
+        DefaultProject defaultProject = getDefaultProject();
+
+        File configDir = new File(defaultProject.getProjectDir().getAbsolutePath()+"/"+AmpConfig.DEFAULT_CONFIG_DIR);
+        assertTrue(configDir.mkdirs());
+
+        Amp ampTask = (Amp) defaultProject.getTasks().getByName("amp");
+        assertTrue(ampTask.getConfig().isDirectory());
+    }
+
+}

src/test/java/eu/xenit/gradle/alfrescosdk/BaseAlfrescoPluginTest.java

@@ -6,9 +6,7 @@
 import org.gradle.api.internal.plugins.PluginManagerInternal.PluginWithId;
 import org.gradle.api.internal.project.DefaultProject;
 import org.gradle.testfixtures.ProjectBuilder;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
 
 import static eu.xenit.gradle.alfrescosdk.AlfrescoPlugin.ALFRESCO_PROVIDED;
 import static org.junit.Assert.*;
@@ -22,9 +20,6 @@ private DefaultProject getDefaultProject() {
         return project;
     }
 
-    @Rule
-    public final TemporaryFolder testProjectFolder = new TemporaryFolder();
-
     @Test
     public void testJavaPluginApplied(){
         DefaultProject project = getDefaultProject();