#243: generate tgz during setup + removed javadoc

pongasoft · Sep 13, 2013 · 10b1609 · 10b1609
1 parent 2c5dbe8
commit 10b1609
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 7 deletions.
diff --git a/console/org.linkedin.glu.console-server/build.gradle b/console/org.linkedin.glu.console-server/build.gradle
@@ -99,13 +99,6 @@ cmdline {
     replaceTokens: false
   ]
 
-  // jetty archive
-  resources << [
-    from: jettyArchive,
-    into: new File(assemblePackageFile, 'glu/repository/tgzs'),
-    replaceTokens: false
-  ]
-
   // scripts
   scriptProjects.each { scriptProject ->
     scriptProject.tasks.withType(SingleArtifactTask.class).each { t ->
@@ -117,3 +110,10 @@ cmdline {
     }
   }
 }
+
+project.'package-assemble'.doLast {
+  File basePackage = project.convention.plugins.cmdline.assemblePackageFile
+
+  // getting rid of the unnecessary javadoc that comes with jetty!
+  delete new File(basePackage, "${jettyDistribution}/javadoc")
+}
diff --git a/packaging/org.linkedin.glu.packaging-all/build.gradle b/packaging/org.linkedin.glu.packaging-all/build.gradle
@@ -222,6 +222,7 @@ task 'clean-dev-setup' << {
     logger.lifecycle("Stopping previous setup")
     exec {
       commandLine devSetupCtlFile.canonicalPath, "stop"
+      ignoreExitValue true
     }
   }
 

diff --git a/...setup-impl/src/main/groovy/org/pongasoft/glu/packaging/setup/ConsoleServerPackager.groovy b/...setup-impl/src/main/groovy/org/pongasoft/glu/packaging/setup/ConsoleServerPackager.groovy
@@ -16,6 +16,7 @@
 
 package org.pongasoft.glu.packaging.setup
 
+import org.linkedin.groovy.util.config.Config
 import org.linkedin.util.io.resource.Resource
 import org.pongasoft.glu.provisioner.core.metamodel.ConsoleMetaModel
 
@@ -88,6 +89,12 @@ public class ConsoleServerPackager extends BasePackager
       if(metaModel.gluMetaModel.stateMachine)
         generateStateMachineJarFile(metaModel.gluMetaModel.stateMachine,
                                     packagePath.createRelative('glu/repository/plugins'))
+      if(Config.getOptionalBoolean(configTokens, 'includeJettyDistribution', true))
+      {
+        shell.tar(dir: packagePath.createRelative(jettyDistribution),
+                  tarFile: packagePath.createRelative("glu/repository/tgzs/${jettyDistribution}.tar.gz"),
+                  compression: 'gzip')
+      }
     }
     return new PackagedArtifact(location: packagePath,
                                 host: metaModel.host.resolveHostAddress(),

diff --git a/...soft.glu.packaging-setup-impl/src/test/groovy/test/setup/TestConsoleServerPackager.groovy b/...soft.glu.packaging-setup-impl/src/test/groovy/test/setup/TestConsoleServerPackager.groovy
@@ -90,6 +90,15 @@ public class TestConsoleServerPackager extends BasePackagerTest
           "/glu/repository/exploded-wars/org.linkedin.glu.console-webapp-${GLU_VERSION}/WEB-INF/web.xml": { r ->
             assertTrue(r.file.text.contains('<session-timeout>30</session-timeout>'))
           },
+          "/glu/repository/tgzs": DIRECTORY,
+          "/glu/repository/tgzs/${jettyDistribution}.tar.gz": tarContent(shell, [
+            "/${jettyDistribution}": DIRECTORY,
+            "/${jettyDistribution}/contexts": DIRECTORY,
+            "/${jettyDistribution}/contexts/console-jetty-context.xml": TUTORIAL_CONSOLE_JETTY_CONTEXT,
+            "/${jettyDistribution}/contexts/glu-jetty-context.xml": DEFAULT_GLU_JETTY_CONTEXT,
+            "/${jettyDistribution}/lib": DIRECTORY,
+            "/${jettyDistribution}/lib/acme.jar": 'this is the jar',
+          ]),
         ]
 
       checkPackageContent(expectedResources, artifact.location)
@@ -129,6 +138,7 @@ consoles << [
   version: '${GLU_VERSION}',
   dataSourceDriverUri: '${driverResource.toURI()}',
   configTokens: [
+    includeJettyDistribution: false,
     dataSource: '<datasource>',
     JVM_SIZE: '-Xmx555m',
     plugins: '<extra plugin config>',

diff --git a/.../org.pongasoft.glu.packaging-setup-impl/src/test/groovy/test/setup/TestGluPackager.groovy b/.../org.pongasoft.glu.packaging-setup-impl/src/test/groovy/test/setup/TestGluPackager.groovy
@@ -185,6 +185,8 @@ public class TestGluPackager extends BasePackagerTest
             "/${console}/glu/repository/exploded-wars/org.linkedin.glu.console-webapp-${GLU_VERSION}": DIRECTORY,
             "/${console}/glu/repository/exploded-wars/org.linkedin.glu.console-webapp-${GLU_VERSION}/WEB-INF": DIRECTORY,
             "/${console}/glu/repository/exploded-wars/org.linkedin.glu.console-webapp-${GLU_VERSION}/WEB-INF/web.xml": FILE,
+            "/${console}/glu/repository/tgzs": DIRECTORY,
+            "/${console}/glu/repository/tgzs/${jettyDistribution}.tar.gz": FILE,
           ], bulkFailure),
           '/zookeeper-clusters': DIRECTORY,
           "/${zkc}": DIRECTORY,