Runtimes with parameters

boost-common/src/main/java/boost/common/runtimes/RuntimeI.java

@@ -10,18 +10,22 @@
  *******************************************************************************/
 package boost.common.runtimes;
 
+import java.util.List;
+
 import boost.common.BoostException;
+import boost.common.boosters.AbstractBoosterConfig;
 
 public abstract interface RuntimeI {
+    //Will need to pass in plugin mojo/task to Maven/Gradle along with project object
+
+    public void doPackage(List<AbstractBoosterConfig> boosterConfigs, Object project, Object pluginTask) throws BoostException;
 
-    public void doPackage() throws BoostException;
-
-    public void doDebug(boolean clean) throws BoostException;
+    public void doDebug(Object project, Object pluginTask) throws BoostException;
 
-    public void doRun(boolean clean) throws BoostException;
+    public void doRun(Object project, Object pluginTask) throws BoostException;
 
-    public void doStart(boolean clean, int verifyTimeout, int serverStartTimeout) throws BoostException;
+    public void doStart(Object project, Object pluginTask) throws BoostException;
 
-    public void doStop() throws BoostException;
+    public void doStop(Object project, Object pluginTask) throws BoostException;
 
 }

boost-gradle/build.gradle

@@ -6,7 +6,7 @@ plugins {
 }
 
 archivesBaseName = 'boost-gradle-plugin'
-group = 'io.openliberty.boost'
+group = 'boost'
 version = '0.1.1-SNAPSHOT'
 
 def boosterVersion = '0.1.3-SNAPSHOT'
@@ -24,9 +24,9 @@ repositories {
 
 dependencies {
     compile localGroovy()
-    compile 'net.wasdev.wlp.gradle.plugins:liberty-gradle-plugin:2.6.6-SNAPSHOT'
+    compile 'net.wasdev.wlp.gradle.plugins:liberty-gradle-plugin:2.6.7-SNAPSHOT'
     compile group: 'commons-io', name: 'commons-io', version: '2.6'
-    compile 'io.openliberty.boost:boost-common:0.1.3-SNAPSHOT'
+    compile 'boost:boost-common:0.1.3-SNAPSHOT'
     compile 'com.spotify:docker-client:8.11.7'
 
     testCompile 'junit:junit:4.12'
@@ -39,36 +39,28 @@ test {
     doFirst { //Copying gradle.properties with plugin version to test projects
         String runtimeGroup
         String runtimeArtifactId
-        String libertyRuntime = System.getProperty('runtime')
-        String runtimeVersion = System.getProperty('runtimeVersion')
+        String runtime = System.getProperty('runtime')
 
-        if (libertyRuntime == null || libertyRuntime.isEmpty()) {
+        if (runtime == null || runtime.isEmpty()) {
             throw new GradleException('Tests could not be run. Please specify a Liberty runtime. Choose either wlp or ol.')
         }
-        if (runtimeVersion == null || runtimeVersion.isEmpty()) {
-            throw new GradleException('Tests could not be run. Please specify a Liberty runtime version.')
-        }
 
         Properties prop = new Properties()
         OutputStream output = null
 
         try {
             output = new FileOutputStream("${buildDir}/gradle.properties")
 
-            if (libertyRuntime == "ol") {
-                runtimeGroup = "io.openliberty"
-                runtimeArtifactId = "openliberty-runtime"
-            } else {
-                runtimeGroup = "com.ibm.websphere.appserver.runtime"
-                runtimeArtifactId = "wlp-javaee7"
+            if (runtime == "ol") {
+                runtimeGroup = "boost.runtimes"
+                runtimeArtifactId = "openliberty-gradle"
             }
 
             // set the properties value
             prop.setProperty("boostVersion", version)
             prop.setProperty("boosterVersion", boosterVersion)
             prop.setProperty("runtimeGroup", runtimeGroup)
             prop.setProperty("runtimeArtifactId", runtimeArtifactId)
-            prop.setProperty("runtimeVersion", runtimeVersion)
 
             // save properties to project root folder
             prop.store(output, null)
@@ -165,8 +157,8 @@ if (project.hasProperty('ossrhUsername') && project.hasProperty('ossrhPassword')
 gradlePlugin {
     plugins {
         boostPlugin {
-            id = 'io.openliberty.boost'
-            implementationClass = 'io.openliberty.boost.gradle.Boost'
+            id = 'boost'
+            implementationClass = 'boost.gradle.Boost'
         }
     }
 }

boost-gradle/openliberty-gradle/build.gradle

@@ -0,0 +1,27 @@
+apply plugin: 'java'
+apply plugin: 'maven'
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+}
+
+dependencies {
+    compile "boost:boost-common:0.1.3-SNAPSHOT"
+    compile "boost.runtimes:liberty-common:0.1-SNAPSHOT"
+    compile "boost:boost-gradle-plugin:0.1.1-SNAPSHOT"
+    compile 'net.wasdev.wlp.gradle.plugins:liberty-gradle-plugin:2.6.6-SNAPSHOT'
+    compile "commons-io:commons-io:2.6"
+    compile localGroovy()
+    compile gradleApi()
+}
+
+group = 'boost.runtimes'
+archivesBaseName = 'openliberty-gradle'
+version = '0.1.3-SNAPSHOT'
+
+jar {
+    from ('./src/main/resources') {
+        include 'META-INF/services/boost.common.runtimes.GradleRuntimeI'
+    }
+}