#58: using exploded war for console

=> allow for tweaking/configuring! => allow for bom
pongasoft · Jul 1, 2013 · f4ab2d3 · f4ab2d3
1 parent 18ab943
commit f4ab2d3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 24 deletions.
diff --git a/console/org.linkedin.glu.console-server/build.gradle b/console/org.linkedin.glu.console-server/build.gradle
@@ -77,24 +77,23 @@ cmdline {
   // licenses
   resources << [ packageIncludes ]
 
-  // console.war
+  // jetty
   resources << [
-    from: consoleWebapp,
-    into: new File(assemblePackageFile, 'glu/repository/wars'),
+    from: tarTree(jettyArchive),
     replaceTokens: false
   ]
 
-  // sample-webapp.war
+  // exploded console
   resources << [
-    from: sampleWebapp,
-    into: new File(assemblePackageFile, 'glu/repository/wars'),
+    from: zipTree(consoleWebapp),
+    into: new File(assemblePackageFile, "glu/repository/exploded-wars/${consoleWebappProject.name}-${consoleWebappProject.version}"),
     replaceTokens: false
   ]
 
-  // keys
+  // sample-webapp.war
   resources << [
-    from: consoleKeys,
-    into: new File(assemblePackageFile, 'keys'),
+    from: sampleWebapp,
+    into: new File(assemblePackageFile, 'glu/repository/wars'),
     replaceTokens: false
   ]
 
@@ -116,16 +115,3 @@ cmdline {
     }
   }
 }
-
-File basePackage = project.convention.plugins.cmdline.assemblePackageFile
-
-/********************************************************
- * task: package-assemble
- * customizing package-assemble task to include jetty
- ********************************************************/
-project.'package-assemble'.doFirst {
-  // fetch/untar jetty distribution
-  ant.untar(src: configurations.jetty.resolve().toList()[0],
-            dest: basePackage,
-            compression: 'gzip')
-}
diff --git a/...rces/configs/console-server/@jetty.distribution@/contexts/console-jetty-context.xml.gtmpl b/...rces/configs/console-server/@jetty.distribution@/contexts/console-jetty-context.xml.gtmpl
@@ -21,7 +21,7 @@
 <Configure class="org.eclipse.jetty.webapp.WebAppContext">
   <Call class="org.eclipse.jetty.util.log.Log" name="debug"><Arg>Configure console-jetty-context.xml</Arg></Call>
   <Set name="contextPath">${consoleMetaModel.internalPath}</Set>
-  <Set name="war"><%= configTokens.consoleWarPath ?: "<SystemProperty name=\"org.linkedin.glu.console.root\"/>/glu/repository/wars/org.linkedin.glu.console-webapp-${consoleMetaModel.version}.war" %></Set>
+  <Set name="war"><%= configTokens.consoleWarPath ?: "<SystemProperty name=\"org.linkedin.glu.console.root\"/>/glu/repository/exploded-wars/org.linkedin.glu.console-webapp-${consoleMetaModel.version}" %></Set>
   <Set name="tempDirectory"><SystemProperty name="org.linkedin.glu.console.root"/>/tmp</Set>
   <Set name="extraClasspath"><SystemProperty name="org.linkedin.glu.console.plugins.classpath"/></Set>
 </Configure>

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
@@ -323,7 +323,7 @@ JVM_SIZE="-Xmx555m"
 <Configure class="org.eclipse.jetty.webapp.WebAppContext">
   <Call class="org.eclipse.jetty.util.log.Log" name="debug"><Arg>Configure console-jetty-context.xml</Arg></Call>
   <Set name="contextPath">/console</Set>
-  <Set name="war"><SystemProperty name="org.linkedin.glu.console.root"/>/glu/repository/wars/org.linkedin.glu.console-webapp-${GLU_VERSION}.war</Set>
+  <Set name="war"><SystemProperty name="org.linkedin.glu.console.root"/>/glu/repository/exploded-wars/org.linkedin.glu.console-webapp-${GLU_VERSION}</Set>
   <Set name="tempDirectory"><SystemProperty name="org.linkedin.glu.console.root"/>/tmp</Set>
   <Set name="extraClasspath"><SystemProperty name="org.linkedin.glu.console.plugins.classpath"/></Set>
 </Configure>