Author: bentmann
Date: Sat Aug 16 08:22:20 2008
New Revision: 686510
URL: http://svn.apache.org/viewvc?rev=686510&view=rev
Log:
o Extended integration test to check both script interpreters
Added:
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/
(props changed)
- copied from r686478,
maven/plugins/trunk/maven-invoker-plugin/src/it/global-vars/
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/beanshell/
(props changed)
- copied from r686478,
maven/plugins/trunk/maven-invoker-plugin/src/it/global-vars/src/it/project/
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/groovy/
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/groovy/pom.xml
(with props)
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/groovy/setup.groovy
(with props)
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/groovy/verify.groovy
(with props)
Removed:
maven/plugins/trunk/maven-invoker-plugin/src/it/global-vars/
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/project/
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/pom.xml
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/beanshell/pom.xml
Propchange: maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/pom.xml?rev=686510&r1=686478&r2=686510&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/pom.xml
(original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/pom.xml
Sat Aug 16 08:22:20 2008
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugins.invoker</groupId>
- <artifactId>global-vars</artifactId>
+ <artifactId>script-global-vars</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -47,8 +47,8 @@
<pomIncludes>
<pomInclude>*/pom.xml</pomInclude>
</pomIncludes>
- <preBuildHookScript>setup.bsh</preBuildHookScript>
- <postBuildHookScript>verify.bsh</postBuildHookScript>
+ <preBuildHookScript>setup</preBuildHookScript>
+ <postBuildHookScript>verify</postBuildHookScript>
<goals>
<goal>validate</goal>
</goals>
Propchange:
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/beanshell/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/beanshell/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/beanshell/pom.xml?rev=686510&r1=686478&r2=686510&view=diff
==============================================================================
---
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/beanshell/pom.xml
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/beanshell/pom.xml
Sat Aug 16 08:22:20 2008
@@ -19,8 +19,8 @@
-->
<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";>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.test</groupId>
- <artifactId>unit</artifactId>
+ <groupId>test</groupId>
+ <artifactId>beanshell</artifactId>
<version>0.1-SNAPSHOT</version>
<packaging>pom</packaging>
Added:
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/groovy/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/groovy/pom.xml?rev=686510&view=auto
==============================================================================
---
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/groovy/pom.xml
(added)
+++
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/groovy/pom.xml
Sat Aug 16 08:22:20 2008
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<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";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>test</groupId>
+ <artifactId>groovy</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+</project>
Propchange:
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/groovy/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/groovy/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/groovy/setup.groovy
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/groovy/setup.groovy?rev=686510&view=auto
==============================================================================
---
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/groovy/setup.groovy
(added)
+++
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/groovy/setup.groovy
Sat Aug 16 08:22:20 2008
@@ -0,0 +1,27 @@
+import java.io.*
+import java.util.*
+import java.util.regex.*
+
+try
+{
+ println basedir
+ if ( !( basedir instanceof File ) )
+ {
+ println "Global script variable not defined: basedir"
+ return false
+ }
+
+ println localRepositoryPath
+ if ( !( localRepositoryPath instanceof File ) )
+ {
+ println "Global script variable not defined: localRepositoryPath"
+ return false
+ }
+}
+catch( Throwable t )
+{
+ t.printStackTrace()
+ return false
+}
+
+return true
Propchange:
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/groovy/setup.groovy
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/groovy/setup.groovy
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/groovy/verify.groovy
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/groovy/verify.groovy?rev=686510&view=auto
==============================================================================
---
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/groovy/verify.groovy
(added)
+++
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/groovy/verify.groovy
Sat Aug 16 08:22:20 2008
@@ -0,0 +1,27 @@
+import java.io.*
+import java.util.*
+import java.util.regex.*
+
+try
+{
+ println basedir
+ if ( !( basedir instanceof File ) )
+ {
+ println "Global script variable not defined: basedir"
+ return false
+ }
+
+ println localRepositoryPath
+ if ( !( localRepositoryPath instanceof File ) )
+ {
+ println "Global script variable not defined: localRepositoryPath"
+ return false
+ }
+}
+catch( Throwable t )
+{
+ t.printStackTrace()
+ return false
+}
+
+return true
Propchange:
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/groovy/verify.groovy
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/groovy/verify.groovy
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
