[SHRINKDESC-124] MetadataParser verbose flag does not take effect

shrinkwrap · Aug 26, 2012 · 0293f43 · 0293f43
1 parent 79b3c6a
commit 0293f43
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 17 deletions.
diff --git a/metadata-parser/src/main/java/org/jboss/shrinkwrap/descriptor/metadata/MetadataParser.java b/metadata-parser/src/main/java/org/jboss/shrinkwrap/descriptor/metadata/MetadataParser.java
@@ -99,7 +99,7 @@ public void parse(final MetadataParserPath path, final List<?> confList, final b
          metadataDescriptor.setGenerateClasses(metadataConf.generateClasses);
          metadata.getMetadataDescriptorList().add(metadataDescriptor);
 
-         log.info(metadataConf.getPathToXsd());
+         log.fine(metadataConf.getPathToXsd());
          if (metadataConf.getPathToXsd().endsWith(".dtd"))
          {
             final InputSource in = new InputSource(new FileReader(metadataConf.getPathToXsd()));
@@ -114,7 +114,7 @@ public void parse(final MetadataParserPath path, final List<?> confList, final b
             final DocumentBuilder loader = factory.newDocumentBuilder();
             final Document document = loader.parse(metadataConf.getPathToXsd());
 
-            log.info(document.getDocumentURI());
+            log.fine(document.getDocumentURI());
             final DocumentTraversal traversal = (DocumentTraversal) document;
             final TreeWalker walker = traversal.createTreeWalker(document.getDocumentElement(),
                   NodeFilter.SHOW_ELEMENT, null, true);
@@ -146,22 +146,23 @@ public void parse(final MetadataParserPath path, final List<?> confList, final b
 
       if (path.getPathToApi() != null && path.getPathToImpl() != null)
       {
-         generateCode(path);
+         generateCode(path, verbose);
       }
    }
 
    /**
     * Generates source code by applying the <code>ddJavaAll.xsl</code> XSLT extracted from the resource stream.
     * @throws TransformerException
     */
-   public void generateCode(final MetadataParserPath path) throws TransformerException
+   public void generateCode(final MetadataParserPath path, final boolean verbose) throws TransformerException
    {
       /** initialize the map which will overwrite global parameters as defined in metadata.xsl/ddJava.xsl */
       final Map<String, String> xsltParameters = new HashMap<String, String>();
       xsltParameters.put("gOutputFolder", path.getPathToImpl());
       xsltParameters.put("gOutputFolderApi", path.getPathToApi());
       xsltParameters.put("gOutputFolderTest", path.getPathToTest());
       xsltParameters.put("gOutputFolderService", path.getPathToServices());
+      xsltParameters.put("gVerbose", Boolean.toString(verbose));
 
       final InputStream is = MetadataParser.class.getResourceAsStream("/META-INF/ddJavaAll.xsl");
       log.fine("Stream resource: " + is);

diff --git a/metadata-parser/src/main/java/org/jboss/shrinkwrap/descriptor/metadata/dom/DomWriter.java b/metadata-parser/src/main/java/org/jboss/shrinkwrap/descriptor/metadata/dom/DomWriter.java
@@ -410,7 +410,7 @@ public void write(final Metadata metadata, final String pathToMetadata)
 
          transformer.transform(source, result);
 
-         log.info("Saved: " + file.getAbsolutePath());
+         log.fine("Saved: " + file.getAbsolutePath());
 
       }
       catch (ParserConfigurationException pce)

diff --git a/...parser/src/main/java/org/jboss/shrinkwrap/descriptor/metadata/filter/XsdDatatypeEnum.java b/...parser/src/main/java/org/jboss/shrinkwrap/descriptor/metadata/filter/XsdDatatypeEnum.java
@@ -84,7 +84,6 @@ public boolean isDataType(final String tagName)
                 {
                     if (items[1].equals(value.getDescription()))
                     {
-                        System.out.println("isDataType: "+ tagName + " found");
                         return true;
                     }
                 }

diff --git a/metadata-parser/src/main/resources/META-INF/ddJavaAll.xsl b/metadata-parser/src/main/resources/META-INF/ddJavaAll.xsl
@@ -7,6 +7,7 @@
     <xsl:param name="gOutputFolderApi" select="'../../../../../api/src/main/java'"/>
     <xsl:param name="gOutputFolderTest" select="''"/>
     <xsl:param name="gOutputFolderService" select="''"/>
+    <xsl:param name="gVerbose" as="xs:boolean" select="false()"/>
     <xsl:variable name="vLower" select="'abcdefghijklmnopqrstuvwxyz'"/>
     <xsl:variable name="vUpper" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'"/>
     <xsl:variable name="gDataTypes" select="//datatypes"/>
@@ -85,7 +86,9 @@
             <xsl:if test="xdd:isGenerateClassTrue(@package)">
                 <xsl:variable name="vClassname" select="xdd:createPascalizedName(@name, '')"/>
                 <xsl:variable name="vFilename" select="xdd:createPath($gOutputFolderApi, @package, $vClassname, 'java')"/>
-                <xsl:message select="concat('Generating Enum: ', $vClassname)"/>
+                <xsl:if test="$gVerbose">
+                    <xsl:message select="concat('Generating Enum: ', $vClassname)"/>
+                </xsl:if>
                 <xsl:result-document href="{$vFilename}">
                     <xsl:value-of select="xdd:writeCopyright()"/>
                     <xsl:value-of select="xdd:writePackageLine(@package)"/>
@@ -143,7 +146,9 @@
             <xsl:variable name="vClassname" select="'package-info'"/>
             <xsl:variable name="vSchema" select=" substring-after(@schema, '../xsd/')"/>
             <xsl:variable name="vFilename" select="xdd:createPath($gOutputFolderApi, @name, $vClassname,'java')"/>
-            <xsl:message select="concat('Generating api package-info: ', $vFilename)"/>
+            <xsl:if test="$gVerbose">
+                <xsl:message select="concat('Generating api package-info: ', $vFilename)"/>
+            </xsl:if>
             <xsl:result-document href="{$vFilename}">
                 <xsl:value-of select="concat(' /**', '&#10;')"/>
                 <xsl:value-of select="concat('  * Provides the interfaces and enumeration types as defined in the schema ', $vSchema, '&#10;')"/>
@@ -156,7 +161,9 @@
             <xsl:variable name="vClassname" select="'package-info'"/>
             <xsl:variable name="vSchema" select=" substring-after(@schema, '../xsd/')"/>
             <xsl:variable name="vFilename" select="xdd:createPath($gOutputFolder, @name, $vClassname,'java')"/>
-            <xsl:message select="concat('Generating impl package-info: ', $vFilename)"/>
+            <xsl:if test="$gVerbose">
+                <xsl:message select="concat('Generating impl package-info: ', $vFilename)"/>
+            </xsl:if>
             <xsl:result-document href="{$vFilename}">
                 <xsl:value-of select="concat(' /**', '&#10;')"/>
                 <xsl:value-of select="concat('  * Provides the implementation classes as defined in the schema ', $vSchema, '&#10;')"/>
@@ -189,8 +196,9 @@
             <xsl:variable name="vSchema" select=" substring-after(@schemaName, '../xsd/')"/>
             <xsl:variable name="vInterfaceName" select="@name"/>
             <xsl:variable name="vFileName" select="concat($gOutputFolderService, '/' , $vPackage, '.' , $vInterfaceName)"/>
-            <xsl:message select="concat('Generating service file: ', $vFileName)"/>
-
+            <xsl:if test="$gVerbose">
+                <xsl:message select="concat('Generating service file: ', $vFileName)"/>
+            </xsl:if>
             <xsl:result-document href="{$vFileName}">
                 <xsl:variable name="vPackageImpl" select="@packageImpl"/>
 <!--                <xsl:variable name="vClassnameImpl" select="xdd:createPascalizedName($pDescriptor/@schemaName, 'DescriptorImpl')"/>-->
@@ -233,7 +241,9 @@
             <xsl:text>&#10;</xsl:text>
         </xsl:if>
         <xsl:if test="$vClassname">
-            <xsl:message select="concat('Generating Interface: ', $vClassname)"/>
+            <xsl:if test="$gVerbose">
+                <xsl:message select="concat('Generating Interface: ', $vClassname)"/>
+            </xsl:if>
             <xsl:result-document href="{$vFilename}">
                 <xsl:value-of select="xdd:writeCopyright()"/>
                 <xsl:value-of select="xdd:writePackageLine(@packageApi)"/>
@@ -346,7 +356,9 @@
         <xsl:variable name="vSchema" select=" substring-after(@schemaName, '../xsd/')"/>
 <!--        <xsl:variable name="vClassname" select="xdd:createPascalizedName(xdd:checkForReservedKeywords($pDescriptor/@schemaName), 'Descriptor')"/>-->
         <xsl:variable name="vClassname" select="@name"/>
-        <xsl:message select="concat('Generating Descriptor Api: ', $vClassname)"/>
+        <xsl:if test="$gVerbose">
+            <xsl:message select="concat('Generating Descriptor Api: ', $vClassname)"/>
+        </xsl:if>
         <xsl:if test="$vClassname">
             <xsl:variable name="vFilename" select="xdd:createPath($gOutputFolderApi, $vPackage, $vClassname, 'java')"/>
             <xsl:result-document href="{$vFilename}">
@@ -389,7 +401,9 @@
         <xsl:variable name="vPackage" select="@packageImpl"/>
         <xsl:variable name="vInterfaceName" select="xdd:createPascalizedName(xdd:checkForReservedKeywords($pClass/@name), '')"/>
         <xsl:variable name="vClassnameImpl" select="xdd:createPascalizedName(xdd:checkForReservedKeywords($pClass/@name), 'Impl')"/>
-        <xsl:message select="concat('Generating Implementation Class: ', $vClassnameImpl)"/>
+        <xsl:if test="$gVerbose">
+            <xsl:message select="concat('Generating Implementation Class: ', $vClassnameImpl)"/>
+        </xsl:if>
         <xsl:if test="$vClassnameImpl">
             <xsl:variable name="vFilename" select="xdd:createPath($gOutputFolder, $vPackage, $vClassnameImpl, 'java')"/>
             <xsl:result-document href="{$vFilename}">
@@ -449,8 +463,9 @@
 
         <xsl:variable name="vInterfaceName" select="@name"/>
         <xsl:variable name="vClassnameImpl" select=" concat(@name, 'Impl')"/>
-
-        <xsl:message select="concat('Generating DescriptorImpl: ', $vClassnameImpl)"/>
+        <xsl:if test="$gVerbose">
+            <xsl:message select="concat('Generating DescriptorImpl: ', $vClassnameImpl)"/>
+        </xsl:if>
         <xsl:if test="$vClassnameImpl">
             <xsl:variable name="vFilename" select="xdd:createPath($gOutputFolder, $vPackage, $vClassnameImpl, 'java')"/>
             <xsl:result-document href="{$vFilename}">
@@ -516,7 +531,9 @@
         <xsl:variable name="vInterfaceName" select="xdd:createPascalizedName(xdd:checkForReservedKeywords($pName), '')"/>
         <xsl:variable name="vClassnameImpl" select="xdd:createPascalizedName(xdd:checkForReservedKeywords($pName), 'Impl')"/>
         <xsl:variable name="vTestClassname" select="xdd:createPascalizedName(xdd:checkForReservedKeywords($pName), 'ImplTestCase')"/>
-        <xsl:message select="concat('Generating Test Class: ', $vTestClassname)"/>
+        <xsl:if test="$gVerbose">
+            <xsl:message select="concat('Generating Test Class: ', $vTestClassname)"/>
+        </xsl:if>
         <xsl:if test="$vTestClassname">
             <xsl:variable name="vFilename" select="xdd:createPath($gOutputFolderTest, $vPackage, $vTestClassname, 'java')"/>
             <xsl:result-document href="{$vFilename}">