You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2014/02/11 23:05:29 UTC
svn commit: r1567412 - in /tomee/tomee/trunk/tomee: apache-tomee/
apache-tomee/src/main/groovy/commands/
tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/
Author: tveronezi
Date: Tue Feb 11 22:05:28 2014
New Revision: 1567412
URL: http://svn.apache.org/r1567412
Log:
*project.properties.localRepository was not translated to the real value. It was the "${settings.localRepository}" string instead of '/home/tveronezi/.m2' value. Using value from 'pom' (this) instead.
*adding some auxiliary assert messages
Modified:
tomee/tomee/trunk/tomee/apache-tomee/pom.xml
tomee/tomee/trunk/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
tomee/tomee/trunk/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/ScriptingTest.groovy
tomee/tomee/trunk/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/SessionTest.groovy
Modified: tomee/tomee/trunk/tomee/apache-tomee/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/apache-tomee/pom.xml?rev=1567412&r1=1567411&r2=1567412&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/apache-tomee/pom.xml (original)
+++ tomee/tomee/trunk/tomee/apache-tomee/pom.xml Tue Feb 11 22:05:28 2014
@@ -250,7 +250,7 @@
<tomee.webapp>tomee-webapp</tomee.webapp>
</properties>
<source>
- new commands.SetupCommand(this, log,project,ant,properties).execute()
+ new commands.SetupCommand(pom: this, log: log, project: project, ant: ant, properties: properties).execute()
</source>
</configuration>
</execution>
@@ -265,7 +265,9 @@
<tomee.workdir>${jaxrs.work-dir}</tomee.workdir>
<tomee.webapp>tomee-jaxrs-webapp</tomee.webapp>
</properties>
- <source>new commands.SetupCommand(this, log,project,ant,properties).execute()</source>
+ <source>
+ new commands.SetupCommand(pom: this, log: log, project: project, ant: ant, properties: properties).execute()
+ </source>
</configuration>
</execution>
<execution>
@@ -279,7 +281,9 @@
<tomee.workdir>${plus.work-dir}</tomee.workdir>
<tomee.webapp>tomee-plus-webapp</tomee.webapp>
</properties>
- <source>new commands.SetupCommand(this, log,project,ant,properties).execute()</source>
+ <source>
+ new commands.SetupCommand(pom: this, log: log, project: project, ant: ant, properties: properties).execute()
+ </source>
</configuration>
</execution>
<execution>
@@ -293,7 +297,9 @@
<tomee.workdir>${plume.work-dir}</tomee.workdir>
<tomee.webapp>tomee-plume-webapp</tomee.webapp>
</properties>
- <source>new commands.SetupCommand(this, log,project,ant,properties).execute()</source>
+ <source>
+ new commands.SetupCommand(pom: this, log: log, project: project, ant: ant, properties: properties).execute()
+ </source>
</configuration>
</execution>
</executions>
@@ -428,13 +434,6 @@
</build>
<properties>
- <localRepository>${settings.localRepository}</localRepository>
- <http.proxy.host>${settings.activeProxy.host}</http.proxy.host>
- <http.proxy.port>${settings.activeProxy.port}</http.proxy.port>
- <http.proxy.username>${settings.activeProxy.username}</http.proxy.username>
- <http.proxy.password>${settings.activeProxy.password}</http.proxy.password>
- <http.proxy.nonProxyHosts>${settings.activeProxy.nonProxyHosts}</http.proxy.nonProxyHosts>
-
<webprofile.work-dir>${project.build.directory}/webprofile-work-dir</webprofile.work-dir>
<plus.work-dir>${project.build.directory}/plus-work-dir</plus.work-dir>
<plume.work-dir>${project.build.directory}/plume-work-dir</plume.work-dir>
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=1567412&r1=1567411&r2=1567412&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 Tue Feb 11 22:05:28 2014
@@ -31,63 +31,22 @@ class SetupCommand {
def ant
def properties
- def SetupCommand(def pom, def log, def project, def ant, def properties) {
- this.pom = pom
- this.log = log
- this.project = project
- this.ant = ant
- this.properties = properties
- }
-
- def get(name) {
+ def require(String name) {
assert name != null
def value = properties.getProperty(name)
+ if (!value || value == 'null') value = project.properties.getProperty(name)
+ if (!value || value == 'null') value = System.properties.getProperty(name)
+ if (value == 'null') value = null
+ log.debug("Require property $name = $value")
- if (null == value) value = project.properties.getProperty(name)
- if (null == value) value = System.properties.getProperty(name)
-
- log.debug("Get property: $name=$value")
-
- return value
- }
-
- def get(name, defaultValue) {
- def value = get(name)
-
- if (value == null) {
- value = defaultValue
- }
-
- return value
- }
-
- def getBoolean(name, defaultValue) {
- def value = get(name, defaultValue)
- return Boolean.valueOf("$value")
- }
-
- def require(name) {
- assert name != null
-
- log.debug("Require property: $name")
-
- if (!properties.containsKey(name) && !project.properties.containsKey(name) && !System.properties.containsKey(name)) {
- throw new Exception("Missing required property: $name" as String)
- }
-
- def value = get(name)
-
- if (value == 'null') {
+ if (!value) {
throw new Exception("Missing required property: $name (resolved to null)" as String)
}
-
return value
}
def execute() {
- def workDir = require('tomee.workdir')
- def webapp = require('tomee.webapp')
String tomcatVersion = require('tomcat.version')
System.setProperty('tomcat.version', tomcatVersion)
@@ -96,41 +55,39 @@ class SetupCommand {
String openejbVersion = require('openejb.version')
System.setProperty('openejb.version', openejbVersion)
- def localRepo = pom.settings.localRepository
-
- def proxyHost = get('http.proxy.host', '')
- String proxyPort = get('http.proxy.port', '')
- def proxyUsername = get('http.proxy.username', '')
- def proxyPassword = get('http.proxy.password', '')
- def proxyNonProxyHosts = get('http.proxy.nonProxyHosts', '')
- if ((!'${settings.activeProxy.host}'.equals(proxyHost) && proxyHost != null && proxyHost.length() > 0)
- || (!'${settings.activeProxy.port}'.equals(proxyPort) && proxyPort != null && proxyPort.length() > 0)) {
+ String proxyHost = pom.settings.activeProxy?.host ?: ''
+ String proxyPort = pom.settings.activeProxy?.port ?: ''
+ if (proxyHost && proxyPort) {
log.info("Setting proxy host=${proxyHost} and proxy port=${proxyPort}")
-
- def setProxy = new SetProxy();
- setProxy.setProxyHost(proxyHost as String)
- setProxy.setProxyPort(Integer.parseInt(proxyPort) as int)
- setProxy.setProxyUser(proxyUsername as String)
- setProxy.setProxyPassword(proxyPassword as String)
- setProxy.setNonProxyHosts(proxyNonProxyHosts as String)
- setProxy.execute()
+ new SetProxy(
+ proxyHost: proxyHost,
+ proxyPort: proxyPort as int,
+ proxyUser: pom.settings.activeProxy.username ?: '',
+ proxyPassword: pom.settings.activeProxy.password ?: '',
+ nonProxyHosts: pom.settings.activeProxy.nonProxyHosts ?: ''
+ ).execute()
}
+ def workDir = require('tomee.workdir')
+ def webapp = require('tomee.webapp')
+
def dest = "${workDir}/apache-tomcat-${tomcatVersion}.zip" as String
def catalinaHome = "${workDir}/apache-tomcat-${tomcatVersion}" as String
+ System.setProperty('catalina.home', catalinaHome)
+ System.setProperty('catalina.base', catalinaHome)
log.info("extracting ${catalinaHome}")
ant.unzip(src: dest, dest: "${workDir}")
- log.info("Deploying the tomee war")
+ log.info('Deploying the tomee war')
+ def localRepo = pom.settings.localRepository
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}" as String)
- System.setProperty('catalina.base', "${catalinaHome}" as String)
+
Paths paths = new Paths(new File("${catalinaHome}/webapps/tomee" as String))
Installer installer = new Installer(paths, true)
installer.installFull()
@@ -139,18 +96,18 @@ class SetupCommand {
// = gain of space ;)
ant.delete(file: paths.getJAXBImpl())
ant.delete(file: paths.getOpenEJBTomcatLoaderJar())
- ant.delete(file: paths.findTomEELibJar("jaxb-impl"))
+ ant.delete(file: paths.findTomEELibJar('jaxb-impl'))
ant.delete(file: paths.findTomEELibJar("openejb-javaagent-${openejbVersion}.jar" as String))
// we need the one without version
ant.delete(file: "${paths.catalinaLibDir}/static-tomee-jquery-${tomeeVersion}.jar")
ant.delete(file: "${paths.catalinaLibDir}/static-tomee-bootstrap-${tomeeVersion}.jar")
- ant.delete(file: paths.findOpenEJBWebJar("tomee-loader"))
- ant.delete(file: paths.findOpenEJBWebJar("swizzle-stream"))
+ 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")
Modified: tomee/tomee/trunk/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/ScriptingTest.groovy
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/ScriptingTest.groovy?rev=1567412&r1=1567411&r2=1567412&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/ScriptingTest.groovy (original)
+++ tomee/tomee/trunk/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/ScriptingTest.groovy Tue Feb 11 22:05:28 2014
@@ -63,10 +63,12 @@ class ScriptingTest {
new BasicNameValuePair('script', 'print("Hi there!");')
)
)
- Assert.assertTrue(Utilities.post(deploymentURL, client, 'rest/scripting',
+ def result = Utilities.post(deploymentURL, client, 'rest/scripting',
new BasicNameValuePair('engine', 'js'),
new BasicNameValuePair('script', 'throw "my bad!";')
- ).contains('javax.script.ScriptException: my bad!'))
+ )
+ Assert.assertTrue("Expecting to have the 'my bad!' message. Resulting message: ${result}",
+ result.contains('javax.script.ScriptException: my bad!'))
})
}
Modified: tomee/tomee/trunk/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/SessionTest.groovy
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/SessionTest.groovy?rev=1567412&r1=1567411&r2=1567412&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/SessionTest.groovy (original)
+++ tomee/tomee/trunk/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/SessionTest.groovy Tue Feb 11 22:05:28 2014
@@ -57,11 +57,13 @@ class SessionTest {
void test() throws Exception {
Utilities.withClient(deploymentURL, { CloseableHttpClient client ->
def content = Utilities.getBody(client.execute(new HttpGet("${deploymentURL.toURI()}rest/session")))
- Assert.assertEquals(1, (content =~ /context/).count)
+ def numberOfSessions = (content =~ /context/).count
+ Assert.assertEquals("Expecting 1 session. Resulting content: $content", 1, numberOfSessions)
})
Utilities.withClient(deploymentURL, { CloseableHttpClient client ->
def content = Utilities.getBody(client.execute(new HttpGet("${deploymentURL.toURI()}rest/session")))
- Assert.assertEquals(2, (content =~ /context/).count)
+ def numberOfSessions = (content =~ /context/).count
+ Assert.assertEquals("Expecting 2 sessions. Resulting content: $content", 2, numberOfSessions)
})
}