dion 2004/01/12 03:50:50
Modified: src/java/org/apache/maven/jelly Tag: MAVEN-1_0-BRANCH
JellyUtils.java JellyBuildListener.java
src/java/org/apache/maven/jelly/tags/jeez Tag:
MAVEN-1_0-BRANCH JeezTagLibrary.java
src/java/org/apache/maven Tag: MAVEN-1_0-BRANCH
MavenSession.java
src/java/org/apache/maven/repository Tag: MAVEN-1_0-BRANCH
Artifact.java
Log:
Code cleanup and javadoc
Revision Changes Path
No revision
No revision
1.16.4.2 +3 -3 maven/src/java/org/apache/maven/jelly/JellyUtils.java
Index: JellyUtils.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/jelly/JellyUtils.java,v
retrieving revision 1.16.4.1
retrieving revision 1.16.4.2
diff -u -r1.16.4.1 -r1.16.4.2
--- JellyUtils.java 26 Nov 2003 11:45:16 -0000 1.16.4.1
+++ JellyUtils.java 12 Jan 2004 11:50:49 -0000 1.16.4.2
@@ -186,7 +186,7 @@
* @return The compiled script.
* @todo throw something else
*/
- public static Script compileScript( InputStream scriptInputStream, JellyContext
context, String encoding )
+ public static Script compileScript( InputStream scriptInputStream, JellyContext
context, String encoding )
throws Exception
{
// FIXME: This should all be done by Jelly.
@@ -212,7 +212,7 @@
return script;
}
-
+
/**
* Recursively evaluate a string representation of a jelly expression.
*
1.4.4.1 +11 -24 maven/src/java/org/apache/maven/jelly/JellyBuildListener.java
Index: JellyBuildListener.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/jelly/JellyBuildListener.java,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -r1.4 -r1.4.4.1
--- JellyBuildListener.java 19 Aug 2003 04:28:15 -0000 1.4
+++ JellyBuildListener.java 12 Jan 2004 11:50:49 -0000 1.4.4.1
@@ -113,9 +113,6 @@
public void messageLogged( BuildEvent event )
{
-
- // System.err.println( "messageLogged(" + event + ")" );
-
if ( event.getPriority() > Project.MSG_INFO
&&
!isDebug() )
@@ -140,30 +137,20 @@
switch ( event.getPriority() )
{
case ( Project.MSG_ERR ):
- {
- out.write( "[ERROR] " );
- break;
- }
+ out.write( "[ERROR] " );
+ break;
case ( Project.MSG_WARN ):
- {
- // out.write( "[WARN] ");
- break;
- }
+ // out.write( "[WARN] ");
+ break;
case ( Project.MSG_INFO ):
- {
- // normal, do nothing.
- break;
- }
+ // normal, do nothing.
+ break;
case ( Project.MSG_VERBOSE ):
- {
- out.write( "[VERBOSE] " );
- break;
- }
+ out.write( "[VERBOSE] " );
+ break;
case ( Project.MSG_DEBUG ):
- {
- out.write( "[DEBUG] " );
- break;
- }
+ out.write( "[DEBUG] " );
+ break;
}
out.write( event.getMessage() + "\n" );
No revision
No revision
1.5.4.3 +13 -1
maven/src/java/org/apache/maven/jelly/tags/jeez/JeezTagLibrary.java
Index: JeezTagLibrary.java
===================================================================
RCS file:
/home/cvs/maven/src/java/org/apache/maven/jelly/tags/jeez/JeezTagLibrary.java,v
retrieving revision 1.5.4.2
retrieving revision 1.5.4.3
diff -u -r1.5.4.2 -r1.5.4.3
--- JeezTagLibrary.java 8 Jan 2004 00:07:46 -0000 1.5.4.2
+++ JeezTagLibrary.java 12 Jan 2004 11:50:49 -0000 1.5.4.3
@@ -82,6 +82,18 @@
/** jelly:ant taglib. */
private AntTagLibrary antTagLib = new AntTagLibrary();
+ /**
+ * Create a script from the element and the attributes.
+ * This method will check for 'tagdef' and 'target' tags, and try to create
+ * an instance of these tags first.
+ *
+ * Failing that it tries to create a werkz tag script followed by an ant
+ * 'custom tag script' (i.e. one for filescanner or setProperty).
+ *
+ * If all else fails, it creates a TagScript from a factory that creates a
script
+ * from either a Jeez tag, or an Ant tag
+ * @see org.apache.commons.jelly.TagLibrary#createTagScript(java.lang.String,
org.xml.sax.Attributes)
+ */
public TagScript createTagScript(
final String name,
Attributes attrs
No revision
No revision
1.18.4.3 +34 -6 maven/src/java/org/apache/maven/MavenSession.java
Index: MavenSession.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/MavenSession.java,v
retrieving revision 1.18.4.2
retrieving revision 1.18.4.3
diff -u -r1.18.4.2 -r1.18.4.3
--- MavenSession.java 11 Jan 2004 13:05:22 -0000 1.18.4.2
+++ MavenSession.java 12 Jan 2004 11:50:50 -0000 1.18.4.3
@@ -126,41 +126,69 @@
// A C C E S S O R S
// ------------------------------------------------------------
- public void setRootContext( MavenJellyContext rootContext )
+ /**
+ * Set the context for the session
+ * @param context the context to use
+ */
+ public void setRootContext( MavenJellyContext context )
{
- this.rootContext = rootContext;
+ rootContext = context;
}
+ /**
+ * @return the root context for the session
+ */
public MavenJellyContext getRootContext()
{
return rootContext;
}
+ /**
+ * Set the top level project for the session
+ * @param descriptorFile the POM for the top level project
+ */
public static void setRootDescriptorFile( File descriptorFile )
{
rootDescriptorFile = descriptorFile;
}
+ /**
+ * @return the top level project for the session
+ */
public static File getRootDescriptorFile()
{
return rootDescriptorFile;
}
- public void setRootProject( Project rootProject )
+ /**
+ * Set the top level project object for the session
+ * @param project the top level project
+ */
+ public void setRootProject( Project project )
{
- this.rootProject = rootProject;
+ rootProject = project;
}
+ /**
+ * @return the top level project object for the session
+ */
public Project getRootProject()
{
return rootProject;
}
+ /**
+ * Set the plugin manager to handle plugin loading for the session
+ * @param pluginManager a plugin manager
+ */
public void setPluginManager( PluginManager pluginManager )
{
this.pluginManager = pluginManager;
}
+ /**
+ * @return the plugin manager for the session
+ */
public PluginManager getPluginManager()
{
return pluginManager;
@@ -268,7 +296,7 @@
*
* @param project the project being processed
* @param goals a list of goal names to execute
- * @throws Exception
+ * @throws Exception when anything goes wrong
* @todo don't throw exception
*/
public void attainGoals( final Project project, final List goals ) throws
Exception
No revision
No revision
1.18.10.1 +4 -2 maven/src/java/org/apache/maven/repository/Artifact.java
Index: Artifact.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/repository/Artifact.java,v
retrieving revision 1.18
retrieving revision 1.18.10.1
diff -u -r1.18 -r1.18.10.1
--- Artifact.java 11 Apr 2003 23:45:32 -0000 1.18
+++ Artifact.java 12 Jan 2004 11:50:50 -0000 1.18.10.1
@@ -151,7 +151,9 @@
File getFile();
/**
- * Verify the artifact.
+ * Verify the artifact.
+ *
+ * @throws ChecksumVerificationException if verification fails
*/
void verify()
throws ChecksumVerificationException;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
