June 2007 - hibernate-commits - Jboss List Archives

Hibernate SVN: r11694 - in trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook: gen and 6 other directories.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2007-06-19 01:44:02 -0400 (Tue, 19 Jun 2007) New Revision: 11694 Removed: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/AbstractDocBookMojo.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/Format.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/GenerationMojo.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/Options.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/ResourceMojo.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/TranslationDiffReport.java Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/AbstractDocBookMojo.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/Format.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/GenerationMojo.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/Options.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/PackageMojo.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/ResourceMojo.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/TranslationDiffReport.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/BasicRenderer.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/Formatting.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/PdfRenderer.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/Renderer.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/RendererFactory.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/RenderingException.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/util/NoOpWriter.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/util/ResourceHelper.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/util/StandardDocBookFormatSpecification.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/util/TransformerType.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/TransformerFactory.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/XSLTException.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/catalog/AbstractCatalogManager.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/catalog/ExplicitCatalogManager.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/catalog/ImplicitCatalogManager.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/BasicUrnResolver.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/CurrentVersionResolver.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/ExplicitUrnResolver.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/RelativeJarUriResolver.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/ResolverChain.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/VersionResolver.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/BaselineHandler.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/ContentItem.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/ContentItemDescriptor.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/Diff.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/DiffCreator.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/GenerationException.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/IndexReportGenerator.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/TranslationHandler.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/TranslationReportGenerator.java Log: moved copyright and license to correct location Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/AbstractDocBookMojo.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/AbstractDocBookMojo.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/AbstractDocBookMojo.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,8 @@ * * Red Hat Author(s): Steve Ebersole */ +package org.jboss.maven.plugin.docbook; + import java.io.File; import java.util.List; import java.util.Set; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/Format.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/Format.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/Format.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,7 @@ * * Red Hat Author(s): Steve Ebersole */ +package org.jboss.maven.plugin.docbook; /** * Represents a user format specification. Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/GenerationMojo.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/GenerationMojo.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/GenerationMojo.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,8 @@ * * Red Hat Author(s): Steve Ebersole */ +package org.jboss.maven.plugin.docbook; + import java.io.File; import org.codehaus.plexus.util.FileUtils; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/Options.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/Options.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/Options.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,8 @@ * * Red Hat Author(s): Steve Ebersole */ +package org.jboss.maven.plugin.docbook; + import java.util.Properties; /** Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/PackageMojo.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/PackageMojo.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/PackageMojo.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,8 @@ * * Red Hat Author(s): Steve Ebersole */ +package org.jboss.maven.plugin.docbook; + import org.jboss.maven.plugin.docbook.gen.render.Formatting; import org.jboss.maven.plugin.docbook.gen.render.RenderingException; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/ResourceMojo.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/ResourceMojo.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/ResourceMojo.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,8 @@ * * Red Hat Author(s): Steve Ebersole */ +package org.jboss.maven.plugin.docbook; + import java.io.File; import java.io.IOException; import java.lang.reflect.Field; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/TranslationDiffReport.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/TranslationDiffReport.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/TranslationDiffReport.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,8 @@ * * Red Hat Author(s): Christian Bauer, Steve Ebersole */ +package org.jboss.maven.plugin.docbook; + import java.io.File; import java.io.IOException; import java.util.ArrayList; Deleted: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/AbstractDocBookMojo.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/AbstractDocBookMojo.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/AbstractDocBookMojo.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,141 +0,0 @@ -package org.jboss.maven.plugin.docbook.gen; - -import java.io.File; -import java.util.List; -import java.util.Set; - -import org.apache.maven.plugin.AbstractMojo; -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.MojoFailureException; -import org.apache.maven.project.MavenProject; -import org.codehaus.plexus.archiver.manager.ArchiverManager; -import org.jboss.maven.plugin.docbook.gen.render.Formatting; -import org.jboss.maven.plugin.docbook.gen.render.RenderingException; -import org.jboss.maven.plugin.docbook.gen.util.StandardDocBookFormatSpecification; -import org.jboss.maven.plugin.docbook.gen.xslt.XSLTException; - -/** - * Basic support for the various DocBook mojos in this package. Mainly, we are - * defining common configuration attributes of the packaging. - * - * @author Steve Ebersole - */ -public abstract class AbstractDocBookMojo extends AbstractMojo { - /** - * INTERNAL : The project being built - * - * @parameter expression="${project}" - * @required - * @readonly - */ - protected MavenProject project; - - /** - * INTERNAL : The artifacts associated with the dependencies defined as part - * of the project to which we are being attached. - * - * @parameter expression="${project.artifacts}" - * @required - * @readonly - */ - protected Set projectArtifacts; - - /** - * INTERNAL : The artifacts associated to the dependencies defined as part - * of our configuration within the project to which we are being attached. - * - * @parameter expression="${plugin.artifacts}" - * @required - * @readonly - */ - protected List pluginArtifacts; - - /** - * INTERNAL : used to get reference to environemtn Archiver/UnArchiver. - * - * @parameter expression="${component.org.codehaus.plexus.archiver.manager.ArchiverManager}" - * @required - * @readonly - */ - protected ArchiverManager archiverManager; - - /** - * The name of the document (relative to sourceDirectory) which is the - * document to be rendered. - * - * @parameter - * @required - */ - protected String sourceDocumentName; - - /** - * The directory where the sources are located. - * - * @parameter expression="${basedir}/src/main/docbook" - */ - protected File sourceDirectory; - - /** - * The directory where the output will be written. - * - * @parameter expression="${basedir}/target/docbook" - */ - protected File targetDirectory; - - /** - * The directory where "docbook resource" staging occurs. Mainly this is - * used for (1) image/css staging for html-based output; (2) base directory - * for value of <tt>img.src.path</tt> DocBook XSLT parameter for fop-based - * formattings. - * - * @parameter expression="${basedir}/target/staging" - * @required - * @readonly - */ - protected File stagingDirectory; - - /** - * The formats in which to perform rendering. - * - * @parameter - * @required - */ - protected Format[] formats; - - /** - * Configurable options - * - * @parameter - */ - protected Options options; - - /** - * The override method to perform the actual processing of the - * mojo. - * - * @param formattings The fomattings configured for render - * @throws RenderingException - * @throws XSLTException - */ - protected abstract void process(Formatting[] formattings) throws RenderingException, XSLTException; - - public final void execute() throws MojoExecutionException, MojoFailureException { - try { - process( buildFormattings() ); - } - catch ( XSLTException e ) { - throw new MojoExecutionException( "XSLT problem", e ); - } - catch ( RenderingException e ) { - throw new MojoExecutionException( "Rendering problem", e ); - } - } - - private Formatting[] buildFormattings() { - Formatting[] formattings = new Formatting[ formats.length ]; - for ( int i = 0; i < formats.length; i++ ) { - formattings[i] = new Formatting( StandardDocBookFormatSpecification.parse( formats[i].getFormatName() ), formats[i] ); - } - return formattings; - } -} Deleted: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/Format.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/Format.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/Format.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,65 +0,0 @@ -package org.jboss.maven.plugin.docbook.gen; - -/** - * Represents a user format specification. - * - * @author Steve Ebersole - */ -public class Format { - private String formatName; - - private String targetFileExtension; - private String finalName; - private String stylesheetResource; - private Boolean imagePathSettingRequired; - private Boolean imageCopyingRequired; - private Boolean doingChunking; - - public Format() { - } - - public Format( - String formatName, - String targetFileExtension, - String finalName, - String stylesheetResource, - Boolean imagePathSettingRequired, - Boolean imageCopyingRequired, - Boolean doingChunking) { - this.formatName = formatName; - this.targetFileExtension = targetFileExtension; - this.finalName = finalName; - this.stylesheetResource = stylesheetResource; - this.imagePathSettingRequired = imagePathSettingRequired; - this.imageCopyingRequired = imageCopyingRequired; - this.doingChunking = doingChunking; - } - - public String getFormatName() { - return formatName; - } - - public String getTargetFileExtension() { - return targetFileExtension; - } - - public String getFinalName() { - return finalName; - } - - public String getStylesheetResource() { - return stylesheetResource; - } - - public Boolean getImagePathSettingRequired() { - return imagePathSettingRequired; - } - - public Boolean getImageCopyingRequired() { - return imageCopyingRequired; - } - - public Boolean getDoingChunking() { - return doingChunking; - } -} Deleted: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/GenerationMojo.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/GenerationMojo.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/GenerationMojo.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,52 +0,0 @@ -package org.jboss.maven.plugin.docbook.gen; - -import java.io.File; - -import org.codehaus.plexus.util.FileUtils; -import org.jboss.maven.plugin.docbook.gen.render.Formatting; -import org.jboss.maven.plugin.docbook.gen.render.RendererFactory; -import org.jboss.maven.plugin.docbook.gen.render.RenderingException; -import org.jboss.maven.plugin.docbook.gen.xslt.XSLTException; - -/** - * A DocBook plugin based on the excellent docbkx-maven-plugin, but which - * specifically handles language translations in a more transparent way. - * - * @goal generate - * @phase compile - * @requiresDependencyResolution - * - * @author Steve Ebersole - */ -public class GenerationMojo extends AbstractDocBookMojo { - - protected void process(Formatting[] formattings) throws XSLTException, RenderingException { - if ( !sourceDirectory.exists() ) { - getLog().info( "sourceDirectory [" + sourceDirectory.getAbsolutePath() + "] did not exist" ); - return; - } - File source = new File( sourceDirectory, sourceDocumentName ); - if ( !source.exists() ) { - getLog().info( "source [" + source.getAbsolutePath() + "] did not exist" ); - return; - } - - if ( !targetDirectory.exists() ) { - FileUtils.mkdir( targetDirectory.getAbsolutePath() ); - } - - RendererFactory rendererFactory = new RendererFactory( - options, - source, - targetDirectory, - stagingDirectory, - project, - getLog() - ); - - for ( int i = 0; i < formattings.length; i++ ) { - rendererFactory.buildRenderer( formattings[i] ).render( source ); - } - } - -} Deleted: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/Options.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/Options.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/Options.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,65 +0,0 @@ -package org.jboss.maven.plugin.docbook.gen; - -import java.util.Properties; - -/** - * A (detachable) representation of the user configuration. - * - * @author Steve Ebersole - */ -public class Options { - private boolean xincludeSupported; - private String[] catalogs; - private String xmlTransformerType; - private Properties transformerParameters; - private boolean useRelativeImageUris = true; - // TODO : try as hard as I possibly can to remove this :( - // this is gettable either from (1) VERSION (fm:project/fm:Version) or - // (2) the dependencies making up the execution classpath - // - // In #1, it would require had parsing :(, and #2 I've yet to actually - // find a wsay to do this... - private String docbookVersion; - - public Options() { - } - - public Options( - boolean xincludeSupported, - String[] catalogs, - String xmlTransformerType, - Properties transformerParameters, - boolean useRelativeImageUris, - String docBookVersion) { - this.xincludeSupported = xincludeSupported; - this.catalogs = catalogs; - this.xmlTransformerType = xmlTransformerType; - this.transformerParameters = transformerParameters; - this.useRelativeImageUris = useRelativeImageUris; - this.docbookVersion = docBookVersion; - } - - public boolean isXincludeSupported() { - return xincludeSupported; - } - - public String[] getCatalogs() { - return catalogs; - } - - public String getXmlTransformerType() { - return xmlTransformerType; - } - - public Properties getTransformerParameters() { - return transformerParameters; - } - - public boolean isUseRelativeImageUris() { - return useRelativeImageUris; - } - - public String getDocbookVersion() { - return docbookVersion; - } -} Deleted: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/ResourceMojo.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/ResourceMojo.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/ResourceMojo.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,119 +0,0 @@ -package org.jboss.maven.plugin.docbook.gen; - -import java.io.File; -import java.io.IOException; -import java.lang.reflect.Field; -import java.util.List; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; - -import org.apache.maven.artifact.Artifact; -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.resources.ResourcesMojo; -import org.codehaus.plexus.archiver.ArchiverException; -import org.codehaus.plexus.archiver.UnArchiver; -import org.codehaus.plexus.archiver.manager.NoSuchArchiverException; -import org.jboss.maven.plugin.docbook.gen.render.Formatting; -import org.jboss.maven.plugin.docbook.gen.render.RenderingException; -import org.jboss.maven.plugin.docbook.gen.xslt.XSLTException; - -/** - * This mojo's purpose within the plugin is to process resources defined - * by various inputs, moving them into a *single* staging directory for use - * during XSLT processing; the DocBook XSLT only allow defining a single - * <tt>img.src.path</tt> value. - * - * @goal resources - * @phase process-resources - * @requiresDependencyResolution - * - * @author Steve Ebersole - */ -public class ResourceMojo extends AbstractDocBookMojo { - - protected void process(Formatting[] formattings) throws RenderingException, XSLTException { - processProjectResources(); - processDependencyResources( collectDocBookResourceDependentArtifacts() ); - } - - private Artifact[] collectDocBookResourceDependentArtifacts() { - List artifacts = new ArrayList(); - addDocBookResourceArtifacts( artifacts, projectArtifacts ); - addDocBookResourceArtifacts( artifacts, pluginArtifacts ); - return ( Artifact[] ) artifacts.toArray( new Artifact[ artifacts.size() ] ); - } - - private void addDocBookResourceArtifacts(Collection target, Collection source) { - Iterator itr = source.iterator(); - while ( itr.hasNext() ) { - final Artifact artifact = ( Artifact ) itr.next(); - if ( "docbook-xslt".equals( artifact.getType() ) || - "docbook-resources".equals( artifact.getType() ) ) { - target.add( artifact ); - } - // temp... - else if ( "docbook-xslt".equals( artifact.getArtifactId() ) ) { - target.add( artifact ); - } - } - } - - private void processProjectResources() throws RenderingException { - ResourcesMojo mavenResourcesMojo = new ResourcesMojo(); - injectMojoValue( mavenResourcesMojo, "outputDirectory", stagingDirectory.getAbsolutePath() ); - injectMojoValue( mavenResourcesMojo, "resources", project.getResources() ); - injectMojoValue( mavenResourcesMojo, "project", project ); - injectMojoValue( mavenResourcesMojo, "filters", project.getBuild().getFilters() ); - mavenResourcesMojo.setLog( getLog() ); - try { - mavenResourcesMojo.execute(); - } - catch ( MojoExecutionException e ) { - throw new RenderingException( "unable to process project resources" ); - } - } - - private void injectMojoValue(ResourcesMojo mavenResourcesMojo, String name, Object value) throws RenderingException { - try { - Field field = ResourcesMojo.class.getDeclaredField( name ); - if ( !field.isAccessible() ) { - field.setAccessible( true ); - } - field.set( mavenResourcesMojo, value ); - } - catch ( NoSuchFieldException e ) { - throw new RenderingException( "unable to locate mojo property field [" + name + "]", e ); - } - catch ( IllegalAccessException e ) { - throw new RenderingException( "unable to access property field to set value", e ); - } - } - - private void processDependencyResources(Artifact[] resources) - throws RenderingException { - for ( int i = 0; i < resources.length; i++ ) { - processDependencyResource( resources[i].getFile(), stagingDirectory ); - } - } - - protected void processDependencyResource(File file, File target) throws RenderingException { - getLog().info( "unpacking dependency resource [" + file.getAbsolutePath() + "] to staging-dir [" + target.getAbsolutePath() + "]" ); - try { - target.mkdirs(); - UnArchiver unArchiver = archiverManager.getUnArchiver( file ); - unArchiver.setSourceFile( file ); - unArchiver.setDestDirectory( target ); - unArchiver.extract(); - } - catch ( NoSuchArchiverException e ) { - throw new RenderingException( "Unknown archiver type", e ); - } - catch ( ArchiverException e ) { - throw new RenderingException( "Error unpacking file [" + file + "] to [" + target + "]", e ); - } - catch ( IOException e ) { - throw new RenderingException( "Error unpacking file [" + file + "] to [" + target + "]", e ); - } - } -} Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/BasicRenderer.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/BasicRenderer.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/BasicRenderer.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook.gen.render; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,8 @@ * * Red Hat Author(s): Steve Ebersole */ +package org.jboss.maven.plugin.docbook.gen.render; + import java.io.File; import java.io.IOException; import java.net.URL; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/Formatting.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/Formatting.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/Formatting.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook.gen.render; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,8 @@ * * Red Hat Author(s): Steve Ebersole */ +package org.jboss.maven.plugin.docbook.gen.render; + import java.io.File; import org.codehaus.plexus.util.FileUtils; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/PdfRenderer.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/PdfRenderer.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/PdfRenderer.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook.gen.render; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,8 @@ * * Red Hat Author(s): Steve Ebersole */ +package org.jboss.maven.plugin.docbook.gen.render; + import java.io.BufferedOutputStream; import java.io.File; import java.io.FileOutputStream; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/Renderer.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/Renderer.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/Renderer.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook.gen.render; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,8 @@ * * Red Hat Author(s): Steve Ebersole */ +package org.jboss.maven.plugin.docbook.gen.render; + import java.io.File; import org.jboss.maven.plugin.docbook.gen.xslt.XSLTException; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/RendererFactory.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/RendererFactory.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/RendererFactory.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook.gen.render; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,8 @@ * * Red Hat Author(s): Steve Ebersole */ +package org.jboss.maven.plugin.docbook.gen.render; + import java.io.File; import org.apache.maven.plugin.logging.Log; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/RenderingException.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/RenderingException.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/RenderingException.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook.gen.render; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,8 @@ * * Red Hat Author(s): Steve Ebersole */ +package org.jboss.maven.plugin.docbook.gen.render; + /** * Indicates issues performing rendering. * Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/util/NoOpWriter.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/util/NoOpWriter.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/util/NoOpWriter.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook.gen.util; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,8 @@ * * Red Hat Author(s): Steve Ebersole */ +package org.jboss.maven.plugin.docbook.gen.util; + import java.io.Writer; /** Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/util/ResourceHelper.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/util/ResourceHelper.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/util/ResourceHelper.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook.gen.util; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,8 @@ * * Red Hat Author(s): Steve Ebersole */ +package org.jboss.maven.plugin.docbook.gen.util; + import java.net.URL; /** Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/util/StandardDocBookFormatSpecification.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/util/StandardDocBookFormatSpecification.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/util/StandardDocBookFormatSpecification.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook.gen.util; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,8 @@ * * Red Hat Author(s): Steve Ebersole */ +package org.jboss.maven.plugin.docbook.gen.util; + /** * The basic definition of the standard docbook formats. * Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/util/TransformerType.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/util/TransformerType.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/util/TransformerType.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook.gen.util; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,8 @@ * * Red Hat Author(s): Steve Ebersole */ +package org.jboss.maven.plugin.docbook.gen.util; + /** * Enumeration of supported XSLT transformers. * Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/TransformerFactory.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/TransformerFactory.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/TransformerFactory.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook.gen.xslt; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,8 @@ * * Red Hat Author(s): Steve Ebersole */ +package org.jboss.maven.plugin.docbook.gen.xslt; + import java.io.IOException; import java.net.URL; import java.util.Iterator; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/XSLTException.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/XSLTException.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/XSLTException.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook.gen.xslt; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,8 @@ * * Red Hat Author(s): Steve Ebersole */ +package org.jboss.maven.plugin.docbook.gen.xslt; + /** * Indicates problems either building XSLT transformers or performing * transformations. Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/catalog/AbstractCatalogManager.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/catalog/AbstractCatalogManager.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/catalog/AbstractCatalogManager.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook.gen.xslt.catalog; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,8 @@ * * Red Hat Author(s): Steve Ebersole */ +package org.jboss.maven.plugin.docbook.gen.xslt.catalog; + import org.apache.xml.resolver.CatalogManager; /** Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/catalog/ExplicitCatalogManager.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/catalog/ExplicitCatalogManager.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/catalog/ExplicitCatalogManager.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook.gen.xslt.catalog; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,7 @@ * * Red Hat Author(s): Steve Ebersole */ +package org.jboss.maven.plugin.docbook.gen.xslt.catalog; /** * Utilizes explicit, user-supplied catalog names to build a Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/catalog/ImplicitCatalogManager.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/catalog/ImplicitCatalogManager.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/catalog/ImplicitCatalogManager.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook.gen.xslt.catalog; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,8 @@ * * Red Hat Author(s): Steve Ebersole */ +package org.jboss.maven.plugin.docbook.gen.xslt.catalog; + import java.util.Enumeration; import java.util.ArrayList; import java.net.URL; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/BasicUrnResolver.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/BasicUrnResolver.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/BasicUrnResolver.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook.gen.xslt.resolve; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,8 @@ * * Red Hat Author(s): Steve Ebersole */ +package org.jboss.maven.plugin.docbook.gen.xslt.resolve; + import javax.xml.transform.URIResolver; import javax.xml.transform.Source; import javax.xml.transform.TransformerException; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/CurrentVersionResolver.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/CurrentVersionResolver.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/CurrentVersionResolver.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook.gen.xslt.resolve; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,8 @@ * * Red Hat Author(s): Steve Ebersole */ +package org.jboss.maven.plugin.docbook.gen.xslt.resolve; + /** * Map hrefs starting with <tt>http://docbook.sourceforge.net/release/xsl/current/</tt> * to classpath resource lookups. Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/ExplicitUrnResolver.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/ExplicitUrnResolver.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/ExplicitUrnResolver.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook.gen.xslt.resolve; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,8 @@ * * Red Hat Author(s): Steve Ebersole */ +package org.jboss.maven.plugin.docbook.gen.xslt.resolve; + import java.net.URL; import java.io.IOException; import javax.xml.transform.Source; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/RelativeJarUriResolver.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/RelativeJarUriResolver.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/RelativeJarUriResolver.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook.gen.xslt.resolve; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,8 @@ * * Red Hat Author(s): Steve Ebersole */ +package org.jboss.maven.plugin.docbook.gen.xslt.resolve; + import java.net.URL; import javax.xml.transform.URIResolver; import javax.xml.transform.Source; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/ResolverChain.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/ResolverChain.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/ResolverChain.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook.gen.xslt.resolve; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,8 @@ * * Red Hat Author(s): Steve Ebersole */ +package org.jboss.maven.plugin.docbook.gen.xslt.resolve; + import java.util.List; import java.util.ArrayList; import java.util.Iterator; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/VersionResolver.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/VersionResolver.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/VersionResolver.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook.gen.xslt.resolve; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,8 @@ * * Red Hat Author(s): Steve Ebersole */ +package org.jboss.maven.plugin.docbook.gen.xslt.resolve; + import java.net.URL; import java.io.IOException; import javax.xml.transform.Source; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/BaselineHandler.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/BaselineHandler.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/BaselineHandler.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook.revdiff; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,8 @@ * * Red Hat Author(s): Christian Bauer, Steve Ebersole */ +package org.jboss.maven.plugin.docbook.revdiff; + import java.util.Map; import org.xml.sax.helpers.DefaultHandler; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/ContentItem.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/ContentItem.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/ContentItem.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook.revdiff; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,8 @@ * * Red Hat Author(s): Christian Bauer */ +package org.jboss.maven.plugin.docbook.revdiff; + /** * Describes a particular piece of content, including descriptors * from both the master and a particular translation Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/ContentItemDescriptor.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/ContentItemDescriptor.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/ContentItemDescriptor.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook.revdiff; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,8 +13,9 @@ * * Red Hat Author(s): Christian Bauer */ +package org.jboss.maven.plugin.docbook.revdiff; + /** - * {@inheritDoc} * * @author Christian Bauer */ Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/Diff.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/Diff.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/Diff.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook.revdiff; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,8 @@ * * Red Hat Author(s): Steve Ebersole */ +package org.jboss.maven.plugin.docbook.revdiff; + import java.util.Set; import java.util.HashSet; import java.util.Iterator; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/DiffCreator.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/DiffCreator.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/DiffCreator.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook.revdiff; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,8 @@ * * Red Hat Author(s): Steve Ebersole */ +package org.jboss.maven.plugin.docbook.revdiff; + import java.io.File; import java.io.IOException; import java.util.HashMap; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/GenerationException.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/GenerationException.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/GenerationException.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook.revdiff; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,8 @@ * * Red Hat Author(s): Steve Ebersole */ +package org.jboss.maven.plugin.docbook.revdiff; + /** * Indicates problems generating the diff report * Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/IndexReportGenerator.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/IndexReportGenerator.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/IndexReportGenerator.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook.revdiff; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,8 @@ * * Red Hat Author(s): Steve Ebersole */ +package org.jboss.maven.plugin.docbook.revdiff; + import java.util.Locale; import java.util.List; import java.util.Iterator; @@ -25,7 +25,6 @@ import org.apache.maven.reporting.MavenReportException; /** - * {@inheritDoc} * * @author Steve Ebersole */ Deleted: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/TranslationDiffReport.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/TranslationDiffReport.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/TranslationDiffReport.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,271 +0,0 @@ -package org.jboss.maven.plugin.docbook.revdiff; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Locale; -import java.util.ResourceBundle; - -import org.apache.maven.doxia.siterenderer.Renderer; -import org.apache.maven.project.MavenProject; -import org.apache.maven.reporting.AbstractMavenReport; -import org.apache.maven.reporting.MavenReportException; -import org.codehaus.plexus.util.DirectoryScanner; - -/** - * A plugin for generating a "translation diff" report across different - * translations of the same document. This is useful for the translators to - * know what changes exist between their translation and the master. - * - * @goal diff - * - * @author Christian Bauer - * @author Steve Ebersole - */ -public class TranslationDiffReport extends AbstractMavenReport { - - public static final String NAME = "translation-diff-report"; - - /** - * The directory containing the translated DocBook sources. - * - * @parameter expression="${basedir}/src/main/docbook/translations" - * @required - */ - private File translationsDirectory; - - /** - * Directory where reports will go. - * - * @parameter expression="${project.reporting.outputDirectory}" - * @required - * @readonly - */ - private File reportingDirectory; - - /** - * Which translation is considered the master. - * - * @parameter default-value="en" - */ - private String masterTranslation; - - /** - * (non master) translations to be included in the report. - * - * @parameter - */ - private String[] translationIncludes; - - /** - * Patternsets of sources (relative to translationsDirectory) to include - * in reporting. - * - * @parameter - */ - private String[] sourceIncludes; - - /** - * A boolean, indicating if XInclude should be supported. - * - * @parameter default-value="false" - */ - private boolean xincludeSupported; - - /** - * Whether to build an aggregated report at the root, or build individual reports. - * - * @parameter expression="${aggregate}" default-value="false" - */ - protected boolean aggregate; - - /** - * @parameter expression="${project}" - * @required - * @readonly - */ - private MavenProject project; - - private File reportOutputDirectory; - - /** - * @parameter expression="${component.org.apache.maven.doxia.siterenderer.Renderer}" - * @required - * @readonly - */ - private Renderer siteRenderer; - - protected Renderer getSiteRenderer() { - return siteRenderer; - } - - protected MavenProject getProject() { - return project; - } - - public String getCategoryName() { - return CATEGORY_PROJECT_REPORTS; - } - - protected String getOutputDirectory() { - return getReportOutputDirectory().getAbsolutePath(); - } - - public String getOutputName() { - return "index"; - } - - public String getName(Locale locale) { - return getBundle( locale ).getString( "report.name" ); - } - - public String getDescription(Locale locale) { - return getBundle( locale ).getString( "report.description" ); - } - - private ResourceBundle getBundle(Locale locale) { - return ResourceBundle.getBundle( NAME, locale, this.getClass().getClassLoader() ); - } - - public void setReportOutputDirectory(File dir) { - if ( NAME.equals( dir.getName() ) ) { - this.reportOutputDirectory = dir; - } - else { - this.reportOutputDirectory = new File( dir, NAME ); - } - } - - public File getReportOutputDirectory() { - if ( reportOutputDirectory == null ) { - reportOutputDirectory = new File( reportingDirectory, NAME ); - } - return reportOutputDirectory; - } - - public boolean isExternalReport() { - return false; - } - - public boolean canGenerateReport() { - return true; - } - - protected void executeReport(Locale locale) throws MavenReportException { - getLog().debug( "starting docbook:diff goal execution [masterTranslation=" + masterTranslation + "]" ); - - if ( ! translationsDirectory.exists() ) { - getLog().debug( "translations directory [" + translationsDirectory.getAbsolutePath() + "] did not exist" ); - return; - } - - File masterTranslationDirectory = new File( translationsDirectory, masterTranslation ); - if ( ! masterTranslationDirectory.exists() ) { - getLog().info( "master translation directory [" + masterTranslationDirectory.getAbsolutePath() + "] did not exist" ); - return; - } - - if ( translationIncludes == null || translationIncludes.length == 0 ) { - // use all translations... - ArrayList includes = new ArrayList(); - File[] subdirs = translationsDirectory.listFiles(); - for ( int i = 0; i < subdirs.length; i++ ) { - includes.add( subdirs[i].getName() ); - } - translationIncludes = ( String[] ) includes.toArray( new String[ includes.size() ] ); - } - - if ( sourceIncludes == null || sourceIncludes.length == 0 ) { - sourceIncludes = new String[] { "*.xml" }; - } - - List reports = new ArrayList(); - for ( int i = 0; i < translationIncludes.length; i++ ) { - if ( masterTranslation.equals( translationIncludes[i] ) ) { - continue; - } - final File translationDirectory = new File( translationsDirectory, translationIncludes[i] ); - if ( ! translationDirectory.exists() ) { - getLog().info( "translation directory [" + translationDirectory.getAbsolutePath() + "] did not exist" ); - continue; - } - - if ( generateTranslationReport( masterTranslationDirectory, translationDirectory, translationIncludes[i] ) ) { - reports.add( - new IndexReportGenerator.TranslationReportDescriptor( - new Locale( translationIncludes[i] ), - NAME + "/" + buildTranslationReportName( translationIncludes[i] ) - ) - ); - } - } - - new IndexReportGenerator( getBundle( locale ), getSink(), getLog() ).generate( reports ); - } - - private void prepReportFile(File reportFile) throws MavenReportException { - if ( reportFile.exists() ) { - reportFile.delete(); - } - if ( !reportFile.exists() ) { - try { - reportFile.createNewFile(); - } - catch ( IOException e ) { - throw new MavenReportException( "unable to prep report file [" + reportFile.getAbsolutePath() + "]" ); - } - } - } - - private String buildTranslationReportName(String translationName) { - return "report-" + translationName + ".html"; - } - - private boolean generateTranslationReport( - File masterTranslationDirectory, - File translationDirectory, - String translationName) throws MavenReportException { - getLog().debug( "starting docbook:diff processing [translation=" + translationName + "]" ); - - DirectoryScanner scanner = new DirectoryScanner(); - scanner.setBasedir( masterTranslationDirectory ); - scanner.setIncludes( sourceIncludes ); - scanner.scan(); - String[] masterSources = scanner.getIncludedFiles(); - - scanner = new DirectoryScanner(); - scanner.setBasedir( translationDirectory ); - scanner.setIncludes( sourceIncludes ); - scanner.scan(); - String[] translationSources = scanner.getIncludedFiles(); - - if ( ! Arrays.equals( masterSources, translationSources ) ) { - getLog().warn( "includes returned different master and translation sets" ); - return false; - } - - Locale locale = new Locale( translationName ); - File output = new File( getReportOutputDirectory(), buildTranslationReportName( translationName ) ); - prepReportFile( output ); - - try { - DiffCreator diffCreator = new DiffCreator( xincludeSupported, getLog() ); - TranslationReportGenerator generator = new TranslationReportGenerator( translationsDirectory, getBundle( locale ), getLog() ); - - for ( int i = 0; i < masterSources.length; i++ ) { - getLog().debug( "processing source [" + masterSources[i] + "]" ); - final File master = new File( masterTranslationDirectory, masterSources[i] ); - final File translation = new File( translationDirectory, translationSources[i] ); - final Diff diff = diffCreator.findDiff( master, translation ); - generator.generate( diff, output, locale.toString() ); - } - } - catch ( GenerationException e ) { - throw new MavenReportException( "unable to generate report", e ); - } - return true; - } - -} Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/TranslationHandler.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/TranslationHandler.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/TranslationHandler.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook.revdiff; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,8 @@ * * Red Hat Author(s): Christian Bauer, Steve Ebersole */ +package org.jboss.maven.plugin.docbook.revdiff; + import java.util.Map; import java.util.Iterator; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/TranslationReportGenerator.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/TranslationReportGenerator.java 2007-06-19 05:34:40 UTC (rev 11693) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/TranslationReportGenerator.java 2007-06-19 05:44:02 UTC (rev 11694) @@ -1,5 +1,3 @@ -package org.jboss.maven.plugin.docbook.revdiff; - /* * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. * @@ -15,6 +13,8 @@ * * Red Hat Author(s): Christian Bauer, Steve Ebersole */ +package org.jboss.maven.plugin.docbook.revdiff; + import java.io.File; import java.io.FileWriter; import java.io.IOException;

18 years, 4 months

1
0
0 / 0

Hibernate SVN: r11693 - trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2007-06-19 01:34:40 -0400 (Tue, 19 Jun 2007) New Revision: 11693 Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/pom.xml Log: fix fop; applied copyright and license Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/pom.xml =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/pom.xml 2007-06-19 05:31:59 UTC (rev 11692) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/pom.xml 2007-06-19 05:34:40 UTC (rev 11693) @@ -100,19 +100,13 @@ <artifactId>saxon</artifactId> <version>6.5.3</version> </dependency> - + +  <dependency> <groupId>fop</groupId> <artifactId>fop</artifactId> <version>0.20.5</version> </dependency> - <dependency> <groupId>batik</groupId>

18 years, 4 months

1
0
0 / 0

Hibernate SVN: r11692 - in trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main: java/org/jboss/maven/plugin/docbook/gen/render and 6 other directories.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2007-06-19 01:31:59 -0400 (Tue, 19 Jun 2007) New Revision: 11692 Added: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/AbstractDocBookMojo.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/Format.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/GenerationMojo.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/Options.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/PackageMojo.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/ResourceMojo.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/TranslationDiffReport.java Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/BasicRenderer.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/Formatting.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/PdfRenderer.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/Renderer.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/RendererFactory.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/RenderingException.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/util/NoOpWriter.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/util/ResourceHelper.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/util/StandardDocBookFormatSpecification.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/util/TransformerType.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/TransformerFactory.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/XSLTException.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/catalog/AbstractCatalogManager.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/catalog/ExplicitCatalogManager.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/catalog/ImplicitCatalogManager.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/BasicUrnResolver.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/CurrentVersionResolver.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/ExplicitUrnResolver.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/RelativeJarUriResolver.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/ResolverChain.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/VersionResolver.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/BaselineHandler.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/ContentItem.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/ContentItemDescriptor.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/Diff.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/DiffCreator.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/GenerationException.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/IndexReportGenerator.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/TranslationHandler.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/TranslationReportGenerator.java trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/resources/META-INF/plexus/components.xml Log: fix fop; applied copyright and license Copied: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/AbstractDocBookMojo.java (from rev 11686, trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/AbstractDocBookMojo.java) =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/AbstractDocBookMojo.java (rev 0) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/AbstractDocBookMojo.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -0,0 +1,156 @@ +package org.jboss.maven.plugin.docbook; + +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Steve Ebersole + */ +import java.io.File; +import java.util.List; +import java.util.Set; + +import org.apache.maven.plugin.AbstractMojo; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.project.MavenProject; +import org.codehaus.plexus.archiver.manager.ArchiverManager; +import org.jboss.maven.plugin.docbook.gen.render.Formatting; +import org.jboss.maven.plugin.docbook.gen.render.RenderingException; +import org.jboss.maven.plugin.docbook.gen.util.StandardDocBookFormatSpecification; +import org.jboss.maven.plugin.docbook.gen.xslt.XSLTException; + +/** + * Basic support for the various DocBook mojos in this package. Mainly, we are + * defining common configuration attributes of the packaging. + * + * @author Steve Ebersole + */ +public abstract class AbstractDocBookMojo extends AbstractMojo { + /** + * INTERNAL : The project being built + * + * @parameter expression="${project}" + * @required + * @readonly + */ + protected MavenProject project; + + /** + * INTERNAL : The artifacts associated with the dependencies defined as part + * of the project to which we are being attached. + * + * @parameter expression="${project.artifacts}" + * @required + * @readonly + */ + protected Set projectArtifacts; + + /** + * INTERNAL : The artifacts associated to the dependencies defined as part + * of our configuration within the project to which we are being attached. + * + * @parameter expression="${plugin.artifacts}" + * @required + * @readonly + */ + protected List pluginArtifacts; + + /** + * INTERNAL : used to get reference to environemtn Archiver/UnArchiver. + * + * @parameter expression="${component.org.codehaus.plexus.archiver.manager.ArchiverManager}" + * @required + * @readonly + */ + protected ArchiverManager archiverManager; + + /** + * The name of the document (relative to sourceDirectory) which is the + * document to be rendered. + * + * @parameter + * @required + */ + protected String sourceDocumentName; + + /** + * The directory where the sources are located. + * + * @parameter expression="${basedir}/src/main/docbook" + */ + protected File sourceDirectory; + + /** + * The directory where the output will be written. + * + * @parameter expression="${basedir}/target/docbook" + */ + protected File targetDirectory; + + /** + * The directory where "docbook resource" staging occurs. Mainly this is + * used for (1) image/css staging for html-based output; (2) base directory + * for value of <tt>img.src.path</tt> DocBook XSLT parameter for fop-based + * formattings. + * + * @parameter expression="${basedir}/target/staging" + * @required + * @readonly + */ + protected File stagingDirectory; + + /** + * The formats in which to perform rendering. + * + * @parameter + * @required + */ + protected Format[] formats; + + /** + * Configurable options + * + * @parameter + */ + protected Options options; + + /** + * The override method to perform the actual processing of the + * mojo. + * + * @param formattings The fomattings configured for render + * @throws RenderingException + * @throws XSLTException + */ + protected abstract void process(Formatting[] formattings) throws RenderingException, XSLTException; + + public final void execute() throws MojoExecutionException, MojoFailureException { + try { + process( buildFormattings() ); + } + catch ( XSLTException e ) { + throw new MojoExecutionException( "XSLT problem", e ); + } + catch ( RenderingException e ) { + throw new MojoExecutionException( "Rendering problem", e ); + } + } + + private Formatting[] buildFormattings() { + Formatting[] formattings = new Formatting[ formats.length ]; + for ( int i = 0; i < formats.length; i++ ) { + formattings[i] = new Formatting( StandardDocBookFormatSpecification.parse( formats[i].getFormatName() ), formats[i] ); + } + return formattings; + } +} Copied: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/Format.java (from rev 11686, trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/Format.java) =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/Format.java (rev 0) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/Format.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -0,0 +1,81 @@ +package org.jboss.maven.plugin.docbook; + +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Steve Ebersole + */ + +/** + * Represents a user format specification. + * + * @author Steve Ebersole + */ +public class Format { + private String formatName; + + private String targetFileExtension; + private String finalName; + private String stylesheetResource; + private Boolean imagePathSettingRequired; + private Boolean imageCopyingRequired; + private Boolean doingChunking; + + public Format() { + } + + public Format( + String formatName, + String targetFileExtension, + String finalName, + String stylesheetResource, + Boolean imagePathSettingRequired, + Boolean imageCopyingRequired, + Boolean doingChunking) { + this.formatName = formatName; + this.targetFileExtension = targetFileExtension; + this.finalName = finalName; + this.stylesheetResource = stylesheetResource; + this.imagePathSettingRequired = imagePathSettingRequired; + this.imageCopyingRequired = imageCopyingRequired; + this.doingChunking = doingChunking; + } + + public String getFormatName() { + return formatName; + } + + public String getTargetFileExtension() { + return targetFileExtension; + } + + public String getFinalName() { + return finalName; + } + + public String getStylesheetResource() { + return stylesheetResource; + } + + public Boolean getImagePathSettingRequired() { + return imagePathSettingRequired; + } + + public Boolean getImageCopyingRequired() { + return imageCopyingRequired; + } + + public Boolean getDoingChunking() { + return doingChunking; + } +} Copied: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/GenerationMojo.java (from rev 11686, trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/GenerationMojo.java) =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/GenerationMojo.java (rev 0) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/GenerationMojo.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -0,0 +1,67 @@ +package org.jboss.maven.plugin.docbook; + +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Steve Ebersole + */ +import java.io.File; + +import org.codehaus.plexus.util.FileUtils; +import org.jboss.maven.plugin.docbook.gen.render.Formatting; +import org.jboss.maven.plugin.docbook.gen.render.RendererFactory; +import org.jboss.maven.plugin.docbook.gen.render.RenderingException; +import org.jboss.maven.plugin.docbook.gen.xslt.XSLTException; + +/** + * A DocBook plugin based on the excellent docbkx-maven-plugin, but which + * specifically handles language translations in a more transparent way. + * + * @goal generate + * @phase compile + * @requiresDependencyResolution + * + * @author Steve Ebersole + */ +public class GenerationMojo extends AbstractDocBookMojo { + + protected void process(Formatting[] formattings) throws XSLTException, RenderingException { + if ( !sourceDirectory.exists() ) { + getLog().info( "sourceDirectory [" + sourceDirectory.getAbsolutePath() + "] did not exist" ); + return; + } + File source = new File( sourceDirectory, sourceDocumentName ); + if ( !source.exists() ) { + getLog().info( "source [" + source.getAbsolutePath() + "] did not exist" ); + return; + } + + if ( !targetDirectory.exists() ) { + FileUtils.mkdir( targetDirectory.getAbsolutePath() ); + } + + RendererFactory rendererFactory = new RendererFactory( + options, + source, + targetDirectory, + stagingDirectory, + project, + getLog() + ); + + for ( int i = 0; i < formattings.length; i++ ) { + rendererFactory.buildRenderer( formattings[i] ).render( source ); + } + } + +} Copied: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/Options.java (from rev 11686, trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/Options.java) =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/Options.java (rev 0) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/Options.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -0,0 +1,80 @@ +package org.jboss.maven.plugin.docbook; + +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Steve Ebersole + */ +import java.util.Properties; + +/** + * A (detachable) representation of the user configuration. + * + * @author Steve Ebersole + */ +public class Options { + private boolean xincludeSupported; + private String[] catalogs; + private String xmlTransformerType; + private Properties transformerParameters; + private boolean useRelativeImageUris = true; + // TODO : try as hard as I possibly can to remove this :( + // this is gettable either from (1) VERSION (fm:project/fm:Version) or + // (2) the dependencies making up the execution classpath + // + // In #1, it would require hand parsing :(, and #2 I've yet to actually + // find a wsay to do this... + private String docbookVersion; + + public Options() { + } + + public Options( + boolean xincludeSupported, + String[] catalogs, + String xmlTransformerType, + Properties transformerParameters, + boolean useRelativeImageUris, + String docBookVersion) { + this.xincludeSupported = xincludeSupported; + this.catalogs = catalogs; + this.xmlTransformerType = xmlTransformerType; + this.transformerParameters = transformerParameters; + this.useRelativeImageUris = useRelativeImageUris; + this.docbookVersion = docBookVersion; + } + + public boolean isXincludeSupported() { + return xincludeSupported; + } + + public String[] getCatalogs() { + return catalogs; + } + + public String getXmlTransformerType() { + return xmlTransformerType; + } + + public Properties getTransformerParameters() { + return transformerParameters; + } + + public boolean isUseRelativeImageUris() { + return useRelativeImageUris; + } + + public String getDocbookVersion() { + return docbookVersion; + } +} Added: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/PackageMojo.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/PackageMojo.java (rev 0) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/PackageMojo.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -0,0 +1,37 @@ +package org.jboss.maven.plugin.docbook; + +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Steve Ebersole + */ +import org.jboss.maven.plugin.docbook.gen.render.Formatting; +import org.jboss.maven.plugin.docbook.gen.render.RenderingException; + +/** + * This mojo's purpose within the plugin/packaging is to bundle the individual + * formats into deployable bundles. Note that some formats (PDF, e.g.) are + * already in a deployable bundle. + * <p/> + * After bundling, each bundle is then attached to the project + * + * @goal bundle + * @phase package + * @requiresDependencyResolution + * + * @author Steve Ebersole + */ +public class PackageMojo extends AbstractDocBookMojo { + protected void process(Formatting[] formattings) throws RenderingException { + } +} Copied: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/ResourceMojo.java (from rev 11686, trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/ResourceMojo.java) =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/ResourceMojo.java (rev 0) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/ResourceMojo.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -0,0 +1,134 @@ +package org.jboss.maven.plugin.docbook; + +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Steve Ebersole + */ +import java.io.File; +import java.io.IOException; +import java.lang.reflect.Field; +import java.util.List; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; + +import org.apache.maven.artifact.Artifact; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.resources.ResourcesMojo; +import org.codehaus.plexus.archiver.ArchiverException; +import org.codehaus.plexus.archiver.UnArchiver; +import org.codehaus.plexus.archiver.manager.NoSuchArchiverException; +import org.jboss.maven.plugin.docbook.gen.render.Formatting; +import org.jboss.maven.plugin.docbook.gen.render.RenderingException; +import org.jboss.maven.plugin.docbook.gen.xslt.XSLTException; + +/** + * This mojo's purpose within the plugin/packaging is to process resources + * defined by various inputs, moving them into a *single* staging directory for + * use during XSLT processing; the DocBook XSLT only allow defining a single + * <tt>img.src.path</tt> value. + * + * @goal resources + * @phase process-resources + * @requiresDependencyResolution + * + * @author Steve Ebersole + */ +public class ResourceMojo extends AbstractDocBookMojo { + + protected void process(Formatting[] formattings) throws RenderingException, XSLTException { + processProjectResources(); + processDependencyResources( collectDocBookResourceDependentArtifacts() ); + } + + private Artifact[] collectDocBookResourceDependentArtifacts() { + List artifacts = new ArrayList(); + addDocBookResourceArtifacts( artifacts, projectArtifacts ); + addDocBookResourceArtifacts( artifacts, pluginArtifacts ); + return ( Artifact[] ) artifacts.toArray( new Artifact[ artifacts.size() ] ); + } + + private void addDocBookResourceArtifacts(Collection target, Collection source) { + Iterator itr = source.iterator(); + while ( itr.hasNext() ) { + final Artifact artifact = ( Artifact ) itr.next(); + if ( "docbook-xslt".equals( artifact.getType() ) || + "docbook-resources".equals( artifact.getType() ) ) { + target.add( artifact ); + } + // temp... + else if ( "docbook-xslt".equals( artifact.getArtifactId() ) ) { + target.add( artifact ); + } + } + } + + private void processProjectResources() throws RenderingException { + ResourcesMojo mavenResourcesMojo = new ResourcesMojo(); + injectMojoValue( mavenResourcesMojo, "outputDirectory", stagingDirectory.getAbsolutePath() ); + injectMojoValue( mavenResourcesMojo, "resources", project.getResources() ); + injectMojoValue( mavenResourcesMojo, "project", project ); + injectMojoValue( mavenResourcesMojo, "filters", project.getBuild().getFilters() ); + mavenResourcesMojo.setLog( getLog() ); + try { + mavenResourcesMojo.execute(); + } + catch ( MojoExecutionException e ) { + throw new RenderingException( "unable to process project resources" ); + } + } + + private void injectMojoValue(ResourcesMojo mavenResourcesMojo, String name, Object value) throws RenderingException { + try { + Field field = ResourcesMojo.class.getDeclaredField( name ); + if ( !field.isAccessible() ) { + field.setAccessible( true ); + } + field.set( mavenResourcesMojo, value ); + } + catch ( NoSuchFieldException e ) { + throw new RenderingException( "unable to locate mojo property field [" + name + "]", e ); + } + catch ( IllegalAccessException e ) { + throw new RenderingException( "unable to access property field to set value", e ); + } + } + + private void processDependencyResources(Artifact[] resources) + throws RenderingException { + for ( int i = 0; i < resources.length; i++ ) { + processDependencyResource( resources[i].getFile(), stagingDirectory ); + } + } + + protected void processDependencyResource(File file, File target) throws RenderingException { + getLog().info( "unpacking dependency resource [" + file.getAbsolutePath() + "] to staging-dir [" + target.getAbsolutePath() + "]" ); + try { + target.mkdirs(); + UnArchiver unArchiver = archiverManager.getUnArchiver( file ); + unArchiver.setSourceFile( file ); + unArchiver.setDestDirectory( target ); + unArchiver.extract(); + } + catch ( NoSuchArchiverException e ) { + throw new RenderingException( "Unknown archiver type", e ); + } + catch ( ArchiverException e ) { + throw new RenderingException( "Error unpacking file [" + file + "] to [" + target + "]", e ); + } + catch ( IOException e ) { + throw new RenderingException( "Error unpacking file [" + file + "] to [" + target + "]", e ); + } + } +} Copied: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/TranslationDiffReport.java (from rev 11686, trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/TranslationDiffReport.java) =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/TranslationDiffReport.java (rev 0) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/TranslationDiffReport.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -0,0 +1,296 @@ +package org.jboss.maven.plugin.docbook; + +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Christian Bauer, Steve Ebersole + */ +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Locale; +import java.util.ResourceBundle; + +import org.apache.maven.doxia.siterenderer.Renderer; +import org.apache.maven.project.MavenProject; +import org.apache.maven.reporting.AbstractMavenReport; +import org.apache.maven.reporting.MavenReportException; +import org.codehaus.plexus.util.DirectoryScanner; +import org.jboss.maven.plugin.docbook.revdiff.IndexReportGenerator; +import org.jboss.maven.plugin.docbook.revdiff.DiffCreator; +import org.jboss.maven.plugin.docbook.revdiff.TranslationReportGenerator; +import org.jboss.maven.plugin.docbook.revdiff.Diff; +import org.jboss.maven.plugin.docbook.revdiff.GenerationException; + +/** + * A plugin for generating a "translation diff" report across different + * translations of the same document. This is useful for the translators to + * know what changes exist between their translation and the master. + * <p/> + * Eventually, there is a possibility this will not be needed as we move + * forward if it is decided to move to the xliff format for translations. + * + * @goal diff + * + * @author Christian Bauer + * @author Steve Ebersole + */ +public class TranslationDiffReport extends AbstractMavenReport { + + // todo : this is currently hosed; it has not been updated for the new packaging-based scheme... + + public static final String NAME = "translation-diff-report"; + + /** + * The directory containing the translated DocBook sources. + * + * @parameter expression="${basedir}/src/main/docbook/translations" + * @required + */ + private File translationsDirectory; + + /** + * Directory where reports will go. + * + * @parameter expression="${project.reporting.outputDirectory}" + * @required + * @readonly + */ + private File reportingDirectory; + + /** + * Which translation is considered the master. + * + * @parameter default-value="en" + */ + private String masterTranslation; + + /** + * (non master) translations to be included in the report. + * + * @parameter + */ + private String[] translationIncludes; + + /** + * Patternsets of sources (relative to translationsDirectory) to include + * in reporting. + * + * @parameter + */ + private String[] sourceIncludes; + + /** + * A boolean, indicating if XInclude should be supported. + * + * @parameter default-value="false" + */ + private boolean xincludeSupported; + + /** + * Whether to build an aggregated report at the root, or build individual reports. + * + * @parameter expression="${aggregate}" default-value="false" + */ + protected boolean aggregate; + + /** + * @parameter expression="${project}" + * @required + * @readonly + */ + private MavenProject project; + + private File reportOutputDirectory; + + /** + * @parameter expression="${component.org.apache.maven.doxia.siterenderer.Renderer}" + * @required + * @readonly + */ + private Renderer siteRenderer; + + protected Renderer getSiteRenderer() { + return siteRenderer; + } + + protected MavenProject getProject() { + return project; + } + + public String getCategoryName() { + return CATEGORY_PROJECT_REPORTS; + } + + protected String getOutputDirectory() { + return getReportOutputDirectory().getAbsolutePath(); + } + + public String getOutputName() { + return "index"; + } + + public String getName(Locale locale) { + return getBundle( locale ).getString( "report.name" ); + } + + public String getDescription(Locale locale) { + return getBundle( locale ).getString( "report.description" ); + } + + private ResourceBundle getBundle(Locale locale) { + return ResourceBundle.getBundle( NAME, locale, this.getClass().getClassLoader() ); + } + + public void setReportOutputDirectory(File dir) { + if ( NAME.equals( dir.getName() ) ) { + this.reportOutputDirectory = dir; + } + else { + this.reportOutputDirectory = new File( dir, NAME ); + } + } + + public File getReportOutputDirectory() { + if ( reportOutputDirectory == null ) { + reportOutputDirectory = new File( reportingDirectory, NAME ); + } + return reportOutputDirectory; + } + + public boolean isExternalReport() { + return false; + } + + public boolean canGenerateReport() { + return true; + } + + protected void executeReport(Locale locale) throws MavenReportException { + getLog().debug( "starting docbook:diff goal execution [masterTranslation=" + masterTranslation + "]" ); + + if ( ! translationsDirectory.exists() ) { + getLog().debug( "translations directory [" + translationsDirectory.getAbsolutePath() + "] did not exist" ); + return; + } + + File masterTranslationDirectory = new File( translationsDirectory, masterTranslation ); + if ( ! masterTranslationDirectory.exists() ) { + getLog().info( "master translation directory [" + masterTranslationDirectory.getAbsolutePath() + "] did not exist" ); + return; + } + + if ( translationIncludes == null || translationIncludes.length == 0 ) { + // use all translations... + ArrayList includes = new ArrayList(); + File[] subdirs = translationsDirectory.listFiles(); + for ( int i = 0; i < subdirs.length; i++ ) { + includes.add( subdirs[i].getName() ); + } + translationIncludes = ( String[] ) includes.toArray( new String[ includes.size() ] ); + } + + if ( sourceIncludes == null || sourceIncludes.length == 0 ) { + sourceIncludes = new String[] { "*.xml" }; + } + + List reports = new ArrayList(); + for ( int i = 0; i < translationIncludes.length; i++ ) { + if ( masterTranslation.equals( translationIncludes[i] ) ) { + continue; + } + final File translationDirectory = new File( translationsDirectory, translationIncludes[i] ); + if ( ! translationDirectory.exists() ) { + getLog().info( "translation directory [" + translationDirectory.getAbsolutePath() + "] did not exist" ); + continue; + } + + if ( generateTranslationReport( masterTranslationDirectory, translationDirectory, translationIncludes[i] ) ) { + reports.add( + new IndexReportGenerator.TranslationReportDescriptor( + new Locale( translationIncludes[i] ), + NAME + "/" + buildTranslationReportName( translationIncludes[i] ) + ) + ); + } + } + + new IndexReportGenerator( getBundle( locale ), getSink(), getLog() ).generate( reports ); + } + + private void prepReportFile(File reportFile) throws MavenReportException { + if ( reportFile.exists() ) { + reportFile.delete(); + } + if ( !reportFile.exists() ) { + try { + reportFile.createNewFile(); + } + catch ( IOException e ) { + throw new MavenReportException( "unable to prep report file [" + reportFile.getAbsolutePath() + "]" ); + } + } + } + + private String buildTranslationReportName(String translationName) { + return "report-" + translationName + ".html"; + } + + private boolean generateTranslationReport( + File masterTranslationDirectory, + File translationDirectory, + String translationName) throws MavenReportException { + getLog().debug( "starting docbook:diff processing [translation=" + translationName + "]" ); + + DirectoryScanner scanner = new DirectoryScanner(); + scanner.setBasedir( masterTranslationDirectory ); + scanner.setIncludes( sourceIncludes ); + scanner.scan(); + String[] masterSources = scanner.getIncludedFiles(); + + scanner = new DirectoryScanner(); + scanner.setBasedir( translationDirectory ); + scanner.setIncludes( sourceIncludes ); + scanner.scan(); + String[] translationSources = scanner.getIncludedFiles(); + + if ( ! Arrays.equals( masterSources, translationSources ) ) { + getLog().warn( "includes returned different master and translation sets" ); + return false; + } + + Locale locale = new Locale( translationName ); + File output = new File( getReportOutputDirectory(), buildTranslationReportName( translationName ) ); + prepReportFile( output ); + + try { + DiffCreator diffCreator = new DiffCreator( xincludeSupported, getLog() ); + TranslationReportGenerator generator = new TranslationReportGenerator( translationsDirectory, getBundle( locale ), getLog() ); + + for ( int i = 0; i < masterSources.length; i++ ) { + getLog().debug( "processing source [" + masterSources[i] + "]" ); + final File master = new File( masterTranslationDirectory, masterSources[i] ); + final File translation = new File( translationDirectory, translationSources[i] ); + final Diff diff = diffCreator.findDiff( master, translation ); + generator.generate( diff, output, locale.toString() ); + } + } + catch ( GenerationException e ) { + throw new MavenReportException( "unable to generate report", e ); + } + return true; + } + +} Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/BasicRenderer.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/BasicRenderer.java 2007-06-19 03:44:19 UTC (rev 11691) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/BasicRenderer.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -1,6 +1,20 @@ package org.jboss.maven.plugin.docbook.gen.render; - +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Steve Ebersole + */ import java.io.File; import java.io.IOException; import java.net.URL; @@ -25,7 +39,7 @@ import com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl; /** - * {@inheritDoc} + * Provides basic support for renderers, mainly in the form of templating. * * @author Steve Ebersole */ @@ -57,19 +71,19 @@ return target; } - public final void render(File source) throws RenderingException, XSLTException { + public final void render(File sourceFile) throws RenderingException, XSLTException { getLog().debug( "starting formatting [" + formatting.getFormatName() + "]" ); - File target = prepareTarget( prepareDirectory(), source ); + File target = prepareTarget( prepareDirectory(), sourceFile ); Transformer transformer = buildTransformer( target ); - Source transformationSource = buildSource( source ); + Source transformationSource = buildSource( sourceFile ); Result transformationResult = buildResult( target ); try { transformer.transform( transformationSource, transformationResult ); } catch ( TransformerException e ) { - throw new RenderingException( "unable to perform transformation", e ); + throw new XSLTException( "unable to perform transformation", e ); } finally { releaseResult( transformationResult ); @@ -77,8 +91,8 @@ } - private File prepareTarget(File directory, File source) throws RenderingException { - String targetFileName = deduceTargetFileName( source ); + private File prepareTarget(File directory, File sourceFile) throws RenderingException { + String targetFileName = deduceTargetFileName( sourceFile ); getLog().debug( "preparing target file [" + targetFileName + "]" ); File target = new File( directory, targetFileName ); if ( target.exists() ) { @@ -101,8 +115,7 @@ return formatting.getNamingStrategy().deduceTargetFileName( source ); } - protected Transformer buildTransformer(File targetFile) - throws RenderingException, XSLTException { + protected Transformer buildTransformer(File targetFile) throws RenderingException, XSLTException { final URL transformationStylesheet = resolveTransformationStylesheet(); Transformer transformer = factory.getTransformerFactory() .buildTransformer( formatting, transformationStylesheet ); @@ -160,7 +173,7 @@ return parserFactory; } - protected Result buildResult(File targetFile) throws RenderingException { + protected Result buildResult(File targetFile) throws RenderingException, XSLTException { return new StreamResult( targetFile ); } Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/Formatting.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/Formatting.java 2007-06-19 03:44:19 UTC (rev 11691) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/Formatting.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -1,9 +1,24 @@ package org.jboss.maven.plugin.docbook.gen.render; +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Steve Ebersole + */ import java.io.File; import org.codehaus.plexus.util.FileUtils; -import org.jboss.maven.plugin.docbook.gen.Format; +import org.jboss.maven.plugin.docbook.Format; import org.jboss.maven.plugin.docbook.gen.util.StandardDocBookFormatSpecification; /** Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/PdfRenderer.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/PdfRenderer.java 2007-06-19 03:44:19 UTC (rev 11691) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/PdfRenderer.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -1,8 +1,25 @@ package org.jboss.maven.plugin.docbook.gen.render; +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Steve Ebersole + */ +import java.io.BufferedOutputStream; import java.io.File; import java.io.FileOutputStream; import java.io.OutputStream; +import java.io.IOException; import javax.xml.transform.Result; import javax.xml.transform.sax.SAXResult; @@ -10,11 +27,6 @@ import org.apache.fop.apps.Driver; import org.apache.maven.plugin.logging.Log; -//import org.apache.fop.apps.FOUserAgent; -//import org.apache.fop.apps.Fop; -//import org.apache.fop.apps.FopFactory; -//import org.apache.fop.apps.MimeConstants; - /** * Special handling for pdf rendering * @@ -28,19 +40,39 @@ protected Result buildResult(File targetFile) throws RenderingException { getLog().info( "building formatting result [" + targetFile.getAbsolutePath() + "]" ); - Driver driver = new Driver(); - driver.setLogger( new LoggingBridge( getLog() ) ); - driver.setRenderer( Driver.RENDER_PDF ); + return new ResultImpl( targetFile ); + } - try { -// I've had issues trying to buffer this output... -// OutputStream out = new BufferedOutputStream( new FileOutputStream( targetFile ) ); - OutputStream out = new FileOutputStream( targetFile ); - driver.setOutputStream( out ); - return new SAXResult( driver.getContentHandler() ); + protected void releaseResult(Result transformationResult) { + ( ( ResultImpl ) transformationResult ).release(); + } + + private class ResultImpl extends SAXResult { + private OutputStream outputStream; + + public ResultImpl(File targetFile) throws RenderingException { + Driver driver = new Driver(); + driver.setLogger( new LoggingBridge( getLog() ) ); + driver.setRenderer( Driver.RENDER_PDF ); + + try { + outputStream = new BufferedOutputStream( new FileOutputStream( targetFile ) ); + driver.setOutputStream( outputStream ); + setHandler( driver.getContentHandler() ); + } + catch ( Throwable t ) { + throw new RenderingException( "error building transformation result [" + targetFile.getAbsolutePath() + "]", t ); + } } - catch ( Throwable t ) { - throw new RenderingException( "error rendering pdf [" + targetFile.getAbsolutePath() + "]", t ); + + private void release() { + try { + outputStream.flush(); + outputStream.close(); + } + catch ( IOException e ) { + getLog().warn( "error releasing I/O resources", e ); + } } } @@ -118,42 +150,4 @@ } - - - /////////////////////////////////////////////////////////////////////////// - // this is (supposed) fop-0.93 usage pattern. I have been unsucessful - // getting this to work (hence rolling back to 0.25) - -// protected Result buildResult(File targetFile) throws RenderingException { -// getLog().info( "building formatting result [" + targetFile.getAbsolutePath() + "]" ); -// -// FopFactory fopFactory = FopFactory.newInstance(); -// // todo : need to set up at the font base URL -//// fopFactory.setFontBaseURL( "xyz" ); -// -// FOUserAgent userAgent = fopFactory.newFOUserAgent(); -// userAgent.setProducer( "maven-jboss-docbook-plugin" ); -// userAgent.setCreationDate( new Date() ); -// userAgent.setTitle( factory.getMavenProject().getName() ); -// if ( factory.getMavenProject().getOrganization() != null ) { -// if ( factory.getMavenProject().getOrganization().getName() != null ) { -// userAgent.setAuthor( factory.getMavenProject().getOrganization().getName() ); -// userAgent.setCreator( factory.getMavenProject().getOrganization().getName() ); -// } -// } -// -// try { -// OutputStream out = new BufferedOutputStream( new FileOutputStream( targetFile ) ); -// try { -// Fop fop = fopFactory.newFop( MimeConstants.MIME_PDF, userAgent, out ); -// return new SAXResult( fop.getDefaultHandler() ); -// } -// finally { -// out.close(); -// } -// } -// catch ( Throwable t ) { -// throw new RenderingException( "error rendering pdf [" + targetFile.getAbsolutePath() + "]", t ); -// } -// } } Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/Renderer.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/Renderer.java 2007-06-19 03:44:19 UTC (rev 11691) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/Renderer.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -1,7 +1,21 @@ package org.jboss.maven.plugin.docbook.gen.render; +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Steve Ebersole + */ import java.io.File; -import java.io.IOException; import org.jboss.maven.plugin.docbook.gen.xslt.XSLTException; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/RendererFactory.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/RendererFactory.java 2007-06-19 03:44:19 UTC (rev 11691) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/RendererFactory.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -1,12 +1,27 @@ package org.jboss.maven.plugin.docbook.gen.render; +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Steve Ebersole + */ import java.io.File; import org.apache.maven.plugin.logging.Log; import org.apache.maven.project.MavenProject; import org.apache.xml.resolver.CatalogManager; import org.apache.xml.resolver.tools.CatalogResolver; -import org.jboss.maven.plugin.docbook.gen.Options; +import org.jboss.maven.plugin.docbook.Options; import org.jboss.maven.plugin.docbook.gen.util.StandardDocBookFormatSpecification; import org.jboss.maven.plugin.docbook.gen.util.TransformerType; import org.jboss.maven.plugin.docbook.gen.xslt.TransformerFactory; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/RenderingException.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/RenderingException.java 2007-06-19 03:44:19 UTC (rev 11691) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/RenderingException.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -1,7 +1,22 @@ package org.jboss.maven.plugin.docbook.gen.render; +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Steve Ebersole + */ /** - * {@inheritDoc} + * Indicates issues performing rendering. * * @author Steve Ebersole */ Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/util/NoOpWriter.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/util/NoOpWriter.java 2007-06-19 03:44:19 UTC (rev 11691) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/util/NoOpWriter.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -1,5 +1,20 @@ package org.jboss.maven.plugin.docbook.gen.util; +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Steve Ebersole + */ import java.io.Writer; /** Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/util/ResourceHelper.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/util/ResourceHelper.java 2007-06-19 03:44:19 UTC (rev 11691) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/util/ResourceHelper.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -1,5 +1,20 @@ package org.jboss.maven.plugin.docbook.gen.util; +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Steve Ebersole + */ import java.net.URL; /** Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/util/StandardDocBookFormatSpecification.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/util/StandardDocBookFormatSpecification.java 2007-06-19 03:44:19 UTC (rev 11691) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/util/StandardDocBookFormatSpecification.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -1,15 +1,22 @@ package org.jboss.maven.plugin.docbook.gen.util; +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Steve Ebersole + */ /** - * An enumeration of the various types of formatting supported in this plugin. - * <p/> - * DocBook does define some other output formatting support (like HTML Help), - * but those are not covered nor supported by this plugin. - * <p/> - * Really, instead of a discrete enumeration, these should act as templates - * based on the docbook standard formats. The attributes here should be exposed - * to the user for configuration, thesse attributes values acting as defaults - * based on the selected format-name. + * The basic definition of the standard docbook formats. * * @author Steve Ebersole */ Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/util/TransformerType.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/util/TransformerType.java 2007-06-19 03:44:19 UTC (rev 11691) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/util/TransformerType.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -1,5 +1,20 @@ package org.jboss.maven.plugin.docbook.gen.util; +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Steve Ebersole + */ /** * Enumeration of supported XSLT transformers. * Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/TransformerFactory.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/TransformerFactory.java 2007-06-19 03:44:19 UTC (rev 11691) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/TransformerFactory.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -1,5 +1,20 @@ package org.jboss.maven.plugin.docbook.gen.xslt; +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Steve Ebersole + */ import java.io.IOException; import java.net.URL; import java.util.Iterator; @@ -106,7 +121,7 @@ } } - private URIResolver buildUriResolver(StandardDocBookFormatSpecification formatType) throws XSLTException { + public URIResolver buildUriResolver(StandardDocBookFormatSpecification formatType) throws XSLTException { ResolverChain resolverChain = new ResolverChain(); if ( formatType != null ) { resolverChain.addResolver( new ExplicitUrnResolver( formatType ) ); Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/XSLTException.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/XSLTException.java 2007-06-19 03:44:19 UTC (rev 11691) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/XSLTException.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -1,5 +1,20 @@ package org.jboss.maven.plugin.docbook.gen.xslt; +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Steve Ebersole + */ /** * Indicates problems either building XSLT transformers or performing * transformations. Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/catalog/AbstractCatalogManager.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/catalog/AbstractCatalogManager.java 2007-06-19 03:44:19 UTC (rev 11691) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/catalog/AbstractCatalogManager.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -1,5 +1,20 @@ package org.jboss.maven.plugin.docbook.gen.xslt.catalog; +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Steve Ebersole + */ import org.apache.xml.resolver.CatalogManager; /** Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/catalog/ExplicitCatalogManager.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/catalog/ExplicitCatalogManager.java 2007-06-19 03:44:19 UTC (rev 11691) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/catalog/ExplicitCatalogManager.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -1,5 +1,20 @@ package org.jboss.maven.plugin.docbook.gen.xslt.catalog; +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Steve Ebersole + */ /** * Utilizes explicit, user-supplied catalog names to build a Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/catalog/ImplicitCatalogManager.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/catalog/ImplicitCatalogManager.java 2007-06-19 03:44:19 UTC (rev 11691) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/catalog/ImplicitCatalogManager.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -1,5 +1,20 @@ package org.jboss.maven.plugin.docbook.gen.xslt.catalog; +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Steve Ebersole + */ import java.util.Enumeration; import java.util.ArrayList; import java.net.URL; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/BasicUrnResolver.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/BasicUrnResolver.java 2007-06-19 03:44:19 UTC (rev 11691) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/BasicUrnResolver.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -1,5 +1,20 @@ package org.jboss.maven.plugin.docbook.gen.xslt.resolve; +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Steve Ebersole + */ import javax.xml.transform.URIResolver; import javax.xml.transform.Source; import javax.xml.transform.TransformerException; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/CurrentVersionResolver.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/CurrentVersionResolver.java 2007-06-19 03:44:19 UTC (rev 11691) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/CurrentVersionResolver.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -1,5 +1,20 @@ package org.jboss.maven.plugin.docbook.gen.xslt.resolve; +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Steve Ebersole + */ /** * Map hrefs starting with <tt>http://docbook.sourceforge.net/release/xsl/current/</tt> * to classpath resource lookups. Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/ExplicitUrnResolver.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/ExplicitUrnResolver.java 2007-06-19 03:44:19 UTC (rev 11691) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/ExplicitUrnResolver.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -1,5 +1,20 @@ package org.jboss.maven.plugin.docbook.gen.xslt.resolve; +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Steve Ebersole + */ import java.net.URL; import java.io.IOException; import javax.xml.transform.Source; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/RelativeJarUriResolver.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/RelativeJarUriResolver.java 2007-06-19 03:44:19 UTC (rev 11691) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/RelativeJarUriResolver.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -1,5 +1,20 @@ package org.jboss.maven.plugin.docbook.gen.xslt.resolve; +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Steve Ebersole + */ import java.net.URL; import javax.xml.transform.URIResolver; import javax.xml.transform.Source; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/ResolverChain.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/ResolverChain.java 2007-06-19 03:44:19 UTC (rev 11691) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/ResolverChain.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -1,5 +1,20 @@ package org.jboss.maven.plugin.docbook.gen.xslt.resolve; +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Steve Ebersole + */ import java.util.List; import java.util.ArrayList; import java.util.Iterator; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/VersionResolver.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/VersionResolver.java 2007-06-19 03:44:19 UTC (rev 11691) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/xslt/resolve/VersionResolver.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -1,5 +1,20 @@ package org.jboss.maven.plugin.docbook.gen.xslt.resolve; +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Steve Ebersole + */ import java.net.URL; import java.io.IOException; import javax.xml.transform.Source; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/BaselineHandler.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/BaselineHandler.java 2007-06-19 03:44:19 UTC (rev 11691) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/BaselineHandler.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -1,5 +1,20 @@ package org.jboss.maven.plugin.docbook.revdiff; +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Christian Bauer, Steve Ebersole + */ import java.util.Map; import org.xml.sax.helpers.DefaultHandler; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/ContentItem.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/ContentItem.java 2007-06-19 03:44:19 UTC (rev 11691) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/ContentItem.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -1,5 +1,20 @@ package org.jboss.maven.plugin.docbook.revdiff; +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Christian Bauer + */ /** * Describes a particular piece of content, including descriptors * from both the master and a particular translation Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/ContentItemDescriptor.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/ContentItemDescriptor.java 2007-06-19 03:44:19 UTC (rev 11691) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/ContentItemDescriptor.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -1,5 +1,20 @@ package org.jboss.maven.plugin.docbook.revdiff; +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Christian Bauer + */ /** * {@inheritDoc} * Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/Diff.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/Diff.java 2007-06-19 03:44:19 UTC (rev 11691) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/Diff.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -1,5 +1,20 @@ package org.jboss.maven.plugin.docbook.revdiff; +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Steve Ebersole + */ import java.util.Set; import java.util.HashSet; import java.util.Iterator; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/DiffCreator.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/DiffCreator.java 2007-06-19 03:44:19 UTC (rev 11691) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/DiffCreator.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -1,5 +1,20 @@ package org.jboss.maven.plugin.docbook.revdiff; +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Steve Ebersole + */ import java.io.File; import java.io.IOException; import java.util.HashMap; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/GenerationException.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/GenerationException.java 2007-06-19 03:44:19 UTC (rev 11691) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/GenerationException.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -1,5 +1,20 @@ package org.jboss.maven.plugin.docbook.revdiff; +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Steve Ebersole + */ /** * Indicates problems generating the diff report * Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/IndexReportGenerator.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/IndexReportGenerator.java 2007-06-19 03:44:19 UTC (rev 11691) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/IndexReportGenerator.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -1,5 +1,20 @@ package org.jboss.maven.plugin.docbook.revdiff; +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Steve Ebersole + */ import java.util.Locale; import java.util.List; import java.util.Iterator; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/TranslationHandler.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/TranslationHandler.java 2007-06-19 03:44:19 UTC (rev 11691) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/TranslationHandler.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -1,5 +1,20 @@ package org.jboss.maven.plugin.docbook.revdiff; +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Christian Bauer, Steve Ebersole + */ import java.util.Map; import java.util.Iterator; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/TranslationReportGenerator.java =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/TranslationReportGenerator.java 2007-06-19 03:44:19 UTC (rev 11691) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/revdiff/TranslationReportGenerator.java 2007-06-19 05:31:59 UTC (rev 11692) @@ -1,5 +1,20 @@ package org.jboss.maven.plugin.docbook.revdiff; +/* + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. You should have received a + * copy of the GNU Lesser General Public License, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Christian Bauer, Steve Ebersole + */ import java.io.File; import java.io.FileWriter; import java.io.IOException; Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/resources/META-INF/plexus/components.xml =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/resources/META-INF/plexus/components.xml 2007-06-19 03:44:19 UTC (rev 11691) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/src/main/resources/META-INF/plexus/components.xml 2007-06-19 05:31:59 UTC (rev 11692) @@ -5,7 +5,7 @@ <component> <role>org.apache.maven.reporting.MavenReport</role> <role-hint>diff</role-hint> - <implementation>org.jboss.maven.plugin.docbook.revdiff.TranslationDiffReport</implementation> + <implementation>org.jboss.maven.plugin.docbook.TranslationDiffReport</implementation> <instantiation-strategy>per-lookup</instantiation-strategy> </component> @@ -17,9 +17,7 @@ <phases> <process-resources>org.jboss.maven.plugins:maven-jboss-docbook-plugin:resources</process-resources> <compile>org.jboss.maven.plugins:maven-jboss-docbook-plugin:generate</compile> -  + <package>org.jboss.maven.plugins:maven-jboss-docbook-plugin:bundle</package> <install>org.apache.maven.plugins:maven-install-plugin:install</install> <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy> </phases>

18 years, 4 months

1
0
0 / 0

Hibernate SVN: r11691 - trunk/HibernateExt/search/src/java/org/hibernate/search/reader.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2007-06-18 23:44:19 -0400 (Mon, 18 Jun 2007) New Revision: 11691 Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/reader/NotSharedReaderProvider.java Log: Remove try catch swallowing exception Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/reader/NotSharedReaderProvider.java =================================================================== --- trunk/HibernateExt/search/src/java/org/hibernate/search/reader/NotSharedReaderProvider.java 2007-06-14 04:21:37 UTC (rev 11690) +++ trunk/HibernateExt/search/src/java/org/hibernate/search/reader/NotSharedReaderProvider.java 2007-06-19 03:44:19 UTC (rev 11691) @@ -22,12 +22,7 @@ IndexReader[] readers = new IndexReader[length]; try { for (int index = 0; index < length; index++) { - try { - readers[index] = IndexReader.open( directoryProviders[index].getDirectory() ); - } - catch (NullPointerException e) { - e.printStackTrace(); - } + readers[index] = IndexReader.open( directoryProviders[index].getDirectory() ); } } catch (IOException e) {

18 years, 4 months

1
0
0 / 0

Hibernate SVN: r11690 - trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2007-06-14 00:21:37 -0400 (Thu, 14 Jun 2007) New Revision: 11690 Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/ Log: applied svn:ignore to module dirs Property changes on: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin ___________________________________________________________________ Name: svn:ignore + target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover

18 years, 5 months

1
0
0 / 0

Hibernate SVN: r11689 - in trunk/Hibernate3: code and 22 other directories.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2007-06-14 00:12:39 -0400 (Thu, 14 Jun 2007) New Revision: 11689 Modified: trunk/Hibernate3/ trunk/Hibernate3/code/ trunk/Hibernate3/code/cache-ehcache/ trunk/Hibernate3/code/cache-jbosscache/ trunk/Hibernate3/code/cache-jbosscache2/ trunk/Hibernate3/code/cache-oscache/ trunk/Hibernate3/code/cache-swarmcache/ trunk/Hibernate3/code/connection-c3p0/ trunk/Hibernate3/code/connection-proxool/ trunk/Hibernate3/code/core/ trunk/Hibernate3/code/eg/ trunk/Hibernate3/code/jmx/ trunk/Hibernate3/code/testing/ trunk/Hibernate3/code/testsuite/ trunk/Hibernate3/documentation/ trunk/Hibernate3/documentation/manual/ trunk/Hibernate3/documentation/manual/en-US/ trunk/Hibernate3/documentation/manual/en-US/pom.xml trunk/Hibernate3/documentation/manual/es-ES/ trunk/Hibernate3/documentation/manual/fr-FR/ trunk/Hibernate3/documentation/manual/ja-JP/ trunk/Hibernate3/documentation/manual/ko-KR/ trunk/Hibernate3/documentation/manual/pt-BR/ trunk/Hibernate3/documentation/manual/zh-CN/ trunk/Hibernate3/documentation/tutorial/ Log: applied svn:ignore to module dirs Property changes on: trunk/Hibernate3 ___________________________________________________________________ Name: svn:ignore - build testout *.ipr *.iws *.iml .classpath .project .nbattrs *.log .clover local *.properties + target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover Property changes on: trunk/Hibernate3/code ___________________________________________________________________ Name: svn:ignore + target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover Property changes on: trunk/Hibernate3/code/cache-ehcache ___________________________________________________________________ Name: svn:ignore + target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover Property changes on: trunk/Hibernate3/code/cache-jbosscache ___________________________________________________________________ Name: svn:ignore + target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover Property changes on: trunk/Hibernate3/code/cache-jbosscache2 ___________________________________________________________________ Name: svn:ignore + target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover Property changes on: trunk/Hibernate3/code/cache-oscache ___________________________________________________________________ Name: svn:ignore + target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover Property changes on: trunk/Hibernate3/code/cache-swarmcache ___________________________________________________________________ Name: svn:ignore + target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover Property changes on: trunk/Hibernate3/code/connection-c3p0 ___________________________________________________________________ Name: svn:ignore + target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover Property changes on: trunk/Hibernate3/code/connection-proxool ___________________________________________________________________ Name: svn:ignore + target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover Property changes on: trunk/Hibernate3/code/core ___________________________________________________________________ Name: svn:ignore + target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover Property changes on: trunk/Hibernate3/code/eg ___________________________________________________________________ Name: svn:ignore + target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover Property changes on: trunk/Hibernate3/code/jmx ___________________________________________________________________ Name: svn:ignore + target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover Property changes on: trunk/Hibernate3/code/testing ___________________________________________________________________ Name: svn:ignore + target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover Property changes on: trunk/Hibernate3/code/testsuite ___________________________________________________________________ Name: svn:ignore + target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover Property changes on: trunk/Hibernate3/documentation ___________________________________________________________________ Name: svn:ignore + target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover Property changes on: trunk/Hibernate3/documentation/manual ___________________________________________________________________ Name: svn:ignore + target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover Property changes on: trunk/Hibernate3/documentation/manual/en-US ___________________________________________________________________ Name: svn:ignore + target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover Modified: trunk/Hibernate3/documentation/manual/en-US/pom.xml =================================================================== --- trunk/Hibernate3/documentation/manual/en-US/pom.xml 2007-06-14 03:27:42 UTC (rev 11688) +++ trunk/Hibernate3/documentation/manual/en-US/pom.xml 2007-06-14 04:12:39 UTC (rev 11689) @@ -12,9 +12,52 @@ </parent> <artifactId>hibernate-manual-${translation}</artifactId> - <packaging>pom</packaging> + <packaging>docbook</packaging> <name>Hibernate Manual (${translation})</name> + <build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jboss-docbook-plugin</artifactId> + <version>2.0-SNAPSHOT</version> + <extensions>true</extensions> + <dependencies> + <dependency> + <groupId>com.redhat</groupId> + <artifactId>docbook-xslt</artifactId> + <version>0.1</version> + </dependency> + </dependencies> + <configuration> + <sourceDocumentName>master.xml</sourceDocumentName> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>/standard/fopdf.xsl</stylesheetResource> + <finalName>Hibernate_Reference.pdf</finalName> + </format> + <format> + <formatName>eclipse</formatName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>/standard/html.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + <options> + <xincludeSupported>true</xincludeSupported> + <xmlTransformerType>saxon</xmlTransformerType> +  +  + <docbookVersion>1.72.0</docbookVersion> + </options> + </configuration> + </plugin> + </plugins> + </build> + <properties> <translation>en-US</translation> </properties> Property changes on: trunk/Hibernate3/documentation/manual/es-ES ___________________________________________________________________ Name: svn:ignore + target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover Property changes on: trunk/Hibernate3/documentation/manual/fr-FR ___________________________________________________________________ Name: svn:ignore + target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover Property changes on: trunk/Hibernate3/documentation/manual/ja-JP ___________________________________________________________________ Name: svn:ignore + target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover Property changes on: trunk/Hibernate3/documentation/manual/ko-KR ___________________________________________________________________ Name: svn:ignore + target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover Property changes on: trunk/Hibernate3/documentation/manual/pt-BR ___________________________________________________________________ Name: svn:ignore + target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover Property changes on: trunk/Hibernate3/documentation/manual/zh-CN ___________________________________________________________________ Name: svn:ignore + target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover Property changes on: trunk/Hibernate3/documentation/tutorial ___________________________________________________________________ Name: svn:ignore + target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover

18 years, 5 months

1
0
0 / 0

Hibernate SVN: r11688 - in trunk/HibernateExt/shards/src: java/org/hibernate/shards/session and 2 other directories.

by hibernate-commits＠lists.jboss.org

Author: buurzgoth Date: 2007-06-13 23:27:42 -0400 (Wed, 13 Jun 2007) New Revision: 11688 Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/Shard.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/ShardImpl.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionImpl.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/ShardDefaultMock.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/model/ModelPermutedIntegrationTest.java Log: Add replicate(). Inline some stuff from Shard. Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/Shard.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/Shard.java 2007-06-13 19:52:17 UTC (rev 11687) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/Shard.java 2007-06-14 03:27:42 UTC (rev 11688) @@ -19,7 +19,6 @@ package org.hibernate.shards; import org.hibernate.Criteria; -import org.hibernate.LockMode; import org.hibernate.Query; import org.hibernate.classic.Session; import org.hibernate.engine.SessionFactoryImplementor; @@ -31,7 +30,6 @@ import org.hibernate.shards.query.ShardedQuery; import org.hibernate.shards.session.OpenSessionEvent; -import java.io.Serializable; import java.util.List; import java.util.Set; @@ -90,131 +88,16 @@ Criteria establishCriteria(ShardedCriteria shardedCriteria); /** - * @see Session#get(Class, Serializable) - */ - Object get(Class<?> clazz, Serializable id); - - /** - * @see Session#get(Class, Serializable, LockMode) - */ - Object get(Class<?> clazz, Serializable id, LockMode lockMode); - - /** - * @see Session#get(String, Serializable) - */ - Object get(String entityName, Serializable id); - - /** - * @see Session#get(String, Serializable, LockMode) - */ - Object get(String entityName, Serializable id, LockMode lockMode); - - /** * @see Criteria#list() */ List<Object> list(CriteriaId criteriaId); /** - * @see Session#load(Class, Serializable) - */ - Object load(Class<?> clazz, Serializable id); - - /** - * @see Session#load(Class, Serializable, LockMode) - */ - Object load(Class<?> clazz, Serializable id, LockMode lockMode); - - /** - * @see Session#load(String, Serializable) - */ - Object load(String entityName, Serializable id); - - /** - * @see Session#load(String, Serializable, LockMode) - */ - Object load(String entityName, Serializable id, LockMode lockMode); - - /** - * @see Session#load(Object, Serializable) - */ - void load(Object object, Serializable id); - - /** - * @see Session#lock(Object, LockMode) - */ - void lock(Object object, LockMode lockMode); - - /** - * @see Session#lock(String, Object, LockMode) - */ - void lock(String entityName, Object object, LockMode lockMode); - - /** * @see Criteria#uniqueResult() */ Object uniqueResult(CriteriaId criteriaId); /** - * @see Session#save(String, Object) - */ - Serializable save(String entityName, Object obj); - - /** - * @see Session#persist(String, Object) - */ - void persist(String entityName, Object obj); - - /** - * @see Session#refresh(Object) - */ - void refresh(Object object); - - /** - * @see Session#refresh(Object, LockMode) - */ - void refresh(Object object, LockMode lockMode); - - /** - * @see Session#saveOrUpdate(Object) - */ - void saveOrUpdate(Object obj); - - /** - * @see Session#saveOrUpdate(String, Object) - */ - void saveOrUpdate(String entityName, Object obj); - - /** - * @see Session#update(Object) - */ - void update(Object object); - - /** - * @see Session#update(String, Object) - */ - void update(String entityName, Object obj); - - /** - * @see Session#delete(Object) - */ - void delete(Object object); - - /** - * @see Session#delete(String, Object) - */ - void delete(String entityName, Object object); - - /** - * @see Session#getCurrentLockMode(Object) - */ - LockMode getCurrentLockMode(Object object); - - /** - * @see Session#getEntityName(Object) - */ - String getEntityName(Object object); - - /** * @return the ids of the virtual shards that are mapped to this physical shard. * The returned Set is unmodifiable. */ @@ -248,8 +131,4 @@ * @see Query#uniqueResult() */ Object uniqueResult(QueryId queryId); - - void merge(Object object); - - void merge(String entityName, Object object); } Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/ShardImpl.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/ShardImpl.java 2007-06-13 19:52:17 UTC (rev 11687) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/ShardImpl.java 2007-06-14 03:27:42 UTC (rev 11688) @@ -20,7 +20,6 @@ import org.hibernate.Criteria; import org.hibernate.Interceptor; -import org.hibernate.LockMode; import org.hibernate.Query; import org.hibernate.classic.Session; import org.hibernate.engine.SessionFactoryImplementor; @@ -36,7 +35,6 @@ import org.hibernate.shards.util.Preconditions; import org.hibernate.shards.util.Sets; -import java.io.Serializable; import java.util.*; /** @@ -245,50 +243,6 @@ return hashCode; } - public Object get(Class<?> clazz, Serializable id) { - return establishSession().get(clazz, id); - } - - public Object get(Class<?> clazz, Serializable id, LockMode lockMode) { - return establishSession().get(clazz, id, lockMode); - } - - public Object get(String entityName, Serializable id) { - return establishSession().get(entityName, id); - } - - public Object get(String entityName, Serializable id, LockMode lockMode) { - return establishSession().get(entityName, id, lockMode); - } - - public Object load(Class<?> clazz, Serializable id) { - return establishSession().load(clazz, id); - } - - public Object load(Class<?> clazz, Serializable id, LockMode lockMode) { - return establishSession().load(clazz, id, lockMode); - } - - public Object load(String entityName, Serializable id) { - return establishSession().load(entityName, id); - } - - public Object load(String entityName, Serializable id, LockMode lockMode) { - return establishSession().load(entityName, id, lockMode); - } - - public void load(Object object, Serializable id) { - establishSession().load(object, id); - } - - public void lock(Object object, LockMode lockMode) { - establishSession().lock(object, lockMode); - } - - public void lock(String entityName, Object object, LockMode lockMode) { - establishSession().lock(entityName, object, lockMode); - } - @SuppressWarnings("unchecked") public List<Object> list(CriteriaId criteriaId) { return criteriaMap.get(criteriaId).list(); @@ -332,54 +286,6 @@ return criteriaEventMap; } - public Serializable save(String entityName, Object obj) { - return establishSession().save(entityName, obj); - } - - public void persist(String entityName, Object obj) { - establishSession().persist(entityName, obj); - } - - public void refresh(Object object) { - establishSession().refresh(object); - } - - public void refresh(Object object, LockMode lockMode) { - establishSession().refresh(object, lockMode); - } - - public void saveOrUpdate(Object obj) { - establishSession().saveOrUpdate(obj); - } - - public void saveOrUpdate(String entityName, Object obj) { - establishSession().saveOrUpdate(entityName, obj); - } - - public void update(Object object) { - establishSession().update(object); - } - - public void update(String entityName, Object obj) { - establishSession().update(entityName, obj); - } - - public void delete(Object object) { - establishSession().delete(object); - } - - public void delete(String entityName, Object object) { - establishSession().delete(entityName, object); - } - - public LockMode getCurrentLockMode(Object object) { - return establishSession().getCurrentLockMode(object); - } - - public String getEntityName(Object object) { - return establishSession().getEntityName(object); - } - @Override public String toString() { return getSessionFactoryImplementor().getSettings().getSessionFactoryName(); @@ -425,12 +331,5 @@ events.addLast(event); } - public void merge(Object object) { - establishSession().merge(object); - } - - public void merge(String entityName, Object object) { - establishSession().merge(entityName, object); - } } Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionImpl.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionImpl.java 2007-06-13 19:52:17 UTC (rev 11687) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionImpl.java 2007-06-14 03:27:42 UTC (rev 11688) @@ -238,7 +238,7 @@ public Object get(final Class clazz, final Serializable id) throws HibernateException { ShardOperation<Object> shardOp = new ShardOperation<Object>() { public Object execute(Shard shard) { - return shard.get(clazz, id); + return shard.establishSession().get(clazz, id); } public String getOperationName() { @@ -252,7 +252,7 @@ throws HibernateException { ShardOperation<Object> shardOp = new ShardOperation<Object>() { public Object execute(Shard shard) { - return shard.get(clazz, id, lockMode); + return shard.establishSession().get(clazz, id, lockMode); } public String getOperationName() { @@ -267,7 +267,7 @@ throws HibernateException { ShardOperation<Object> shardOp = new ShardOperation<Object>() { public Object execute(Shard shard) { - return shard.get(entityName, id); + return shard.establishSession().get(entityName, id); } public String getOperationName() { @@ -281,7 +281,7 @@ throws HibernateException { ShardOperation<Object> shardOp = new ShardOperation<Object>() { public Object execute(Shard shard) { - return shard.get(entityName, id, lockMode); + return shard.establishSession().get(entityName, id, lockMode); } public String getOperationName() { @@ -497,7 +497,7 @@ List<ShardId> shardIds = selectShardIdsFromShardResolutionStrategyData(new ShardResolutionStrategyDataImpl(clazz, id)); if (shardIds.size() == 1) { - return shardIdsToShards.get(shardIds.get(0)).load(clazz, id, lockMode); + return shardIdsToShards.get(shardIds.get(0)).establishSession().load(clazz, id, lockMode); } else { Object result = get(clazz, id, lockMode); if (result == null) { @@ -512,7 +512,7 @@ List<ShardId> shardIds = selectShardIdsFromShardResolutionStrategyData(new ShardResolutionStrategyDataImpl(entityName, id)); if (shardIds.size() == 1) { - return shardIdsToShards.get(shardIds.get(0)).load(entityName, id, lockMode); + return shardIdsToShards.get(shardIds.get(0)).establishSession().load(entityName, id, lockMode); } else { Object result = get(entityName, id, lockMode); if (result == null) { @@ -527,7 +527,7 @@ List<ShardId> shardIds = selectShardIdsFromShardResolutionStrategyData(new ShardResolutionStrategyDataImpl(clazz, id)); if (shardIds.size() == 1) { - return shardIdsToShards.get(shardIds.get(0)).load(clazz, id); + return shardIdsToShards.get(shardIds.get(0)).establishSession().load(clazz, id); } else { Object result = get(clazz, id); if (result == null) { @@ -542,7 +542,7 @@ List<ShardId> shardIds = selectShardIdsFromShardResolutionStrategyData(new ShardResolutionStrategyDataImpl(entityName, id)); if (shardIds.size() == 1) { - return shardIdsToShards.get(shardIds.get(0)).load(entityName, id); + return shardIdsToShards.get(shardIds.get(0)).establishSession().load(entityName, id); } else { Object result = get(entityName, id); if (result == null) { @@ -556,7 +556,7 @@ List<ShardId> shardIds = selectShardIdsFromShardResolutionStrategyData(new ShardResolutionStrategyDataImpl(object.getClass(), id)); if (shardIds.size() == 1) { - shardIdsToShards.get(shardIds.get(0)).load(object, id); + shardIdsToShards.get(shardIds.get(0)).establishSession().load(object, id); } else { Object result = get(object.getClass(), id); if (result == null) { @@ -564,25 +564,36 @@ } else { Shard objectShard = getShardForObject(result, shardIdListToShardList(shardIds)); evict(result); - objectShard.load(object, id); + objectShard.establishSession().load(object, id); } } } - /** - * Unsupported. This is a scope decision, not a technical decision. - */ public void replicate(Object object, ReplicationMode replicationMode) throws HibernateException { - throw new UnsupportedOperationException(); + replicate(null, object, replicationMode); } - /** - * Unsupported. This is a scope decision, not a technical decision. - */ public void replicate(String entityName, Object object, ReplicationMode replicationMode) throws HibernateException { - throw new UnsupportedOperationException(); + Serializable id = extractId(object); + List<ShardId> shardIds = selectShardIdsFromShardResolutionStrategyData(new + ShardResolutionStrategyDataImpl(object.getClass(), id)); + if (shardIds.size() == 1) { + shardIdsToShards.get(shardIds.get(0)).establishSession().replicate(entityName, object, replicationMode); + } else { + Object result = null; + if (id != null) result = get(object.getClass(), id); + if (result == null) { // non-persisted object + ShardId shardId = selectShardIdForNewObject(object); + setCurrentSubgraphShardId(shardId); + shardIdsToShards.get(shardId).establishSession().replicate(entityName, object, replicationMode); + } else { + Shard objectShard = getShardForObject(result, shardIdListToShardList(shardIds)); + evict(result); + objectShard.establishSession().replicate(entityName, object, replicationMode); + } + } } public Serializable save(String entityName, Object object) throws HibernateException { @@ -594,7 +605,7 @@ Preconditions.checkNotNull(shardId); setCurrentSubgraphShardId(shardId); log.debug(String.format("Saving object of type %s to shard %s", object.getClass(), shardId)); - return shardIdsToShards.get(shardId).save(entityName, object); + return shardIdsToShards.get(shardId).establishSession().save(entityName, object); } ShardId selectShardIdForNewObject(Object obj) { @@ -728,11 +739,11 @@ throws HibernateException { SaveOrUpdateOperation op = new SaveOrUpdateOperation() { public void saveOrUpdate(Shard shard, Object object) { - shard.saveOrUpdate(entityName, object); + shard.establishSession().saveOrUpdate(entityName, object); } public void merge(Shard shard, Object object) { - shard.merge(entityName, object); + shard.establishSession().merge(entityName, object); } }; applySaveOrUpdateOperation(op, object); @@ -784,11 +795,11 @@ private static final UpdateOperation SIMPLE_UPDATE_OPERATION = new UpdateOperation() { public void update(Shard shard, Object object) { - shard.update(object); + shard.establishSession().update(object); } public void merge(Shard shard, Object object) { - shard.merge(object); + shard.establishSession().merge(object); } }; @@ -838,11 +849,11 @@ throws HibernateException { UpdateOperation op = new UpdateOperation() { public void update(Shard shard, Object object) { - shard.update(entityName, object); + shard.establishSession().update(entityName, object); } public void merge(Shard shard, Object object) { - shard.merge(entityName, object); + shard.establishSession().merge(entityName, object); } }; applyUpdateOperation(op, object); @@ -887,7 +898,7 @@ Preconditions.checkNotNull(shardId); setCurrentSubgraphShardId(shardId); log.debug(String.format("Persisting object of type %s to shard %s", object.getClass(), shardId)); - shardIdsToShards.get(shardId).persist(entityName, object); + shardIdsToShards.get(shardId).establishSession().persist(entityName, object); } private interface DeleteOperation { @@ -931,7 +942,7 @@ new DeleteOperation() { public void delete(Shard shard, Object object) { - shard.delete(object); + shard.establishSession().delete(object); } }; @@ -943,7 +954,7 @@ throws HibernateException { DeleteOperation op = new DeleteOperation() { public void delete(Shard shard, Object object) { - shard.delete(entityName, object); + shard.establishSession().delete(entityName, object); } }; applyDeleteOperation(op, object); @@ -952,7 +963,7 @@ public void lock(final Object object, final LockMode lockMode) throws HibernateException { ShardOperation<Void> op = new ShardOperation<Void>() { public Void execute(Shard s) { - s.lock(object, lockMode); + s.establishSession().lock(object, lockMode); return null; } public String getOperationName() { @@ -966,7 +977,7 @@ throws HibernateException { ShardOperation<Void> op = new ShardOperation<Void>() { public Void execute(Shard s) { - s.lock(entityName, object, lockMode); + s.establishSession().lock(entityName, object, lockMode); return null; } public String getOperationName() { @@ -1005,7 +1016,7 @@ public void refresh(final Object object) throws HibernateException { RefreshOperation op = new RefreshOperation() { public void refresh(Shard shard, Object object) { - shard.refresh(object); + shard.establishSession().refresh(object); } }; applyRefreshOperation(op, object); @@ -1015,7 +1026,7 @@ throws HibernateException { RefreshOperation op = new RefreshOperation() { public void refresh(Shard shard, Object object) { - shard.refresh(object, lockMode); + shard.establishSession().refresh(object, lockMode); } }; applyRefreshOperation(op, object); @@ -1024,7 +1035,7 @@ public LockMode getCurrentLockMode(final Object object) throws HibernateException { ShardOperation<LockMode> invoker = new ShardOperation<LockMode>() { public LockMode execute(Shard s) { - return s.getCurrentLockMode(object); + return s.establishSession().getCurrentLockMode(object); } public String getOperationName() { return "getCurrentLockmode(Object object)"; @@ -1121,7 +1132,7 @@ public String getEntityName(final Object object) throws HibernateException { ShardOperation<String> invoker = new ShardOperation<String>() { public String execute(Shard s) { - return s.getEntityName(object); + return s.establishSession().getEntityName(object); } public String getOperationName() { return "getEntityName(Object object)"; @@ -1399,11 +1410,11 @@ private static final SaveOrUpdateOperation SAVE_OR_UPDATE_SIMPLE = new SaveOrUpdateOperation() { public void saveOrUpdate(Shard shard, Object object) { - shard.saveOrUpdate(object); + shard.establishSession().saveOrUpdate(object); } public void merge(Shard shard, Object object) { - shard.merge(object); + shard.establishSession().merge(object); } }; Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/ShardDefaultMock.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/ShardDefaultMock.java 2007-06-13 19:52:17 UTC (rev 11687) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/ShardDefaultMock.java 2007-06-14 03:27:42 UTC (rev 11688) @@ -19,7 +19,6 @@ package org.hibernate.shards; import org.hibernate.Criteria; -import org.hibernate.LockMode; import org.hibernate.Query; import org.hibernate.classic.Session; import org.hibernate.engine.SessionFactoryImplementor; @@ -31,7 +30,6 @@ import org.hibernate.shards.query.ShardedQuery; import org.hibernate.shards.session.OpenSessionEvent; -import java.io.Serializable; import java.util.List; import java.util.Set; @@ -69,51 +67,6 @@ throw new UnsupportedOperationException(); } - public Object get(Class<?> clazz, Serializable id) { - throw new UnsupportedOperationException(); - } - - public Object get(Class<?> clazz, Serializable id, LockMode lockMode) { - throw new UnsupportedOperationException(); - } - - public Object get(String entityName, Serializable id) { - throw new UnsupportedOperationException(); - } - - public Object get(String entityName, Serializable id, LockMode lockMode) { - throw new UnsupportedOperationException(); - } - - - public Object load(Class<?> clazz, Serializable id) { - throw new UnsupportedOperationException(); - } - - public Object load(Class<?> clazz, Serializable id, LockMode lockMode) { - throw new UnsupportedOperationException(); - } - - public Object load(String entityName, Serializable id) { - throw new UnsupportedOperationException(); - } - - public Object load(String entityName, Serializable id, LockMode lockMode) { - throw new UnsupportedOperationException(); - } - - public void load(Object object, Serializable id) { - throw new UnsupportedOperationException(); - } - - public void lock(Object object, LockMode lockMode) { - throw new UnsupportedOperationException(); - } - - public void lock(String entityName, Object object, LockMode lockMode) { - throw new UnsupportedOperationException(); - } - public List<Object> list(CriteriaId criteriaId) { throw new UnsupportedOperationException(); } @@ -122,58 +75,6 @@ throw new UnsupportedOperationException(); } - public Serializable save(Object obj) { - throw new UnsupportedOperationException(); - } - - public Serializable save(String entityName, Object obj) { - throw new UnsupportedOperationException(); - } - - public void persist(String entityName, Object obj) { - throw new UnsupportedOperationException(); - } - - public void refresh(Object object) { - throw new UnsupportedOperationException(); - } - - public void refresh(Object object, LockMode lockMode) { - throw new UnsupportedOperationException(); - } - - public void saveOrUpdate(Object obj) { - throw new UnsupportedOperationException(); - } - - public void saveOrUpdate(String entityName, Object obj) { - throw new UnsupportedOperationException(); - } - - public void update(Object object) { - throw new UnsupportedOperationException(); - } - - public void update(String entityName, Object obj) { - throw new UnsupportedOperationException(); - } - - public void delete(Object object) { - throw new UnsupportedOperationException(); - } - - public void delete(String entityName, Object object) { - throw new UnsupportedOperationException(); - } - - public LockMode getCurrentLockMode(Object object) { - throw new UnsupportedOperationException(); - } - - public String getEntityName(Object object) { - throw new UnsupportedOperationException(); - } - public Set<ShardId> getShardIds() { throw new UnsupportedOperationException(); } @@ -197,12 +98,4 @@ public Object uniqueResult(QueryId queryId) { throw new UnsupportedOperationException(); } - - public void merge(Object object) { - throw new UnsupportedOperationException(); - } - - public void merge(String entityName, Object object) { - throw new UnsupportedOperationException(); - } } Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/model/ModelPermutedIntegrationTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/model/ModelPermutedIntegrationTest.java 2007-06-13 19:52:17 UTC (rev 11687) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/model/ModelPermutedIntegrationTest.java 2007-06-14 03:27:42 UTC (rev 11688) @@ -18,10 +18,7 @@ package org.hibernate.shards.integration.model; -import org.hibernate.HibernateException; -import org.hibernate.LockMode; -import org.hibernate.SessionFactory; -import org.hibernate.TransactionException; +import org.hibernate.*; import org.hibernate.classic.Session; import org.hibernate.criterion.Projections; import org.hibernate.proxy.HibernateProxy; @@ -885,24 +882,60 @@ assertEquals("b1", loadedB.getName()); } - public void testLoadNonexisting() { - session.beginTransaction(); - Building b = building("b1"); - session.save(b); - commitAndResetSession(); - b = reload(b); - Serializable id = b.getBuildingId(); - session.delete(b); - commitAndResetSession(); - try { - Building loadedB = (Building)session.load(Building.class, id); - loadedB.getName(); - fail(); - } catch (HibernateException he) { - // good - } - } + public void testLoadNonexisting() { + session.beginTransaction(); + Building b = building("b1"); + session.save(b); + commitAndResetSession(); + b = reload(b); + Serializable id = b.getBuildingId(); + session.delete(b); + commitAndResetSession(); + try { + Building loadedB = (Building)session.load(Building.class, id); + loadedB.getName(); + fail(); + } catch (HibernateException he) { + // good + } + } + public void testReplicate() { + session.beginTransaction(); + Building idB = building("just need to get id"); + session.save(idB); + commitAndResetSession(); + Serializable id = idB.getBuildingId(); + session.beginTransaction(); + session.delete(idB); + commitAndResetSession(); + + Building b = building("b1"); + b.setBuildingId(id); + session.beginTransaction(); + session.replicate(b, ReplicationMode.IGNORE); + commitAndResetSession(); + Building replicatedB = (Building)session.get(Building.class, id); + assertNotNull(replicatedB); + assertEquals("b1", replicatedB.getName()); + } + + public void testReplicatePersistedAndOverwrite() { + session.beginTransaction(); + Building b1 = building("b1"); + session.save(b1); + commitAndResetSession(); + session.evict(b1); + Building b2 = building("b2"); + b2.setBuildingId(b1.getBuildingId()); + session.beginTransaction(); + session.replicate(b2, ReplicationMode.OVERWRITE); + commitAndResetSession(); + Building replicatedB2 = (Building)session.get(Building.class, b1.getBuildingId()); + assertNotNull(replicatedB2); + assertEquals("b2", replicatedB2.getName()); + } + public void testPersist() { session.beginTransaction(); Building b = building("b1");

18 years, 5 months

1
0
0 / 0

Hibernate SVN: r11687 - trunk/HibernateExt/search/src/test/org/hibernate/search/test/query.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2007-06-13 15:52:17 -0400 (Wed, 13 Jun 2007) New Revision: 11687 Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/Book.java trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/ProjectionQueryTest.java Log: Fix a test bug on projection Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/Book.java =================================================================== --- trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/Book.java 2007-06-13 18:31:11 UTC (rev 11686) +++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/Book.java 2007-06-13 19:52:17 UTC (rev 11687) @@ -58,7 +58,8 @@ this.body = body; } - @Unstored + //@Unstored + @Field(index=Index.TOKENIZED, store=Store.NO) public String getBody() { return body; } Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/ProjectionQueryTest.java =================================================================== --- trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/ProjectionQueryTest.java 2007-06-13 18:31:11 UTC (rev 11686) +++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/ProjectionQueryTest.java 2007-06-13 19:52:17 UTC (rev 11687) @@ -9,6 +9,7 @@ import org.hibernate.Transaction; import org.hibernate.search.FullTextSession; import org.hibernate.search.Search; +import org.hibernate.search.SearchException; import org.hibernate.search.test.SearchTestCase; /** @@ -32,7 +33,7 @@ Query query = parser.parse( "summary:Festina" ); org.hibernate.search.FullTextQuery hibQuery = s.createFullTextQuery( query, Book.class ); - hibQuery.setIndexProjection( "id", "summary", "body", "mainAuthor.name"); + hibQuery.setIndexProjection( "id", "summary", "mainAuthor.name"); List result = hibQuery.list(); assertNotNull( result ); @@ -40,10 +41,21 @@ Object[] projection = (Object[]) result.get( 0 ); assertEquals( "id", 1, projection[0] ); assertEquals( "summary", "La chute de la petite reine a travers les yeux de Festina", projection[1] ); - assertEquals( "body should be null (non projectable)", null, projection[2] ); - assertEquals( "mainAuthor.name (embedded objects)", "Emmanuel", projection[3] ); + assertEquals( "mainAuthor.name (embedded objects)", "Emmanuel", projection[2] ); hibQuery = s.createFullTextQuery( query, Book.class ); + hibQuery.setIndexProjection( "id", "body", "mainAuthor.name"); + + try { + result = hibQuery.list(); + fail("Projecting an unstored field should raise an exception"); + } + catch (SearchException e) { + //success + } + + + hibQuery = s.createFullTextQuery( query, Book.class ); hibQuery.setIndexProjection(); result = hibQuery.list(); assertNotNull( result );

18 years, 5 months

1
0
0 / 0

Hibernate SVN: r11686 - in trunk/Hibernate3/code: core/src/main/java/org/hibernate/loader and 2 other directories.

by hibernate-commits＠lists.jboss.org

Author: cbredesen Date: 2007-06-13 14:31:11 -0400 (Wed, 13 Jun 2007) New Revision: 11686 Modified: trunk/Hibernate3/code/core/src/main/java/org/hibernate/criterion/SubqueryExpression.java trunk/Hibernate3/code/core/src/main/java/org/hibernate/loader/AbstractEntityJoinWalker.java trunk/Hibernate3/code/core/src/main/java/org/hibernate/loader/criteria/CriteriaJoinWalker.java trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/criteria/CriteriaQueryTest.java Log: HHH-952: subqueries with joins using DetatchedCriteria Modified: trunk/Hibernate3/code/core/src/main/java/org/hibernate/criterion/SubqueryExpression.java =================================================================== --- trunk/Hibernate3/code/core/src/main/java/org/hibernate/criterion/SubqueryExpression.java 2007-06-13 18:19:43 UTC (rev 11685) +++ trunk/Hibernate3/code/core/src/main/java/org/hibernate/criterion/SubqueryExpression.java 2007-06-13 18:31:11 UTC (rev 11686) @@ -1,17 +1,17 @@ //$Id: SubqueryExpression.java 7365 2005-07-04 02:40:29Z oneovthafew $ package org.hibernate.criterion; +import java.util.HashMap; import org.hibernate.Criteria; import org.hibernate.EntityMode; import org.hibernate.HibernateException; import org.hibernate.engine.QueryParameters; import org.hibernate.engine.SessionFactoryImplementor; -import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.TypedValue; import org.hibernate.impl.CriteriaImpl; +import org.hibernate.loader.criteria.CriteriaJoinWalker; import org.hibernate.loader.criteria.CriteriaQueryTranslator; import org.hibernate.persister.entity.OuterJoinLoadable; -import org.hibernate.sql.Select; import org.hibernate.type.Type; /** @@ -24,6 +24,7 @@ private String op; private QueryParameters params; private Type[] types; + private CriteriaQueryTranslator innerQuery; protected Type[] getTypes() { return types; @@ -40,33 +41,22 @@ public String toSqlString(Criteria criteria, CriteriaQuery criteriaQuery) throws HibernateException { - final SessionImplementor session = ( (CriteriaImpl) criteria ).getSession(); //ugly! - final SessionFactoryImplementor factory = session.getFactory(); - + final SessionFactoryImplementor factory = criteriaQuery.getFactory(); final OuterJoinLoadable persister = (OuterJoinLoadable) factory.getEntityPersister( criteriaImpl.getEntityOrClassName() ); - CriteriaQueryTranslator innerQuery = new CriteriaQueryTranslator( - factory, - criteriaImpl, - criteriaImpl.getEntityOrClassName(), //implicit polymorphism not supported (would need a union) - criteriaQuery.generateSQLAlias(), - criteriaQuery - ); + + createAndSetInnerQuery( criteriaQuery, factory ); - params = innerQuery.getQueryParameters(); //TODO: bad lifecycle.... - types = innerQuery.getProjectedTypes(); - - //String filter = persister.filterFragment( innerQuery.getRootSQLALias(), session.getEnabledFilters() ); - - String sql = new Select( factory.getDialect() ) - .setWhereClause( innerQuery.getWhereCondition() ) - .setGroupByClause( innerQuery.getGroupBy() ) - .setSelectClause( innerQuery.getSelect() ) - .setFromClause( - persister.fromTableFragment( innerQuery.getRootSQLALias() ) + - persister.fromJoinFragment( innerQuery.getRootSQLALias(), true, false ) - ) - .toStatementString(); - + CriteriaJoinWalker walker = new CriteriaJoinWalker( + persister, + innerQuery, + factory, + criteriaImpl, + criteriaImpl.getEntityOrClassName(), + new HashMap(), + innerQuery.getRootSQLALias()); + + String sql = walker.getSQLString(); + final StringBuffer buf = new StringBuffer() .append( toLeftSqlString(criteria, criteriaQuery) ); if (op!=null) buf.append(' ').append(op).append(' '); @@ -77,13 +67,48 @@ public TypedValue[] getTypedValues(Criteria criteria, CriteriaQuery criteriaQuery) throws HibernateException { - Type[] types = params.getPositionalParameterTypes(); - Object[] values = params.getPositionalParameterValues(); - TypedValue[] tv = new TypedValue[types.length]; - for ( int i=0; i<types.length; i++ ) { - tv[i] = new TypedValue( types[i], values[i], EntityMode.POJO ); + //the following two lines were added to ensure that this.params is not null, which + //can happen with two-deep nested subqueries + SessionFactoryImplementor factory = criteriaQuery.getFactory(); + createAndSetInnerQuery(criteriaQuery, factory); + + Type[] ppTypes = params.getPositionalParameterTypes(); + Object[] ppValues = params.getPositionalParameterValues(); + TypedValue[] tv = new TypedValue[ppTypes.length]; + for ( int i=0; i<ppTypes.length; i++ ) { + tv[i] = new TypedValue( ppTypes[i], ppValues[i], EntityMode.POJO ); } return tv; } + /** + * Creates the inner query used to extract some useful information about + * types, since it is needed in both methods. + * @param criteriaQuery + * @param factory + */ + private void createAndSetInnerQuery(CriteriaQuery criteriaQuery, final SessionFactoryImplementor factory) { + if ( innerQuery == null ) { + //with two-deep subqueries, the same alias would get generated for + //both using the old method (criteriaQuery.generateSQLAlias()), so + //that is now used as a fallback if the main criteria alias isn't set + String alias; + if ( this.criteriaImpl.getAlias() == null ) { + alias = criteriaQuery.generateSQLAlias(); + } else { + alias = this.criteriaImpl.getAlias() + "_"; + } + + innerQuery = new CriteriaQueryTranslator( + factory, + criteriaImpl, + criteriaImpl.getEntityOrClassName(), //implicit polymorphism not supported (would need a union) + alias, + criteriaQuery + ); + + params = innerQuery.getQueryParameters(); + types = innerQuery.getProjectedTypes(); + } + } } Modified: trunk/Hibernate3/code/core/src/main/java/org/hibernate/loader/AbstractEntityJoinWalker.java =================================================================== --- trunk/Hibernate3/code/core/src/main/java/org/hibernate/loader/AbstractEntityJoinWalker.java 2007-06-13 18:19:43 UTC (rev 11685) +++ trunk/Hibernate3/code/core/src/main/java/org/hibernate/loader/AbstractEntityJoinWalker.java 2007-06-13 18:31:11 UTC (rev 11686) @@ -26,12 +26,16 @@ public abstract class AbstractEntityJoinWalker extends JoinWalker { private final OuterJoinLoadable persister; - private String alias; - + private final String alias; + public AbstractEntityJoinWalker(OuterJoinLoadable persister, SessionFactoryImplementor factory, Map enabledFilters) { + this( persister, factory, enabledFilters, null ); + } + + public AbstractEntityJoinWalker(OuterJoinLoadable persister, SessionFactoryImplementor factory, Map enabledFilters, String alias) { super( factory, enabledFilters ); this.persister = persister; - alias = generateRootAlias( persister.getEntityName() ); + this.alias = ( alias == null ) ? generateRootAlias( persister.getEntityName() ) : alias; } protected final void initAll( @@ -39,17 +43,15 @@ final String orderByString, final LockMode lockMode) throws MappingException { - walkEntityTree( persister, getAlias() ); - List allAssociations = new ArrayList(); allAssociations.addAll(associations); - allAssociations.add( new OuterJoinableAssociation( + allAssociations.add( new OuterJoinableAssociation( persister.getEntityType(), - null, - null, - alias, - JoinFragment.LEFT_OUTER_JOIN, + null, + null, + alias, + JoinFragment.LEFT_OUTER_JOIN, getFactory(), CollectionHelper.EMPTY_MAP ) ); @@ -57,7 +59,6 @@ initPersisters(allAssociations, lockMode); initStatementString( whereString, orderByString, lockMode); } - protected final void initProjection( final String projectionString, final String whereString, Modified: trunk/Hibernate3/code/core/src/main/java/org/hibernate/loader/criteria/CriteriaJoinWalker.java =================================================================== --- trunk/Hibernate3/code/core/src/main/java/org/hibernate/loader/criteria/CriteriaJoinWalker.java 2007-06-13 18:19:43 UTC (rev 11685) +++ trunk/Hibernate3/code/core/src/main/java/org/hibernate/loader/criteria/CriteriaJoinWalker.java 2007-06-13 18:31:11 UTC (rev 11686) @@ -8,7 +8,6 @@ import org.hibernate.Criteria; import org.hibernate.FetchMode; -import org.hibernate.HibernateException; import org.hibernate.LockMode; import org.hibernate.MappingException; import org.hibernate.engine.CascadeStyle; @@ -18,7 +17,6 @@ import org.hibernate.persister.entity.Joinable; import org.hibernate.persister.entity.OuterJoinLoadable; import org.hibernate.persister.entity.Queryable; -import org.hibernate.sql.JoinFragment; import org.hibernate.type.AssociationType; import org.hibernate.type.Type; import org.hibernate.type.TypeFactory; @@ -57,9 +55,19 @@ final SessionFactoryImplementor factory, final CriteriaImpl criteria, final String rootEntityName, - final Map enabledFilters) - throws HibernateException { - super(persister, factory, enabledFilters); + final Map enabledFilters) { + this(persister, translator, factory, criteria, rootEntityName, enabledFilters, null); + } + + public CriteriaJoinWalker( + final OuterJoinLoadable persister, + final CriteriaQueryTranslator translator, + final SessionFactoryImplementor factory, + final CriteriaImpl criteria, + final String rootEntityName, + final Map enabledFilters, + final String alias) { + super(persister, factory, enabledFilters, alias); this.translator = translator; Modified: trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/criteria/CriteriaQueryTest.java =================================================================== --- trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/criteria/CriteriaQueryTest.java 2007-06-13 18:19:43 UTC (rev 11685) +++ trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/criteria/CriteriaQueryTest.java 2007-06-13 18:31:11 UTC (rev 11686) @@ -169,8 +169,7 @@ .add( Subqueries.eq("Gavin King", dc2) ) .list(); - //TODO: join in subselect: HHH-952 - /*DetachedCriteria dc3 = DetachedCriteria.forClass(Student.class, "st") + DetachedCriteria dc3 = DetachedCriteria.forClass(Student.class, "st") .createCriteria("enrolments") .createCriteria("course") .add( Property.forName("description").eq("Hibernate Training") ) @@ -178,7 +177,7 @@ session.createCriteria(Enrolment.class, "e") .add( Subqueries.eq("Gavin King", dc3) ) - .list();*/ + .list(); session.delete(enrolment2); session.delete(gavin);

18 years, 5 months

1
0
0 / 0

Hibernate SVN: r11685 - trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2007-06-13 14:19:43 -0400 (Wed, 13 Jun 2007) New Revision: 11685 Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/pom.xml Log: cleanup Modified: trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/pom.xml =================================================================== --- trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/pom.xml 2007-06-13 18:19:17 UTC (rev 11684) +++ trunk/sandbox/maven-poc/plugins/maven-jboss-docbook-plugin/pom.xml 2007-06-13 18:19:43 UTC (rev 11685) @@ -100,18 +100,20 @@ <artifactId>saxon</artifactId> <version>6.5.3</version> </dependency> + <dependency> <groupId>fop</groupId> <artifactId>fop</artifactId> <version>0.20.5</version> </dependency> -  +--> + <dependency> <groupId>batik</groupId> <artifactId>batik-1.5-fop</artifactId>

18 years, 5 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

hibernate-commits June 2007