Author: tveronezi
Date: Wed Oct 9 11:16:15 2013
New Revision: 1530564
URL: http://svn.apache.org/r1530564
Log:
https://issues.apache.org/jira/browse/TOMEE-1036
removing static jar files from catalina lib directory
Modified:
tomee/tomee/trunk/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
Modified:
tomee/tomee/trunk/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy?rev=1530564&r1=1530563&r2=1530564&view=diff
==============================================================================
---
tomee/tomee/trunk/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
(original)
+++
tomee/tomee/trunk/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
Wed Oct 9 11:16:15 2013
@@ -19,112 +19,112 @@
package commands
-import org.apache.tomee.installer.Installer;
-import org.apache.tomee.installer.Paths;
+import org.apache.tomee.installer.Installer
+import org.apache.tomee.installer.Paths
import org.apache.tools.ant.taskdefs.optional.net.SetProxy
class SetupCommand {
- def log
- def ant
- def project
+ def log
+ def ant
+ def project
- def SetupCommand(source) {
- this.log = source.log
- this.project = source.project
- this.ant = new AntBuilder()
- }
+ def SetupCommand(source) {
+ this.log = source.log
+ this.project = source.project
+ this.ant = new AntBuilder()
+ }
- def get(name) {
- assert name != null
+ def get(name) {
+ assert name != null
- def value = project.properties.getProperty(name)
+ def value = project.properties.getProperty(name)
- log.debug("Get property: $name=$value")
+ log.debug("Get property: $name=$value")
- return value
- }
+ return value
+ }
- def get(name, defaultValue) {
- def value = get(name)
+ def get(name, defaultValue) {
+ def value = get(name)
- if (value == null) {
- value = defaultValue
- }
+ if (value == null) {
+ value = defaultValue
+ }
- return value
- }
+ return value
+ }
- def getBoolean(name, defaultValue) {
- def value = get(name, defaultValue)
- return Boolean.valueOf("$value")
- }
+ def getBoolean(name, defaultValue) {
+ def value = get(name, defaultValue)
+ return Boolean.valueOf("$value")
+ }
- def require(name) {
- assert name != null
+ def require(name) {
+ assert name != null
- log.debug("Require property: $name")
+ log.debug("Require property: $name")
- if (!project.properties.containsKey(name) &&
!System.properties.containsKey(name)) {
- throw new Exception("Missing required property: $name")
- }
+ if (!project.properties.containsKey(name) &&
!System.properties.containsKey(name)) {
+ throw new Exception("Missing required property: $name")
+ }
- def value = get(name)
+ def value = get(name)
- if (value == 'null') {
- throw new Exception("Missing required property: $name
(resolved to null)")
- }
+ if (value == 'null') {
+ throw new Exception("Missing required property: $name (resolved to
null)")
+ }
- return value
- }
+ return value
+ }
- def execute() {
- def workDir = require('tomee.workdir')
- def webapp = require('tomee.webapp')
- def tomcatVersion = require('tomcat.version')
- System.setProperty('tomcat.version', tomcatVersion)
+ def execute() {
+ def workDir = require('tomee.workdir')
+ def webapp = require('tomee.webapp')
+ def tomcatVersion = require('tomcat.version')
+ System.setProperty('tomcat.version', tomcatVersion)
def tomeeVersion = require('tomee.version')
- System.setProperty('tomee.version', tomeeVersion)
+ System.setProperty('tomee.version', tomeeVersion)
- def openejbVersion = require('openejb.version')
- System.setProperty('openejb.version', openejbVersion)
- def localRepo = require('localRepository')
-
- def proxyHost = get('http.proxy.host', '')
- def proxyPort = get('http.proxy.port', '')
- def proxyUsername = get('http.proxy.username', '')
- def proxyPassword = get('http.proxy.password', '')
- def proxyNonProxyHosts = get('http.proxy.nonProxyHosts', '')
-
- if ((proxyHost != null && proxyHost.length() > 0) || (proxyPort
!= null && proxyPort.length() > 0)) {
- log.info("Setting proxy host=${proxyHost} and proxy
port=${proxyPort}")
-
- def setProxy = new SetProxy();
- setProxy.setProxyHost(proxyHost)
- setProxy.setProxyPort(Integer.parseInt(proxyPort))
- setProxy.setProxyUser(proxyUsername)
- setProxy.setProxyPassword(proxyPassword)
- setProxy.setNonProxyHosts(proxyNonProxyHosts)
- setProxy.execute()
- }
-
- def dest = "${workDir}/apache-tomcat-${tomcatVersion}.zip"
- def catalinaHome = "${workDir}/apache-tomcat-${tomcatVersion}"
+ def openejbVersion = require('openejb.version')
+ System.setProperty('openejb.version', openejbVersion)
+ def localRepo = require('localRepository')
+
+ def proxyHost = get('http.proxy.host', '')
+ def proxyPort = get('http.proxy.port', '')
+ def proxyUsername = get('http.proxy.username', '')
+ def proxyPassword = get('http.proxy.password', '')
+ def proxyNonProxyHosts = get('http.proxy.nonProxyHosts', '')
+
+ if ((proxyHost != null && proxyHost.length() > 0) || (proxyPort !=
null && proxyPort.length() > 0)) {
+ log.info("Setting proxy host=${proxyHost} and proxy
port=${proxyPort}")
+
+ def setProxy = new SetProxy();
+ setProxy.setProxyHost(proxyHost)
+ setProxy.setProxyPort(Integer.parseInt(proxyPort))
+ setProxy.setProxyUser(proxyUsername)
+ setProxy.setProxyPassword(proxyPassword)
+ setProxy.setNonProxyHosts(proxyNonProxyHosts)
+ setProxy.execute()
+ }
+
+ def dest = "${workDir}/apache-tomcat-${tomcatVersion}.zip"
+ def catalinaHome = "${workDir}/apache-tomcat-${tomcatVersion}"
log.info("extracting ${catalinaHome}")
- ant.unzip(src: dest, dest: "${workDir}")
+ ant.unzip(src: dest, dest: "${workDir}")
- log.info("Deploying the tomee war")
- ant.unzip(src:
"${localRepo}/org/apache/openejb/${webapp}/${tomeeVersion}/${webapp}-${tomeeVersion}.war",
- dest:
"${workDir}/apache-tomcat-${tomcatVersion}/webapps/tomee")
-
- log.info("Installing to: ${catalinaHome}")
-
- System.setProperty("catalina.home", "${catalinaHome}")
- System.setProperty("catalina.base", "${catalinaHome}")
- Paths paths = new Paths(new
File("${catalinaHome}/webapps/tomee"))
- Installer installer = new Installer(paths, true)
- installer.installFull()
+ log.info("Deploying the tomee war")
+ ant.unzip(src:
"${localRepo}/org/apache/openejb/${webapp}/${tomeeVersion}/${webapp}-${tomeeVersion}.war",
+ dest:
"${workDir}/apache-tomcat-${tomcatVersion}/webapps/tomee")
+
+ log.info("Installing to: ${catalinaHome}")
+
+ System.setProperty("catalina.home", "${catalinaHome}")
+ System.setProperty("catalina.base", "${catalinaHome}")
+ Paths paths = new Paths(new File("${catalinaHome}/webapps/tomee"))
+ Installer installer = new Installer(paths, true)
+ installer.installFull()
// clean up duplicate jars since in TomEE it is useless
// = gain of space ;)
@@ -132,15 +132,19 @@ class SetupCommand {
ant.delete(file: paths.getOpenEJBTomcatLoaderJar())
ant.delete(file: paths.findTomEELibJar("jaxb-impl"))
ant.delete(file:
paths.findTomEELibJar("openejb-javaagent-${openejbVersion}.jar")) // we need
the one without version
+
+ ant.delete(file:
"${paths.catalinaLibDir}/tomee-static-jquery-${tomeeVersion}.jar")
+ ant.delete(file:
"${paths.catalinaLibDir}/tomee-static-bootstrap-${tomeeVersion}.jar")
+
ant.delete(file: paths.findOpenEJBWebJar("tomee-loader"))
ant.delete(file: paths.findOpenEJBWebJar("swizzle-stream"))
- log.info("Assigning execute privileges to scripts in Tomcat bin
directory")
- ant.chmod(dir: "${workDir}/apache-tomcat-${tomcatVersion}/bin",
perm: "u+x", includes: "**/*.sh")
+ log.info("Assigning execute privileges to scripts in Tomcat bin
directory")
+ ant.chmod(dir: "${workDir}/apache-tomcat-${tomcatVersion}/bin", perm:
"u+x", includes: "**/*.sh")
ant.delete(dir:
"${workDir}/apache-tomcat-${tomcatVersion}/webapps/examples")
ant.delete(file:
"${workDir}/apache-tomcat-${tomcatVersion}/webapps/tomee/META-INF/LICENSE")
ant.delete(file:
"${workDir}/apache-tomcat-${tomcatVersion}/webapps/tomee/META-INF/NOTICE")
- }
+ }
}
