You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jd...@apache.org on 2005/07/29 05:04:54 UTC
svn commit: r226329 - in /maven/components/trunk:
maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/
maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/
maven-plugin-tools/maven-plugin...
Author: jdcasey
Date: Thu Jul 28 20:04:38 2005
New Revision: 226329
URL: http://svn.apache.org/viewcvs?rev=226329&view=rev
Log:
Working on MNG-250...
Resolving MNG-488
o Brought the metadata tags for marmalade mojos up to snuff with the java-mojo annotations
o Added @aggregator annotation ( <aggregator>true</aggregator> in marmalade) for mojos
o Added support for aggregator flag throughout plugin-descriptor, generator, and builder.
More commits to follow...
Added:
maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/AggregatorTag.java (with props)
maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecuteLifecycleTag.java (with props)
maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecutePhaseTag.java (with props)
maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/InheritByDefaultTag.java (with props)
maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/RequiresOnlineTag.java (with props)
Removed:
maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/LifecyclePhaseTag.java
Modified:
maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java
maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecuteTag.java
maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/MetadataTag.java
maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/MojoDefinitionTagLibrary.java
maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParameterTag.java
Modified: maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java?rev=226329&r1=226328&r2=226329&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java (original)
+++ maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java Thu Jul 28 20:04:38 2005
@@ -61,6 +61,8 @@
private String executeLifecycle;
private String deprecated;
+
+ private boolean aggregator = false;
// ----------------------------------------------------------------------
//
@@ -388,5 +390,15 @@
public void setExecuteLifecycle( String executeLifecycle )
{
this.executeLifecycle = executeLifecycle;
+ }
+
+ public void setAggregator( boolean aggregator )
+ {
+ this.aggregator = aggregator;
+ }
+
+ public boolean isAggregator()
+ {
+ return aggregator;
}
}
Modified: maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java?rev=226329&r1=226328&r2=226329&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java (original)
+++ maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java Thu Jul 28 20:04:38 2005
@@ -167,6 +167,13 @@
mojo.setProjectRequired( Boolean.valueOf( requiresProject ).booleanValue() );
}
+ String aggregator = c.getChild( "aggregator" ).getValue();
+
+ if ( aggregator != null )
+ {
+ mojo.setAggregator( Boolean.valueOf( aggregator ).booleanValue() );
+ }
+
String requiresOnline = c.getChild( "requiresOnline" ).getValue();
if ( requiresOnline != null )
Modified: maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java?rev=226329&r1=226328&r2=226329&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java (original)
+++ maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java Thu Jul 28 20:04:38 2005
@@ -132,6 +132,12 @@
//
// ----------------------------------------------------------------------
+ element( w, "aggregator", "" + mojoDescriptor.isAggregator() );
+
+ // ----------------------------------------------------------------------
+ //
+ // ----------------------------------------------------------------------
+
element( w, "requiresOnline", "" + mojoDescriptor.isOnlineRequired() );
// ----------------------------------------------------------------------
Modified: maven/components/trunk/maven-plugin-tools/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-tools/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java?rev=226329&r1=226328&r2=226329&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-tools/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java (original)
+++ maven/components/trunk/maven-plugin-tools/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java Thu Jul 28 20:04:38 2005
@@ -51,6 +51,7 @@
implements MojoDescriptorExtractor
{
public static final String MAVEN_PLUGIN_INSTANTIATION = "instantiationStrategy";
+
public static final String CONFIGURATOR = "configurator";
public static final String PARAMETER = "parameter";
@@ -76,6 +77,8 @@
public static final String GOAL_REQUIRES_DEPENDENCY_RESOLUTION = "requiresDependencyResolution";
public static final String GOAL_REQUIRES_PROJECT = "requiresProject";
+
+ public static final String GOAL_IS_AGGREGATOR = "aggregator";
public static final String GOAL_REQUIRES_ONLINE = "requiresOnline";
@@ -234,6 +237,17 @@
if ( requiresProject != null )
{
mojoDescriptor.setProjectRequired( true );
+ }
+
+ // ----------------------------------------------------------------------
+ // Aggregator flag
+ // ----------------------------------------------------------------------
+
+ DocletTag aggregator = findInClassHierarchy( javaClass, GOAL_IS_AGGREGATOR );
+
+ if ( aggregator != null )
+ {
+ mojoDescriptor.setAggregator( true );
}
// ----------------------------------------------------------------------
Added: maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/AggregatorTag.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/AggregatorTag.java?rev=226329&view=auto
==============================================================================
--- maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/AggregatorTag.java (added)
+++ maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/AggregatorTag.java Thu Jul 28 20:04:38 2005
@@ -0,0 +1,34 @@
+package org.apache.maven.script.marmalade.tags;
+
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+
+import org.codehaus.marmalade.runtime.MarmaladeExecutionException;
+
+/**
+ * @author jdcasey Created on Feb 8, 2005
+ */
+public class AggregatorTag
+ extends AbstractBooleanValuedBodyTag
+{
+
+ protected void setValue( Boolean value ) throws MarmaladeExecutionException
+ {
+ MetadataTag metadataTag = (MetadataTag) requireParent( MetadataTag.class );
+ metadataTag.setAggregator( value.booleanValue() );
+ }
+
+}
\ No newline at end of file
Propchange: maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/AggregatorTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/AggregatorTag.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecuteLifecycleTag.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecuteLifecycleTag.java?rev=226329&view=auto
==============================================================================
--- maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecuteLifecycleTag.java (added)
+++ maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecuteLifecycleTag.java Thu Jul 28 20:04:38 2005
@@ -0,0 +1,34 @@
+package org.apache.maven.script.marmalade.tags;
+
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+
+import org.codehaus.marmalade.runtime.MarmaladeExecutionException;
+
+/**
+ * @author jdcasey Created on Feb 8, 2005
+ */
+public class ExecuteLifecycleTag
+ extends AbstractStringValuedBodyTag
+{
+
+ protected void setValue( String value ) throws MarmaladeExecutionException
+ {
+ MetadataTag metadataTag = (MetadataTag) requireParent( MetadataTag.class );
+ metadataTag.setExecuteLifecycle( value );
+ }
+
+}
\ No newline at end of file
Propchange: maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecuteLifecycleTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecuteLifecycleTag.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecutePhaseTag.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecutePhaseTag.java?rev=226329&view=auto
==============================================================================
--- maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecutePhaseTag.java (added)
+++ maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecutePhaseTag.java Thu Jul 28 20:04:38 2005
@@ -0,0 +1,34 @@
+package org.apache.maven.script.marmalade.tags;
+
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+
+import org.codehaus.marmalade.runtime.MarmaladeExecutionException;
+
+/**
+ * @author jdcasey Created on Feb 8, 2005
+ */
+public class ExecutePhaseTag
+ extends AbstractStringValuedBodyTag
+{
+
+ protected void setValue( String value ) throws MarmaladeExecutionException
+ {
+ MetadataTag metadataTag = (MetadataTag) requireParent( MetadataTag.class );
+ metadataTag.setExecutePhase( value );
+ }
+
+}
\ No newline at end of file
Propchange: maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecutePhaseTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecutePhaseTag.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecuteTag.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecuteTag.java?rev=226329&r1=226328&r2=226329&view=diff
==============================================================================
--- maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecuteTag.java (original)
+++ maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecuteTag.java Thu Jul 28 20:04:38 2005
@@ -17,7 +17,6 @@
*/
import org.codehaus.marmalade.model.AbstractMarmaladeTag;
-import org.codehaus.marmalade.model.MarmaladeTag;
import org.codehaus.marmalade.runtime.MarmaladeExecutionContext;
import org.codehaus.marmalade.runtime.MarmaladeExecutionException;
@@ -37,7 +36,7 @@
{
for ( Iterator it = children().iterator(); it.hasNext(); )
{
- MarmaladeTag child = (MarmaladeTag) it.next();
+ it.next();
}
}
Added: maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/InheritByDefaultTag.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/InheritByDefaultTag.java?rev=226329&view=auto
==============================================================================
--- maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/InheritByDefaultTag.java (added)
+++ maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/InheritByDefaultTag.java Thu Jul 28 20:04:38 2005
@@ -0,0 +1,34 @@
+package org.apache.maven.script.marmalade.tags;
+
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+
+import org.codehaus.marmalade.runtime.MarmaladeExecutionException;
+
+/**
+ * @author jdcasey Created on Feb 8, 2005
+ */
+public class InheritByDefaultTag
+ extends AbstractBooleanValuedBodyTag
+{
+
+ protected void setValue( Boolean value ) throws MarmaladeExecutionException
+ {
+ MetadataTag metadataTag = (MetadataTag) requireParent( MetadataTag.class );
+ metadataTag.setInheritByDefault( value.booleanValue() );
+ }
+
+}
\ No newline at end of file
Propchange: maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/InheritByDefaultTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/InheritByDefaultTag.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/MetadataTag.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/MetadataTag.java?rev=226329&r1=226328&r2=226329&view=diff
==============================================================================
--- maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/MetadataTag.java (original)
+++ maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/MetadataTag.java Thu Jul 28 20:04:38 2005
@@ -49,10 +49,18 @@
private List parameters = new ArrayList();
- private String lifecyclePhase;
-
private String description;
+ private boolean aggregator = false;
+
+ private boolean inheritByDefault = true;
+
+ private boolean requiresOnline;
+
+ private String executePhase;
+
+ private String executeLifecycle;
+
protected boolean alwaysProcessChildren()
{
return false;
@@ -99,6 +107,16 @@
descriptor.setInstantiationStrategy( instantiationStrategy );
}
+ if ( notEmpty( executeLifecycle ) )
+ {
+ descriptor.setExecuteLifecycle( executeLifecycle );
+ }
+
+ if ( notEmpty( executePhase ) )
+ {
+ descriptor.setExecutePhase( executePhase );
+ }
+
try
{
descriptor.setParameters( parameters );
@@ -110,6 +128,9 @@
descriptor.setDependencyResolutionRequired( requiresDependencyResolution );
descriptor.setProjectRequired( requiresProject );
+ descriptor.setAggregator( aggregator );
+ descriptor.setInheritedByDefault( inheritByDefault );
+ descriptor.setOnlineRequired( requiresOnline );
String basePath = (String) context.getVariable( MarmaladeMojoExecutionDirectives.SCRIPT_BASEPATH_INVAR,
getExpressionEvaluator() );
@@ -136,11 +157,6 @@
return test != null && test.trim().length() > 0;
}
- public void setLifecyclePhase( String lifecyclePhase )
- {
- this.lifecyclePhase = lifecyclePhase;
- }
-
public void setGoal( String goal )
{
this.goal = goal;
@@ -174,6 +190,31 @@
public void setParameters( List parameters )
{
this.parameters = parameters;
+ }
+
+ public void setAggregator( boolean aggregator )
+ {
+ this.aggregator = aggregator;
+ }
+
+ public void setInheritByDefault( boolean inheritByDefault )
+ {
+ this.inheritByDefault = inheritByDefault;
+ }
+
+ public void setRequiresOnline( boolean requiresOnline )
+ {
+ this.requiresOnline = requiresOnline;
+ }
+
+ public void setExecutePhase( String executePhase )
+ {
+ this.executePhase = executePhase;
+ }
+
+ public void setExecuteLifecycle( String executeLifecycle )
+ {
+ this.executeLifecycle = executeLifecycle;
}
}
Modified: maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/MojoDefinitionTagLibrary.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/MojoDefinitionTagLibrary.java?rev=226329&r1=226328&r2=226329&view=diff
==============================================================================
--- maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/MojoDefinitionTagLibrary.java (original)
+++ maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/MojoDefinitionTagLibrary.java Thu Jul 28 20:04:38 2005
@@ -32,13 +32,15 @@
registerTag( "executionStrategy", ExecutionStrategyTag.class );
registerTag( "goal", GoalTag.class );
registerTag( "instantiationStrategy", InstantiationStrategyTag.class );
- registerTag( "lifecyclePhase", LifecyclePhaseTag.class );
registerTag( "metadata", MetadataTag.class );
registerTag( "mojo", MojoTag.class );
registerTag( "parameters", ParametersTag.class );
registerTag( "parameter", ParameterTag.class );
registerTag( "requiresDependencyResolution", RequiresDependencyResolutionTag.class );
registerTag( "requiresProject", RequiresProjectTag.class );
+ registerTag( "requiresOnline", RequiresOnlineTag.class );
+ registerTag( "inheritByDefault", InheritByDefaultTag.class );
+ registerTag( "aggregator", AggregatorTag.class );
registerTag( "name", ParamNameTag.class );
registerTag( "expression", ParamExpressionTag.class );
registerTag( "type", ParamTypeTag.class );
Modified: maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParameterTag.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParameterTag.java?rev=226329&r1=226328&r2=226329&view=diff
==============================================================================
--- maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParameterTag.java (original)
+++ maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParameterTag.java Thu Jul 28 20:04:38 2005
@@ -41,6 +41,8 @@
private boolean required = true;
+ private String defaultVal;
+
protected void doExecute( MarmaladeExecutionContext context )
throws MarmaladeExecutionException
{
@@ -62,6 +64,7 @@
param.setRequired( required );
param.setType( type );
param.setDeprecated( deprecated );
+ param.setDefaultValue( defaultVal );
return param;
}
@@ -88,6 +91,7 @@
public void setDefault( String defaultVal )
{
+ this.defaultVal = defaultVal;
}
public void setRequired( boolean required )
Added: maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/RequiresOnlineTag.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/RequiresOnlineTag.java?rev=226329&view=auto
==============================================================================
--- maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/RequiresOnlineTag.java (added)
+++ maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/RequiresOnlineTag.java Thu Jul 28 20:04:38 2005
@@ -0,0 +1,34 @@
+package org.apache.maven.script.marmalade.tags;
+
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+
+import org.codehaus.marmalade.runtime.MarmaladeExecutionException;
+
+/**
+ * @author jdcasey Created on Feb 8, 2005
+ */
+public class RequiresOnlineTag
+ extends AbstractBooleanValuedBodyTag
+{
+
+ protected void setValue( Boolean value ) throws MarmaladeExecutionException
+ {
+ MetadataTag metadataTag = (MetadataTag) requireParent( MetadataTag.class );
+ metadataTag.setRequiresOnline( value.booleanValue() );
+ }
+
+}
\ No newline at end of file
Propchange: maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/RequiresOnlineTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/RequiresOnlineTag.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org