Re: svn commit: r1293991 - /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java

[Lukas Theussl]

Salut Herve,

Just a comment: my IDE (netbeans) now shows a javadoc error because the 
{@inheritDoc} doesn't pick up the description of the corresponding 
parameter. Could the parameter name be changed in the interface as well?


-Lukas


hbout...@apache.org wrote:

Author: hboutemy
Date: Mon Feb 27 01:34:11 2012
New Revision: 1293991

URL: http://svn.apache.org/viewvc?rev=1293991view=rev
Log:
renamed parameter for better understanding

Modified:
 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java

Modified: 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java?rev=1293991r1=1293990r2=1293991view=diff
==
--- 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
 (original)
+++ 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
 Mon Feb 27 01:34:11 2012
@@ -334,7 +334,7 @@ public class DefaultSiteRenderer
  }

  /** {@inheritDoc} */
-public void renderDocument( Writer writer, RenderingContext 
renderingContext, SiteRenderingContext context )
+public void renderDocument( Writer writer, RenderingContext 
renderingContext, SiteRenderingContext siteContext )
  throws RendererException, FileNotFoundException, 
UnsupportedEncodingException
  {
  SiteRendererSink sink = new SiteRendererSink( renderingContext );
@@ -355,14 +355,14 @@ public class DefaultSiteRenderer
  {
  SiteResourceLoader.setResource( resource );

-Context vc = createVelocityContext( sink, context );
+Context vc = createVelocityContext( sink, siteContext );

  StringWriter sw = new StringWriter();

-velocity.getEngine().mergeTemplate( resource, 
context.getInputEncoding(), vc, sw );
+velocity.getEngine().mergeTemplate( resource, 
siteContext.getInputEncoding(), vc, sw );

  reader = new StringReader( sw.toString() );
-if ( parser.getType() == Parser.XML_TYPE  
context.isValidate() )
+if ( parser.getType() == Parser.XML_TYPE  
siteContext.isValidate() )
  {
  reader = validate( reader, resource );
  }
@@ -385,7 +385,7 @@ public class DefaultSiteRenderer
  {
  case Parser.XML_TYPE:
  reader = ReaderFactory.newXmlReader( doc );
-if ( context.isValidate() )
+if ( siteContext.isValidate() )
  {
  reader = validate( reader, resource );
  }
@@ -394,7 +394,7 @@ public class DefaultSiteRenderer
  case Parser.TXT_TYPE:
  case Parser.UNKNOWN_TYPE:
  default:
-reader = ReaderFactory.newReader( doc, 
context.getInputEncoding() );
+reader = ReaderFactory.newReader( doc, 
siteContext.getInputEncoding() );
  }
  }
  sink.enableLogging( new PlexusLoggerWrapper( getLogger() ) );
@@ -422,7 +422,7 @@ public class DefaultSiteRenderer
  IOUtil.close( reader );
  }

-generateDocument( writer, sink, context );
+generateDocument( writer, sink, siteContext );
  }

  private Context createVelocityContext( SiteRendererSink sink, 
SiteRenderingContext siteRenderingContext )




-
To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org
For additional commands, e-mail: dev-h...@maven.apache.org

Re: Intent to release Doxia and Site Plugin

[Dennis Lundberg]

On 2012-02-26 21:56, Robert Scholte wrote:
 Yes, great idea.
 
 Although, looking at Jenkins[1] we still have some trouble with both
 m-site-p's.
 m-site-p-2.x has trouble with MSITE-507 for all OS.

This one should be fixed with
http://svn.apache.org/viewvc?view=revisionrevision=1294312

