You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/10/11 10:41:17 UTC
svn commit: r462732 -
/geronimo/genesis/trunk/plugins/script-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/script/GroovyMojo.java
Author: jdillon
Date: Wed Oct 11 01:41:16 2006
New Revision: 462732
URL: http://svn.apache.org/viewvc?view=rev&rev=462732
Log:
Revert exception handling... better to show more verbose output then to hid the line num context
Modified:
geronimo/genesis/trunk/plugins/script-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/script/GroovyMojo.java
Modified: geronimo/genesis/trunk/plugins/script-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/script/GroovyMojo.java
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/plugins/script-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/script/GroovyMojo.java?view=diff&rev=462732&r1=462731&r2=462732
==============================================================================
--- geronimo/genesis/trunk/plugins/script-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/script/GroovyMojo.java (original)
+++ geronimo/genesis/trunk/plugins/script-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/script/GroovyMojo.java Wed Oct 11 01:41:16 2006
@@ -177,33 +177,16 @@
return resolvedProperties;
}
};
+
groovyObject.setProperty("project", delegate);
groovyObject.setProperty("pom", delegate);
- try {
- groovyObject.invokeMethod("run", new Object[0]);
- }
- catch (MissingPropertyException e) {
- throw e;
- }
- catch (GroovyRuntimeException e) {
- //
- // TODO: Log the context of the script (line num, etc) from the ASTNode
- //
-
- // Unroll groovy runtime exceptions, but log the real details too
- if (log.isDebugEnabled()) {
- log.debug(e.getMessage(), e);
- }
-
- Throwable cause = e.getCause();
- throw new MojoExecutionException(cause.getMessage(), cause);
- }
+ groovyObject.invokeMethod("run", new Object[0]);
}
private Properties resolveProperties(final Properties source) {
Properties props = new Properties(System.getProperties());
-
+
// Setup the variables which should be used for resolution
Map vars = new HashMap();
vars.put("project", project);