Return-Path: X-Original-To: apmail-maven-commits-archive@www.apache.org Delivered-To: apmail-maven-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5E17E18F91 for ; Thu, 11 Feb 2016 22:37:15 +0000 (UTC) Received: (qmail 95233 invoked by uid 500); 11 Feb 2016 22:37:15 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 94991 invoked by uid 500); 11 Feb 2016 22:37:15 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 94971 invoked by uid 99); 11 Feb 2016 22:37:14 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Feb 2016 22:37:14 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 227EEC19D5 for ; Thu, 11 Feb 2016 22:37:14 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 2.766 X-Spam-Level: ** X-Spam-Status: No, score=2.766 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, KAM_MANYCOMMENTS=1.2, RP_MATCHES_RCVD=-0.234] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id 6VW4AzQ9-4yf for ; Thu, 11 Feb 2016 22:37:08 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with ESMTP id DD85020D14 for ; Thu, 11 Feb 2016 22:36:55 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id D1AD0E1282 for ; Thu, 11 Feb 2016 22:36:54 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id C081C3A008E for ; Thu, 11 Feb 2016 22:36:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r980165 [10/30] - in /websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST: ./ apidocs/ apidocs/org/apache/maven/doxia/docrenderer/ apidocs/org/apache/maven/doxia/docrenderer/class-use/ apidocs/org/apache/... Date: Thu, 11 Feb 2016 22:36:48 -0000 To: commits@maven.apache.org From: hboutemy@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160211223654.C081C3A008E@svn01-us-west.apache.org> Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.html ============================================================================== --- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.html (original) +++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.html Thu Feb 11 22:36:31 2016 @@ -46,7 +46,7 @@ 38 * 39 * @author <a href="mailto:brett@apache.org">Brett Porter</a> 40 * @author <a href="mailto:henning@apache.org">Henning P. Schmiedehausen</a> -41 * @version $Id: DefaultDecorationModelInheritanceAssembler.java 1728890 2016-02-06 22:26:15Z hboutemy $ +41 * @version $Id: DefaultDecorationModelInheritanceAssembler.java 1729881 2016-02-11 19:33:03Z michaelo $ 42 */ 43 @Component( role = DecorationModelInheritanceAssembler.class ) 44 public class DefaultDecorationModelInheritanceAssembler @@ -219,255 +219,251 @@ 211 pBody = new Body(); 212 } 213 -214 if ( cBody.getHead() == null ) +214 if ( cBody.getHead() == null && pBody.getHead() != null ) 215 { 216 cBody.setHead( pBody.getHead() ); 217 } -218 else -219 { -220 cBody.setHead( Xpp3Dom.mergeXpp3Dom( (Xpp3Dom) cBody.getHead(), (Xpp3Dom) pBody.getHead() ) ); -221 } -222 -223 cBody.setLinks( mergeLinkItemLists( cBody.getLinks(), pBody.getLinks(), urlContainer, false ) ); -224 -225 if ( cBody.getBreadcrumbs().isEmpty() && !pBody.getBreadcrumbs().isEmpty() ) -226 { -227 LinkItem breadcrumb = new LinkItem(); -228 breadcrumb.setName( name ); -229 breadcrumb.setHref( "index.html" ); -230 cBody.getBreadcrumbs().add( breadcrumb ); -231 } -232 cBody.setBreadcrumbs( mergeLinkItemLists( cBody.getBreadcrumbs(), pBody.getBreadcrumbs(), urlContainer, -233 true ) ); -234 -235 cBody.setMenus( mergeMenus( cBody.getMenus(), pBody.getMenus(), urlContainer ) ); -236 -237 if ( cBody.getFooter() == null && pBody.getFooter() != null ) -238 { -239 cBody.setFooter( pBody.getFooter() ); -240 } -241 } -242 } -243 -244 private List<Menu> mergeMenus( final List<Menu> childMenus, final List<Menu> parentMenus, -245 final URLContainer urlContainer ) -246 { -247 List<Menu> menus = new ArrayList<Menu>( childMenus.size() + parentMenus.size() ); -248 -249 for ( Menu menu : childMenus ) -250 { -251 menus.add( menu ); -252 } -253 -254 int topCounter = 0; -255 for ( Menu menu : parentMenus ) -256 { -257 if ( "top".equals( menu.getInherit() ) ) -258 { -259 final Menu clone = menu.clone(); -260 -261 rebaseMenuPaths( clone.getItems(), urlContainer ); -262 -263 menus.add( topCounter, clone ); -264 topCounter++; -265 } -266 else if ( "bottom".equals( menu.getInherit() ) ) -267 { -268 final Menu clone = menu.clone(); -269 -270 rebaseMenuPaths( clone.getItems(), urlContainer ); +218 +219 cBody.setLinks( mergeLinkItemLists( cBody.getLinks(), pBody.getLinks(), urlContainer, false ) ); +220 +221 if ( cBody.getBreadcrumbs().isEmpty() && !pBody.getBreadcrumbs().isEmpty() ) +222 { +223 LinkItem breadcrumb = new LinkItem(); +224 breadcrumb.setName( name ); +225 breadcrumb.setHref( "index.html" ); +226 cBody.getBreadcrumbs().add( breadcrumb ); +227 } +228 cBody.setBreadcrumbs( mergeLinkItemLists( cBody.getBreadcrumbs(), pBody.getBreadcrumbs(), urlContainer, +229 true ) ); +230 +231 cBody.setMenus( mergeMenus( cBody.getMenus(), pBody.getMenus(), urlContainer ) ); +232 +233 if ( cBody.getFooter() == null && pBody.getFooter() != null ) +234 { +235 cBody.setFooter( pBody.getFooter() ); +236 } +237 } +238 } +239 +240 private List<Menu> mergeMenus( final List<Menu> childMenus, final List<Menu> parentMenus, +241 final URLContainer urlContainer ) +242 { +243 List<Menu> menus = new ArrayList<Menu>( childMenus.size() + parentMenus.size() ); +244 +245 for ( Menu menu : childMenus ) +246 { +247 menus.add( menu ); +248 } +249 +250 int topCounter = 0; +251 for ( Menu menu : parentMenus ) +252 { +253 if ( "top".equals( menu.getInherit() ) ) +254 { +255 final Menu clone = menu.clone(); +256 +257 rebaseMenuPaths( clone.getItems(), urlContainer ); +258 +259 menus.add( topCounter, clone ); +260 topCounter++; +261 } +262 else if ( "bottom".equals( menu.getInherit() ) ) +263 { +264 final Menu clone = menu.clone(); +265 +266 rebaseMenuPaths( clone.getItems(), urlContainer ); +267 +268 menus.add( clone ); +269 } +270 } 271 -272 menus.add( clone ); -273 } -274 } -275 -276 return menus; -277 } -278 -279 private void relativizeMenuPaths( final List<MenuItem> items, final String baseUrl ) -280 { -281 for ( MenuItem item : items ) -282 { -283 relativizeLinkItemPaths( item, baseUrl ); -284 relativizeMenuPaths( item.getItems(), baseUrl ); -285 } -286 } -287 -288 private void rebaseMenuPaths( final List<MenuItem> items, final URLContainer urlContainer ) -289 { -290 for ( MenuItem item : items ) -291 { -292 rebaseLinkItemPaths( item, urlContainer ); -293 rebaseMenuPaths( item.getItems(), urlContainer ); -294 } -295 } -296 -297 private void relativizeLinkItemPaths( final LinkItem item, final String baseUrl ) -298 { -299 item.setHref( relativizeLink( item.getHref(), baseUrl ) ); -300 } -301 -302 private void rebaseLinkItemPaths( final LinkItem item, final URLContainer urlContainer ) -303 { -304 item.setHref( urlContainer.rebaseLink( item.getHref() ) ); -305 } -306 -307 private void relativizeLogoPaths( final Logo logo, final String baseUrl ) -308 { -309 logo.setImg( relativizeLink( logo.getImg(), baseUrl ) ); -310 relativizeLinkItemPaths( logo, baseUrl ); -311 } -312 -313 private void rebaseLogoPaths( final Logo logo, final URLContainer urlContainer ) -314 { -315 logo.setImg( urlContainer.rebaseLink( logo.getImg() ) ); -316 rebaseLinkItemPaths( logo, urlContainer ); -317 } -318 -319 private List<LinkItem> mergeLinkItemLists( final List<LinkItem> childList, final List<LinkItem> parentList, -320 final URLContainer urlContainer, boolean cutParentAfterDuplicate ) -321 { -322 List<LinkItem> items = new ArrayList<LinkItem>( childList.size() + parentList.size() ); -323 -324 for ( LinkItem item : parentList ) -325 { -326 if ( !items.contains( item ) && !childList.contains( item ) ) -327 { -328 final LinkItem clone = item.clone(); -329 -330 rebaseLinkItemPaths( clone, urlContainer ); -331 -332 items.add( clone ); -333 } -334 else if ( cutParentAfterDuplicate ) -335 { -336 // if a parent item is found in child, ignore next items (case for breadcrumbs) -337 // merge ( "B > E", "A > B > C > D" ) -> "A > B > E" (notice missing "C > D") -338 // see http://jira.codehaus.org/browse/DOXIASITETOOLS-62 -339 break; -340 } -341 } -342 -343 for ( LinkItem item : childList ) -344 { -345 if ( !items.contains( item ) ) -346 { -347 items.add( item ); -348 } -349 } -350 -351 return items; -352 } -353 -354 private List<Logo> mergePoweredByLists( final List<Logo> childList, final List<Logo> parentList, -355 final URLContainer urlContainer ) -356 { -357 List<Logo> logos = new ArrayList<Logo>( childList.size() + parentList.size() ); -358 -359 for ( Logo logo : parentList ) -360 { -361 if ( !logos.contains( logo ) ) -362 { -363 final Logo clone = logo.clone(); -364 -365 rebaseLogoPaths( clone, urlContainer ); +272 return menus; +273 } +274 +275 private void relativizeMenuPaths( final List<MenuItem> items, final String baseUrl ) +276 { +277 for ( MenuItem item : items ) +278 { +279 relativizeLinkItemPaths( item, baseUrl ); +280 relativizeMenuPaths( item.getItems(), baseUrl ); +281 } +282 } +283 +284 private void rebaseMenuPaths( final List<MenuItem> items, final URLContainer urlContainer ) +285 { +286 for ( MenuItem item : items ) +287 { +288 rebaseLinkItemPaths( item, urlContainer ); +289 rebaseMenuPaths( item.getItems(), urlContainer ); +290 } +291 } +292 +293 private void relativizeLinkItemPaths( final LinkItem item, final String baseUrl ) +294 { +295 item.setHref( relativizeLink( item.getHref(), baseUrl ) ); +296 } +297 +298 private void rebaseLinkItemPaths( final LinkItem item, final URLContainer urlContainer ) +299 { +300 item.setHref( urlContainer.rebaseLink( item.getHref() ) ); +301 } +302 +303 private void relativizeLogoPaths( final Logo logo, final String baseUrl ) +304 { +305 logo.setImg( relativizeLink( logo.getImg(), baseUrl ) ); +306 relativizeLinkItemPaths( logo, baseUrl ); +307 } +308 +309 private void rebaseLogoPaths( final Logo logo, final URLContainer urlContainer ) +310 { +311 logo.setImg( urlContainer.rebaseLink( logo.getImg() ) ); +312 rebaseLinkItemPaths( logo, urlContainer ); +313 } +314 +315 private List<LinkItem> mergeLinkItemLists( final List<LinkItem> childList, final List<LinkItem> parentList, +316 final URLContainer urlContainer, boolean cutParentAfterDuplicate ) +317 { +318 List<LinkItem> items = new ArrayList<LinkItem>( childList.size() + parentList.size() ); +319 +320 for ( LinkItem item : parentList ) +321 { +322 if ( !items.contains( item ) && !childList.contains( item ) ) +323 { +324 final LinkItem clone = item.clone(); +325 +326 rebaseLinkItemPaths( clone, urlContainer ); +327 +328 items.add( clone ); +329 } +330 else if ( cutParentAfterDuplicate ) +331 { +332 // if a parent item is found in child, ignore next items (case for breadcrumbs) +333 // merge ( "B > E", "A > B > C > D" ) -> "A > B > E" (notice missing "C > D") +334 // see http://jira.codehaus.org/browse/DOXIASITETOOLS-62 +335 break; +336 } +337 } +338 +339 for ( LinkItem item : childList ) +340 { +341 if ( !items.contains( item ) ) +342 { +343 items.add( item ); +344 } +345 } +346 +347 return items; +348 } +349 +350 private List<Logo> mergePoweredByLists( final List<Logo> childList, final List<Logo> parentList, +351 final URLContainer urlContainer ) +352 { +353 List<Logo> logos = new ArrayList<Logo>( childList.size() + parentList.size() ); +354 +355 for ( Logo logo : parentList ) +356 { +357 if ( !logos.contains( logo ) ) +358 { +359 final Logo clone = logo.clone(); +360 +361 rebaseLogoPaths( clone, urlContainer ); +362 +363 logos.add( clone ); +364 } +365 } 366 -367 logos.add( clone ); -368 } -369 } -370 -371 for ( Logo logo : childList ) -372 { -373 if ( !logos.contains( logo ) ) -374 { -375 logos.add( logo ); -376 } -377 } -378 -379 return logos; -380 } -381 -382 // relativize only affects absolute links, if the link has the same scheme, host and port -383 // as the base, it is made into a relative link as viewed from the base -384 private String relativizeLink( final String link, final String baseUri ) -385 { -386 if ( link == null || baseUri == null ) -387 { -388 return link; -389 } -390 -391 // this shouldn't be necessary, just to swallow mal-formed hrefs -392 try -393 { -394 final URIPathDescriptor path = new URIPathDescriptor( baseUri, link ); -395 -396 return path.relativizeLink().toString(); +367 for ( Logo logo : childList ) +368 { +369 if ( !logos.contains( logo ) ) +370 { +371 logos.add( logo ); +372 } +373 } +374 +375 return logos; +376 } +377 +378 // relativize only affects absolute links, if the link has the same scheme, host and port +379 // as the base, it is made into a relative link as viewed from the base +380 private String relativizeLink( final String link, final String baseUri ) +381 { +382 if ( link == null || baseUri == null ) +383 { +384 return link; +385 } +386 +387 // this shouldn't be necessary, just to swallow mal-formed hrefs +388 try +389 { +390 final URIPathDescriptor path = new URIPathDescriptor( baseUri, link ); +391 +392 return path.relativizeLink().toString(); +393 } +394 catch ( IllegalArgumentException e ) +395 { +396 return link; 397 } -398 catch ( IllegalArgumentException e ) -399 { -400 return link; -401 } -402 } -403 -404 /** -405 * Contains an old and a new path. -406 */ -407 public final class URLContainer -408 { +398 } +399 +400 /** +401 * Contains an old and a new path. +402 */ +403 public final class URLContainer +404 { +405 +406 private final String oldPath; +407 +408 private final String newPath; 409 -410 private final String oldPath; -411 -412 private final String newPath; -413 -414 /** -415 * Construct a URLContainer. -416 * -417 * @param oldPath the old path. -418 * @param newPath the new path. -419 */ -420 public URLContainer( final String oldPath, final String newPath ) -421 { -422 this.oldPath = oldPath; -423 this.newPath = newPath; -424 } -425 -426 /** -427 * Get the new path. -428 * -429 * @return the new path. -430 */ -431 public String getNewPath() -432 { -433 return this.newPath; -434 } -435 -436 /** -437 * Get the old path. -438 * -439 * @return the old path. -440 */ -441 public String getOldPath() -442 { -443 return this.oldPath; -444 } -445 -446 /** -447 * Rebase only affects relative links, a relative link wrt an old base gets translated, -448 * so it points to the same location as viewed from a new base -449 */ -450 public String rebaseLink( final String link ) -451 { -452 if ( link == null || getOldPath() == null ) -453 { -454 return link; -455 } -456 -457 final URIPathDescriptor oldPath = new URIPathDescriptor( getOldPath(), link ); -458 -459 return oldPath.rebaseLink( getNewPath() ).toString(); -460 } -461 } -462 } +410 /** +411 * Construct a URLContainer. +412 * +413 * @param oldPath the old path. +414 * @param newPath the new path. +415 */ +416 public URLContainer( final String oldPath, final String newPath ) +417 { +418 this.oldPath = oldPath; +419 this.newPath = newPath; +420 } +421 +422 /** +423 * Get the new path. +424 * +425 * @return the new path. +426 */ +427 public String getNewPath() +428 { +429 return this.newPath; +430 } +431 +432 /** +433 * Get the old path. +434 * +435 * @return the old path. +436 */ +437 public String getOldPath() +438 { +439 return this.oldPath; +440 } +441 +442 /** +443 * Rebase only affects relative links, a relative link wrt an old base gets translated, +444 * so it points to the same location as viewed from a new base +445 */ +446 public String rebaseLink( final String link ) +447 { +448 if ( link == null || getOldPath() == null ) +449 { +450 return link; +451 } +452 +453 final URIPathDescriptor oldPath = new URIPathDescriptor( getOldPath(), link ); +454 +455 return oldPath.rebaseLink( getNewPath() ).toString(); +456 } +457 } +458 }
Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/inheritance/package-frame.html ============================================================================== --- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/inheritance/package-frame.html (original) +++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/inheritance/package-frame.html Thu Feb 11 22:36:31 2016 @@ -3,7 +3,7 @@ - Doxia :: Decoration Model 1.7-SNAPSHOT Reference Package org.apache.maven.doxia.site.decoration.inheritance + Doxia :: Decoration Model 1.7 Reference Package org.apache.maven.doxia.site.decoration.inheritance Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/inheritance/package-summary.html ============================================================================== --- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/inheritance/package-summary.html (original) +++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/inheritance/package-summary.html Thu Feb 11 22:36:31 2016 @@ -3,7 +3,7 @@ - Doxia :: Decoration Model 1.7-SNAPSHOT Reference Package org.apache.maven.doxia.site.decoration.inheritance + Doxia :: Decoration Model 1.7 Reference Package org.apache.maven.doxia.site.decoration.inheritance Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/io/xpp3/DecorationXpp3Reader.html ============================================================================== --- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/io/xpp3/DecorationXpp3Reader.html (original) +++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/io/xpp3/DecorationXpp3Reader.html Thu Feb 11 22:36:31 2016 @@ -679,7 +679,7 @@ 671 { 672 if ( checkFieldWithDuplicate( parser, "head", null, parsed ) ) 673 { -674 body.setHead( org.codehaus.plexus.util.xml.Xpp3DomBuilder.build( parser, true ) ); +674 body.setHead( getTrimmedValue( parser.nextText() ) ); 675 } 676 else if ( checkFieldWithDuplicate( parser, "links", null, parsed ) ) 677 { Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/io/xpp3/DecorationXpp3Writer.html ============================================================================== --- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/io/xpp3/DecorationXpp3Writer.html (original) +++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/io/xpp3/DecorationXpp3Writer.html Thu Feb 11 22:36:31 2016 @@ -156,7 +156,7 @@ 148 serializer.startTag( NAMESPACE, tagName ); 149 if ( body.getHead() != null ) 150 { -151 ((Xpp3Dom) body.getHead()).writeToSerializer( NAMESPACE, serializer ); +151 serializer.startTag( NAMESPACE, "head" ).text( body.getHead() ).endTag( NAMESPACE, "head" ); 152 } 153 if ( ( body.getLinks() != null ) && ( body.getLinks().size() > 0 ) ) 154 { Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/io/xpp3/package-frame.html ============================================================================== --- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/io/xpp3/package-frame.html (original) +++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/io/xpp3/package-frame.html Thu Feb 11 22:36:31 2016 @@ -3,7 +3,7 @@ - Doxia :: Decoration Model 1.7-SNAPSHOT Reference Package org.apache.maven.doxia.site.decoration.io.xpp3 + Doxia :: Decoration Model 1.7 Reference Package org.apache.maven.doxia.site.decoration.io.xpp3 Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/io/xpp3/package-summary.html ============================================================================== --- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/io/xpp3/package-summary.html (original) +++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/io/xpp3/package-summary.html Thu Feb 11 22:36:31 2016 @@ -3,7 +3,7 @@ - Doxia :: Decoration Model 1.7-SNAPSHOT Reference Package org.apache.maven.doxia.site.decoration.io.xpp3 + Doxia :: Decoration Model 1.7 Reference Package org.apache.maven.doxia.site.decoration.io.xpp3 Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/package-frame.html ============================================================================== --- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/package-frame.html (original) +++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/package-frame.html Thu Feb 11 22:36:31 2016 @@ -3,7 +3,7 @@ - Doxia :: Decoration Model 1.7-SNAPSHOT Reference Package org.apache.maven.doxia.site.decoration + Doxia :: Decoration Model 1.7 Reference Package org.apache.maven.doxia.site.decoration Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/package-summary.html ============================================================================== --- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/package-summary.html (original) +++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/package-summary.html Thu Feb 11 22:36:31 2016 @@ -3,7 +3,7 @@ - Doxia :: Decoration Model 1.7-SNAPSHOT Reference Package org.apache.maven.doxia.site.decoration + Doxia :: Decoration Model 1.7 Reference Package org.apache.maven.doxia.site.decoration Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/overview-frame.html ============================================================================== --- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/overview-frame.html (original) +++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/overview-frame.html Thu Feb 11 22:36:31 2016 @@ -3,7 +3,7 @@ - Doxia :: Decoration Model 1.7-SNAPSHOT Reference + Doxia :: Decoration Model 1.7 Reference Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/overview-summary.html ============================================================================== --- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/overview-summary.html (original) +++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/overview-summary.html Thu Feb 11 22:36:31 2016 @@ -3,7 +3,7 @@ - Doxia :: Decoration Model 1.7-SNAPSHOT Reference + Doxia :: Decoration Model 1.7 Reference @@ -24,7 +24,7 @@ -

Doxia :: Decoration Model 1.7-SNAPSHOT Reference

+

Doxia :: Decoration Model 1.7 Reference

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xsd/decoration-1.7.0.xsd ============================================================================== --- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xsd/decoration-1.7.0.xsd (original) +++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xsd/decoration-1.7.0.xsd Thu Feb 11 22:36:31 2016 @@ -191,16 +191,11 @@ The main content decoration. - + 1.0.0+ - Additional content (like Javascript) to include in the HEAD block of the generated pages. + Additional content (like JavaScript) to include in the HEAD block of the generated pages. - - - - - Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/allclasses-frame.html ============================================================================== --- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/allclasses-frame.html (original) +++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/allclasses-frame.html Thu Feb 11 22:36:31 2016 @@ -2,8 +2,8 @@ - -All Classes (Doxia :: Document Renderer 1.7-SNAPSHOT API) + +All Classes (Doxia :: Document Renderer 1.7 API) Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/allclasses-noframe.html ============================================================================== --- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/allclasses-noframe.html (original) +++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/allclasses-noframe.html Thu Feb 11 22:36:31 2016 @@ -2,8 +2,8 @@ - -All Classes (Doxia :: Document Renderer 1.7-SNAPSHOT API) + +All Classes (Doxia :: Document Renderer 1.7 API) Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/constant-values.html ============================================================================== --- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/constant-values.html (original) +++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/constant-values.html Thu Feb 11 22:36:31 2016 @@ -2,14 +2,14 @@ - -Constant Field Values (Doxia :: Document Renderer 1.7-SNAPSHOT API) + +Constant Field Values (Doxia :: Document Renderer 1.7 API) Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/deprecated-list.html ============================================================================== --- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/deprecated-list.html (original) +++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/deprecated-list.html Thu Feb 11 22:36:31 2016 @@ -2,14 +2,14 @@ - -Deprecated List (Doxia :: Document Renderer 1.7-SNAPSHOT API) + +Deprecated List (Doxia :: Document Renderer 1.7 API) Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/help-doc.html ============================================================================== --- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/help-doc.html (original) +++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/help-doc.html Thu Feb 11 22:36:31 2016 @@ -2,14 +2,14 @@ - -API Help (Doxia :: Document Renderer 1.7-SNAPSHOT API) + +API Help (Doxia :: Document Renderer 1.7 API) Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/index-all.html ============================================================================== --- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/index-all.html (original) +++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/index-all.html Thu Feb 11 22:36:31 2016 @@ -2,14 +2,14 @@ - -Index (Doxia :: Document Renderer 1.7-SNAPSHOT API) + +Index (Doxia :: Document Renderer 1.7 API) Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/index.html ============================================================================== --- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/index.html (original) +++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/index.html Thu Feb 11 22:36:31 2016 @@ -2,8 +2,8 @@ - -Doxia :: Document Renderer 1.7-SNAPSHOT API + +Doxia :: Document Renderer 1.7 API Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/org/apache/maven/doxia/docrenderer/DocRenderer.html ============================================================================== --- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/org/apache/maven/doxia/docrenderer/DocRenderer.html (original) +++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/org/apache/maven/doxia/docrenderer/DocRenderer.html Thu Feb 11 22:36:31 2016 @@ -2,14 +2,14 @@ - -DocRenderer (Doxia :: Document Renderer 1.7-SNAPSHOT API) + +DocRenderer (Doxia :: Document Renderer 1.7 API) Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/org/apache/maven/doxia/docrenderer/DocumentRenderer.html ============================================================================== --- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/org/apache/maven/doxia/docrenderer/DocumentRenderer.html (original) +++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/org/apache/maven/doxia/docrenderer/DocumentRenderer.html Thu Feb 11 22:36:31 2016 @@ -2,14 +2,14 @@ - -DocumentRenderer (Doxia :: Document Renderer 1.7-SNAPSHOT API) + +DocumentRenderer (Doxia :: Document Renderer 1.7 API) Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/org/apache/maven/doxia/docrenderer/DocumentRendererContext.html ============================================================================== --- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/org/apache/maven/doxia/docrenderer/DocumentRendererContext.html (original) +++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/org/apache/maven/doxia/docrenderer/DocumentRendererContext.html Thu Feb 11 22:36:31 2016 @@ -2,14 +2,14 @@ - -DocumentRendererContext (Doxia :: Document Renderer 1.7-SNAPSHOT API) + +DocumentRendererContext (Doxia :: Document Renderer 1.7 API) Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/org/apache/maven/doxia/docrenderer/DocumentRendererException.html ============================================================================== --- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/org/apache/maven/doxia/docrenderer/DocumentRendererException.html (original) +++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/org/apache/maven/doxia/docrenderer/DocumentRendererException.html Thu Feb 11 22:36:31 2016 @@ -2,14 +2,14 @@ - -DocumentRendererException (Doxia :: Document Renderer 1.7-SNAPSHOT API) + +DocumentRendererException (Doxia :: Document Renderer 1.7 API)