Olivier, can you please verify my analysis?

 m-site-p-3.x looks more like an internal Jenkins problem, a rerun might
 already fix it.
 
 -Robert
 
 [1] https://builds.apache.org/view/M-R/view/Maven/
 
 Op Sun, 26 Feb 2012 18:33:48 +0100 schreef Olivier Lamy ol...@apache.org:
 
 Good idea !

 2012/2/26 Dennis Lundberg denn...@apache.org:
 Hi

 I've started planning for a release of Doxia and the Site Plugin. If
 anyone has issues they'd like to fix before this release now is the time
 to do it. Just let me know how much time you need.

 My main driver is to get the fix for MSITE-602 into a release so that we
 can start using it. That will make staging the sites for our releases
 less troublesome.

 Here is the current plan:

 - Release Doxia 1.3  (10 issues fixed)
 - Release Doxia Sitetools 1.3  (6 issues fixed)
 - Release Maven Site Plugin 2.4  (6 issues fixed)
  and retire the 2.x branch after that
 - Release Maven Reporting Exec 1.0.2  (1 issue fixed)
 - Release Maven Site Plugin 3.1  (11 of 17 currently scheduled issues
 fixed)

 Of the 6 open issues for Site Plugin 3.1 I think we should try to fix
 MSITE-610, which is a documentation issue. It's currently assigned to
 Olivier.

 fixed (feel free to fix/improve my frenglish in case of typos :-) )


 I'm fine pushing the rest to a later version.

 -- 
 Dennis Lundberg

 -
 To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org
 For additional commands, e-mail: dev-h...@maven.apache.org



 
 -
 To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org
 For additional commands, e-mail: dev-h...@maven.apache.org
 


-- 
Dennis Lundberg

-
To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org
For additional commands, e-mail: dev-h...@maven.apache.org

Re: svn commit: r1293991 - /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java

[Hervé BOUTEMY]

done
thanks for the report

Hervé

Le lundi 27 février 2012 09:33:11 Lukas Theussl a écrit :
 Salut Herve,
 
 Just a comment: my IDE (netbeans) now shows a javadoc error because the
 {@inheritDoc} doesn't pick up the description of the corresponding
 parameter. Could the parameter name be changed in the interface as well?
 
 -Lukas
 
 hbout...@apache.org wrote:
  Author: hboutemy
  Date: Mon Feb 27 01:34:11 2012
  New Revision: 1293991
  
  URL: http://svn.apache.org/viewvc?rev=1293991view=rev
  Log:
  renamed parameter for better understanding
  
  Modified:
   maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main
   /java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.
   java 
  Modified:
  maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org
  /apache/maven/doxia/siterenderer/DefaultSiteRenderer.java URL:
  http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-si
  te-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSit
  eRenderer.java?rev=1293991r1=1293990r2=1293991view=diff
  ===
  === ---
  maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org
  /apache/maven/doxia/siterenderer/DefaultSiteRenderer.java (original) +++
  maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org
  /apache/maven/doxia/siterenderer/DefaultSiteRenderer.java Mon Feb 27
  01:34:11 2012 @@ -334,7 +334,7 @@ public class DefaultSiteRenderer
  
}

/** {@inheritDoc} */
  
  -public void renderDocument( Writer writer, RenderingContext
  renderingContext, SiteRenderingContext context ) +public void
  renderDocument( Writer writer, RenderingContext renderingContext,
  SiteRenderingContext siteContext ) 
