You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/02/11 15:10:25 UTC
svn commit: r1567143 - in /tomee/tomee/trunk: ./ examples/moviefun/
tomee/apache-tomee/ tomee/apache-tomee/src/main/groovy/commands/
tomee/tomee-plume-webapp/ tomee/tomee-static-content/
tomee/tomee-static-content/bootstrap/ tomee/tomee-static-content/...
Author: andygumbrecht
Date: Tue Feb 11 14:10:24 2014
New Revision: 1567143
URL: http://svn.apache.org/r1567143
Log:
Update groovy-maven-plugin usage
Ignores.
Modified:
tomee/tomee/trunk/ (props changed)
tomee/tomee/trunk/examples/moviefun/ (props changed)
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-plume-webapp/ (props changed)
tomee/tomee/trunk/tomee/tomee-static-content/ (props changed)
tomee/tomee/trunk/tomee/tomee-static-content/bootstrap/ (props changed)
tomee/tomee/trunk/tomee/tomee-static-content/jquery/ (props changed)
tomee/tomee/trunk/tomee/tomee-webaccess/ (props changed)
tomee/tomee/trunk/utils/openejb-core-eclipselink/ (props changed)
Propchange: tomee/tomee/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Feb 11 14:10:24 2014
@@ -10,3 +10,4 @@ out
target
*.bat
maven.txt
+pom.xml.bak
Propchange: tomee/tomee/trunk/examples/moviefun/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Feb 11 14:10:24 2014
@@ -1,2 +1,3 @@
target
*.iml
+.idea
Modified: tomee/tomee/trunk/tomee/apache-tomee/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/apache-tomee/pom.xml?rev=1567143&r1=1567142&r2=1567143&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/apache-tomee/pom.xml (original)
+++ tomee/tomee/trunk/tomee/apache-tomee/pom.xml Tue Feb 11 14:10:24 2014
@@ -18,7 +18,8 @@
<!-- $Rev: 600338 $ $Date: 2007-12-02 09:08:04 -0800 (Sun, 02 Dec 2007) $ -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
@@ -31,6 +32,11 @@
<dependencies>
<dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>2.2.1</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -38,7 +44,11 @@
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
- <version>0.9.94</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
</dependency>
<dependency>
<artifactId>commons-lang3</artifactId>
@@ -59,13 +69,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- <version>1.7.1</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-common</artifactId>
<version>${tomee.version}</version>
@@ -214,25 +217,20 @@
<plugin>
<groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <version>1.3</version>
+ <artifactId>groovy-maven-plugin</artifactId>
+ <version>2.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-jpa-integration</artifactId>
+ <version>${openejb.version}</version>
+ </dependency>
+ </dependencies>
<configuration>
+ <classpathScope>runtime</classpathScope>
<scriptpath>
- <element>${project.basedir}/src/main/groovy</element>
+ <path>${project.basedir}/src/main/groovy</path>
</scriptpath>
- <classpath>
- <element>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- <version>0.9.94</version>
- </element>
- <element>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- <version>1.7.1</version>
- <type>jar</type>
- </element>
- </classpath>
<defaults>
<testSectionsFile>${project.basedir}/sections.properties</testSectionsFile>
<logOutputDirectory>${project.build.directory}/logs</logOutputDirectory>
@@ -247,24 +245,13 @@
<goal>execute</goal>
</goals>
<configuration>
- <source>new commands.SetupCommand(this).execute()</source>
<properties>
<tomee.workdir>${webprofile.work-dir}</tomee.workdir>
<tomee.webapp>tomee-webapp</tomee.webapp>
</properties>
- <classpath>
- <element>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- <version>0.9.94</version>
- </element>
- <element>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- <version>1.7.1</version>
- <type>jar</type>
- </element>
- </classpath>
+ <source>
+ new commands.SetupCommand(log,project,ant,properties).execute()
+ </source>
</configuration>
</execution>
<execution>
@@ -274,29 +261,11 @@
<goal>execute</goal>
</goals>
<configuration>
- <source>new commands.SetupCommand(this).execute()</source>
<properties>
<tomee.workdir>${jaxrs.work-dir}</tomee.workdir>
<tomee.webapp>tomee-jaxrs-webapp</tomee.webapp>
</properties>
- <classpath>
- <element>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- <version>0.9.94</version>
- </element>
- <element>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- <version>1.7.1</version>
- <type>jar</type>
- </element>
- <element>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-jpa-integration</artifactId>
- <version>${openejb.version}</version>
- </element>
- </classpath>
+ <source>new commands.SetupCommand(log,project,ant,properties).execute()</source>
</configuration>
</execution>
<execution>
@@ -306,29 +275,11 @@
<goal>execute</goal>
</goals>
<configuration>
- <source>new commands.SetupCommand(this).execute()</source>
<properties>
<tomee.workdir>${plus.work-dir}</tomee.workdir>
<tomee.webapp>tomee-plus-webapp</tomee.webapp>
</properties>
- <classpath>
- <element>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- <version>0.9.94</version>
- </element>
- <element>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- <version>1.7.1</version>
- <type>jar</type>
- </element>
- <element>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-jpa-integration</artifactId>
- <version>${openejb.version}</version>
- </element>
- </classpath>
+ <source>new commands.SetupCommand(log,project,ant,properties).execute()</source>
</configuration>
</execution>
<execution>
@@ -338,37 +289,19 @@
<goal>execute</goal>
</goals>
<configuration>
- <source>new commands.SetupCommand(this).execute()</source>
<properties>
<tomee.workdir>${plume.work-dir}</tomee.workdir>
<tomee.webapp>tomee-plume-webapp</tomee.webapp>
</properties>
- <classpath>
- <element>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- <version>0.9.94</version>
- </element>
- <element>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- <version>1.7.1</version>
- <type>jar</type>
- </element>
- <element>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-jpa-integration</artifactId>
- <version>${openejb.version}</version>
- </element>
- </classpath>
+ <source>new commands.SetupCommand(log,project,ant,properties).execute()</source>
</configuration>
</execution>
</executions>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.2</version>
<executions>
<execution>
<id>webprofile</id>
@@ -495,18 +428,18 @@
</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>
- <jaxrs.work-dir>${project.build.directory}/jaxrs-work-dir</jaxrs.work-dir>
- </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>
+ <jaxrs.work-dir>${project.build.directory}/jaxrs-work-dir</jaxrs.work-dir>
+ </properties>
</project>
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=1567143&r1=1567142&r2=1567143&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 14:10:24 2014
@@ -24,20 +24,26 @@ import org.apache.tomee.installer.Paths
import org.apache.tools.ant.taskdefs.optional.net.SetProxy
class SetupCommand {
+
def log
- def ant
def project
+ def ant
+ def properties
- def SetupCommand(source) {
- this.log = source.log
- this.project = source.project
- this.ant = new AntBuilder()
+ def SetupCommand(def log, def project, def ant, def properties) {
+ this.log = log
+ this.project = project
+ this.ant = ant
+ this.properties = properties
}
def get(name) {
assert name != null
- def value = project.properties.getProperty(name)
+ def value = properties.getProperty(name)
+
+ if (null == value) value = project.properties.getProperty(name)
+ if (null == value) value = System.properties.getProperty(name)
log.debug("Get property: $name=$value")
@@ -64,14 +70,14 @@ class SetupCommand {
log.debug("Require property: $name")
- if (!project.properties.containsKey(name) && !System.properties.containsKey(name)) {
- throw new Exception("Missing required 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') {
- throw new Exception("Missing required property: $name (resolved to null)")
+ throw new Exception("Missing required property: $name (resolved to null)" as String)
}
return value
@@ -80,36 +86,37 @@ class SetupCommand {
def execute() {
def workDir = require('tomee.workdir')
def webapp = require('tomee.webapp')
- def tomcatVersion = require('tomcat.version')
+ String tomcatVersion = require('tomcat.version')
System.setProperty('tomcat.version', tomcatVersion)
- def tomeeVersion = require('tomee.version')
+ String tomeeVersion = require('tomee.version')
System.setProperty('tomee.version', tomeeVersion)
- def openejbVersion = require('openejb.version')
+ String 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', '')
+ 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 ((proxyHost != null && proxyHost.length() > 0) || (proxyPort != null && proxyPort.length() > 0)) {
+ if ((!'${settings.activeProxy.host}'.equals(proxyHost) && proxyHost != null && proxyHost.length() > 0)
+ || (!'${settings.activeProxy.port}'.equals(proxyPort) && 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.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()
}
- def dest = "${workDir}/apache-tomcat-${tomcatVersion}.zip"
- def catalinaHome = "${workDir}/apache-tomcat-${tomcatVersion}"
+ def dest = "${workDir}/apache-tomcat-${tomcatVersion}.zip" as String
+ def catalinaHome = "${workDir}/apache-tomcat-${tomcatVersion}" as String
log.info("extracting ${catalinaHome}")
ant.unzip(src: dest, dest: "${workDir}")
@@ -120,9 +127,9 @@ class SetupCommand {
log.info("Installing to: ${catalinaHome}")
- System.setProperty("catalina.home", "${catalinaHome}")
- System.setProperty("catalina.base", "${catalinaHome}")
- Paths paths = new Paths(new File("${catalinaHome}/webapps/tomee"))
+ 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()
@@ -131,7 +138,8 @@ class SetupCommand {
ant.delete(file: paths.getJAXBImpl())
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.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")
Propchange: tomee/tomee/trunk/tomee/tomee-plume-webapp/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Feb 11 14:10:24 2014
@@ -0,0 +1,2 @@
+target
+*.iml
Propchange: tomee/tomee/trunk/tomee/tomee-static-content/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Feb 11 14:10:24 2014
@@ -0,0 +1 @@
+target
Propchange: tomee/tomee/trunk/tomee/tomee-static-content/bootstrap/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Feb 11 14:10:24 2014
@@ -0,0 +1,2 @@
+target
+*.iml
Propchange: tomee/tomee/trunk/tomee/tomee-static-content/jquery/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Feb 11 14:10:24 2014
@@ -0,0 +1 @@
+target
Propchange: tomee/tomee/trunk/tomee/tomee-webaccess/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Feb 11 14:10:24 2014
@@ -0,0 +1,2 @@
+target
+*.iml
Propchange: tomee/tomee/trunk/utils/openejb-core-eclipselink/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Feb 11 14:10:24 2014
@@ -0,0 +1 @@
+target