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 18:02:18 UTC
svn commit: r1567223 - in /tomee/tomee/trunk/tomee/apache-tomee: pom.xml
src/main/groovy/commands/SetupCommand.groovy
Author: tveronezi
Date: Tue Feb 11 17:02:18 2014
New Revision: 1567223
URL: http://svn.apache.org/r1567223
Log:
project.properties.localRepository was not translated to the real value. It was the "${settings.localRepository}" string instead of '/home/tveronezi/.m2' value.
Modified:
tomee/tomee/trunk/tomee/apache-tomee/pom.xml
tomee/tomee/trunk/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.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=1567223&r1=1567222&r2=1567223&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/apache-tomee/pom.xml (original)
+++ tomee/tomee/trunk/tomee/apache-tomee/pom.xml Tue Feb 11 17:02:18 2014
@@ -250,7 +250,7 @@
<tomee.webapp>tomee-webapp</tomee.webapp>
</properties>
<source>
- new commands.SetupCommand(log,project,ant,properties).execute()
+ new commands.SetupCommand(this, log,project,ant,properties).execute()
</source>
</configuration>
</execution>
@@ -265,7 +265,7 @@
<tomee.workdir>${jaxrs.work-dir}</tomee.workdir>
<tomee.webapp>tomee-jaxrs-webapp</tomee.webapp>
</properties>
- <source>new commands.SetupCommand(log,project,ant,properties).execute()</source>
+ <source>new commands.SetupCommand(this, log,project,ant,properties).execute()</source>
</configuration>
</execution>
<execution>
@@ -279,7 +279,7 @@
<tomee.workdir>${plus.work-dir}</tomee.workdir>
<tomee.webapp>tomee-plus-webapp</tomee.webapp>
</properties>
- <source>new commands.SetupCommand(log,project,ant,properties).execute()</source>
+ <source>new commands.SetupCommand(this, log,project,ant,properties).execute()</source>
</configuration>
</execution>
<execution>
@@ -293,7 +293,7 @@
<tomee.workdir>${plume.work-dir}</tomee.workdir>
<tomee.webapp>tomee-plume-webapp</tomee.webapp>
</properties>
- <source>new commands.SetupCommand(log,project,ant,properties).execute()</source>
+ <source>new commands.SetupCommand(this, log,project,ant,properties).execute()</source>
</configuration>
</execution>
</executions>
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=1567223&r1=1567222&r2=1567223&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 17:02:18 2014
@@ -25,16 +25,26 @@ import org.apache.tools.ant.taskdefs.opt
class SetupCommand {
+ def pom
def log
def project
def ant
def properties
- def SetupCommand(def log, def project, 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
+
+ this.log.info('Build properties...')
+ this.project.properties.each { key, value ->
+ this.log.info(" project.properties[${key}] = ${value}")
+ }
+ this.properties.each { key, value ->
+ this.log.info(" properties[${key}] = ${value}")
+ }
}
def get(name) {
@@ -94,7 +104,7 @@ class SetupCommand {
String openejbVersion = require('openejb.version')
System.setProperty('openejb.version', openejbVersion)
- def localRepo = require('localRepository')
+ def localRepo = pom.settings.localRepository
def proxyHost = get('http.proxy.host', '')
String proxyPort = get('http.proxy.port', '')