throws RendererException,
FileNotFoundException,
UnsupportedEncodingException   
{

SiteRendererSink sink = new SiteRendererSink(
renderingContext ); 
  @@ -355,14 +355,14 @@ public class DefaultSiteRenderer
  
{

SiteResourceLoader.setResour
ce( resource );
  
  -Context vc = createVelocityContext( sink, context
  );
  +Context vc = createVelocityContext( sink,
  siteContext ); 
StringWriter sw = new
StringWriter();
  
  -velocity.getEngine().mergeTemplate( resource,
  context.getInputEncoding(), vc, sw ); +   
  velocity.getEngine().mergeTemplate( resource,
  siteContext.getInputEncoding(), vc, sw ); 
reader = new StringReader(
sw.toString() );
  
  -if ( parser.getType() == Parser.XML_TYPE 
  context.isValidate() ) +if ( parser.getType() ==
  Parser.XML_TYPE  siteContext.isValidate() ) 
{

reader = validate(
reader, resource );

}
  
  @@ -385,7 +385,7 @@ public class DefaultSiteRenderer
  
{

case Parser.XML_TYPE:
reader =
ReaderFactory.newXm
lReader( doc );
  
  -if ( context.isValidate() )
  +if ( siteContext.isValidate() )
  
{

reader =
validate(
reader,
resource );

}
  
  @@ -394,7 +394,7 @@ public class DefaultSiteRenderer
  
case Parser.TXT_TYPE:
case Parser.UNKNOWN_TYPE:
  
default:
  -reader = ReaderFactory.newReader( doc,
  context.getInputEncoding() ); +reader =
  ReaderFactory.newReader( doc, siteContext.getInputEncoding() ); 
}

}
sink.enableLogging( new PlexusLoggerWrapper(
getLogger() ) ); 
  @@ -422,7 +422,7 @@ public class DefaultSiteRenderer
  
IOUtil.close( reader );

}
  
  -generateDocument( writer, sink, context );
  +generateDocument( writer, sink, siteContext );
  
}

private Context createVelocityContext( SiteRendererSink
sink, SiteRenderingContext siteRenderingContext )
 -
 To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org
 For additional commands, e-mail: 

Re: Intent to release Doxia and Site Plugin

[Hervé BOUTEMY]

anybody interested in adding Markdown to modules map [1]?

Regards,

Hervé

[1] http://maven.apache.org/doxia/doxia/index.html

Le dimanche 26 février 2012 00:47:19 Dennis Lundberg a écrit :
 Hi
 
 I've started planning for a release of Doxia and the Site Plugin. If
 anyone has issues they'd like to fix before this release now is the time
 to do it. Just let me know how much time you need.
 
 My main driver is to get the fix for MSITE-602 into a release so that we
 can start using it. That will make staging the sites for our releases
 less troublesome.
 
 Here is the current plan:
 
 - Release Doxia 1.3  (10 issues fixed)
 - Release Doxia Sitetools 1.3  (6 issues fixed)
 - Release Maven Site Plugin 2.4  (6 issues fixed)
   and retire the 2.x branch after that
 - Release Maven Reporting Exec 1.0.2  (1 issue fixed)
 - Release Maven Site Plugin 3.1  (11 of 17 currently scheduled issues fixed)
 
 Of the 6 open issues for Site Plugin 3.1 I think we should try to fix
 MSITE-610, which is a documentation issue. It's currently assigned to
 Olivier.
 
 I'm fine pushing the rest to a later version.

-
To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org
For additional commands, e-mail: dev-h...@maven.apache.org

Artifact.isSnapshot definition

[Robert Scholte]

A couple of issues of the release-plugin have to do with SNAPSHOTs,  
because it uses its own definition, borrowed from  (an old)  
DefaultArtifact.


However, it seems like there are 2 definitions:
In DefaultArtifact:
public boolean isSnapshot()
{
return getBaseVersion() != null
 ( getBaseVersion().endsWith( SNAPSHOT_VERSION ) ||  
getBaseVersion().equals( LATEST_VERSION ) );

}

In ArtifactUtils:
public static boolean isSnapshot( String version )
{
if ( version != null )
{
if ( version.regionMatches( true, version.length() -  
Artifact.SNAPSHOT_VERSION.length(),
Artifact.SNAPSHOT_VERSION, 0,  
Artifact.SNAPSHOT_VERSION.length() ) )

{
return true;
}
else if ( Artifact.VERSION_FILE_PATTERN.matcher( version  
).matches() )

{
return true;
}
}
return false;
}


It looks to me there should only be one. Do I really have to check both  
definitions or can we merge them somehow?


-Robert

-
To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org
For additional commands, e-mail: dev-h...@maven.apache.org