Author: jdillon
Date: Mon Aug 6 10:00:25 2007
New Revision: 563190
URL: http://svn.apache.org/viewvc?view=rev&rev=563190
Log:
Some minor clean up
Modified:
geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/java/org/apache/geronimo/gshell/commands/standard/JavaCommand.java
geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JavaccMojo.groovy
geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JavaccMojoSupport.groovy
geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JjtreeMojo.groovy
Modified: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/java/org/apache/geronimo/gshell/commands/standard/JavaCommand.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/java/org/apache/geronimo/gshell/commands/standard/JavaCommand.java?view=diff&rev=563190&r1=563189&r2=563190
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/java/org/apache/geronimo/gshell/commands/standard/JavaCommand.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/java/org/apache/geronimo/gshell/commands/standard/JavaCommand.java
Mon Aug 6 10:00:25 2007
@@ -57,6 +57,7 @@
options.addOption(OptionBuilder.withLongOpt("method")
.withDescription(messages.getMessage("cli.option.method"))
+ .hasArg()
.withArgName("method")
.create('M'));
Modified: geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JavaccMojo.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JavaccMojo.groovy?view=diff&rev=563190&r1=563189&r2=563190
==============================================================================
--- geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JavaccMojo.groovy
(original)
+++ geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JavaccMojo.groovy
Mon Aug 6 10:00:25 2007
@@ -39,7 +39,7 @@
* @parameter expression="${project.build.directory}/generated-sources/javacc"
* @required
*/
- private File outputDirectory
+ File outputDirectory
/**
* ???
@@ -47,7 +47,7 @@
* @parameter
* @required
*/
- private FileSet grammars
+ FileSet grammars
void execute() {
ant.mkdir(dir: outputDirectory)
@@ -55,7 +55,7 @@
def fsm = new FileSetManager(log, log.debugEnabled)
def includes = fsm.getIncludedFiles(grammars)
if (includes.length == 0) {
- throw new MojoExecutionException('No grammars selected')
+ fail('No grammars selected')
}
// Generate sources to a temporary location, will install them after gen has occured
Modified: geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JavaccMojoSupport.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JavaccMojoSupport.groovy?view=diff&rev=563190&r1=563189&r2=563190
==============================================================================
--- geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JavaccMojoSupport.groovy
(original)
+++ geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JavaccMojoSupport.groovy
Mon Aug 6 10:00:25 2007
@@ -36,27 +36,23 @@
extends GroovyMojoSupport
{
/**
- * The maven project.
- *
* @parameter expression="${project}"
* @required
* @readonly
*/
- protected MavenProject project
+ MavenProject project
/**
- * Map of of plugin artifacts.
- *
* @parameter expression="${plugin.artifactMap}"
* @required
* @readonly
*/
- protected Map pluginArtifactMap
+ Map pluginArtifactMap
protected Artifact getPluginArtifact(final String name) throws MojoExecutionException
{
- Artifact artifact = (Artifact) pluginArtifactMap.get(name)
+ def artifact = pluginArtifactMap.get(name)
if (artifact == null) {
- throw new MojoExecutionException("Unable to locate '${name}' in the list of plugin
artifacts")
+ fail("Unable to locate '${name}' in the list of plugin artifacts")
}
return artifact
@@ -67,7 +63,7 @@
*/
protected void installGeneratedSources(File sourceDir) {
// Discover which classes were generated
- JavaDocBuilder builder = new JavaDocBuilder()
+ def builder = new JavaDocBuilder()
builder.addSourceTree(sourceDir)
// Install generated classes which were not overridden in some source root
Modified: geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JjtreeMojo.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JjtreeMojo.groovy?view=diff&rev=563190&r1=563189&r2=563190
==============================================================================
--- geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JjtreeMojo.groovy
(original)
+++ geronimo/sandbox/gshell/trunk/javacc-maven-plugin/src/main/groovy/org/apache/geronimo/gshell/maven/javacc/JjtreeMojo.groovy
Mon Aug 6 10:00:25 2007
@@ -39,12 +39,12 @@
* @parameter expression="${project.build.directory}/generated-sources/jjtree"
* @required
*/
- private File outputDirectory
+ File outputDirectory
/**
* @parameter
*/
- private String nodePackage
+ String nodePackage
/**
* ???
@@ -52,13 +52,13 @@
* @parameter
* @required
*/
- private FileSet grammars
+ FileSet grammars
void execute() {
def fsm = new FileSetManager(log, log.debugEnabled)
def includes = fsm.getIncludedFiles(grammars)
if (includes.length == 0) {
- throw new MojoExecutionException('No grammars selected')
+ fail('No grammars selected')
}
// Generate sources to a temporary location, will install them after gen has occured
|