shrinkwrap / descriptors

ShrinkWrap subproject for creating Archive Descriptors
Apache License 2.0
26 stars 30 forks source link

Use Saxon-HE 9-4-0-9 ? #105

Open puntogil opened 8 years ago

puntogil commented 8 years ago

hi any plans for update saxon to 9.4 ? i wrote a little patch used for descriptors-2.0.0-alpha-8:

--- descriptors-2.0.0-alpha-8/metadata-parser/src/main/java/org/jboss/shrinkwrap/descriptor/metadata/MetadataParser.java    2015-09-29 21:44:03.000000000 +0200
+++ descriptors-2.0.0-alpha-8.saxon/metadata-parser/src/main/java/org/jboss/shrinkwrap/descriptor/metadata/MetadataParser.java  2016-03-09 12:45:59.040471214 +0100
@@ -174,12 +174,12 @@
      */
     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>();
+        final Map<String, Object> xsltParameters = new HashMap<String, Object>();
         xsltParameters.put("gOutputFolder", getURIPath(path.getPathToImpl()));
         xsltParameters.put("gOutputFolderApi", getURIPath(path.getPathToApi()));
         xsltParameters.put("gOutputFolderTest", getURIPath(path.getPathToTest()));
         xsltParameters.put("gOutputFolderService", getURIPath(path.getPathToServices()));
-        xsltParameters.put("gVerbose", Boolean.toString(verbose));
+        xsltParameters.put("gVerbose", verbose);

         final InputStream is = MetadataParser.class.getResourceAsStream("/META-INF/ddJavaAll.xsl");
         if (log.isLoggable(Level.FINE)) {
--- descriptors-2.0.0-alpha-8/metadata-parser/src/main/java/org/jboss/shrinkwrap/descriptor/metadata/xslt/XsltTransformer.java  2015-09-29 21:44:03.000000000 +0200
+++ descriptors-2.0.0-alpha-8.saxon/metadata-parser/src/main/java/org/jboss/shrinkwrap/descriptor/metadata/xslt/XsltTransformer.java    2016-03-09 12:50:02.467759793 +0100
@@ -49,7 +49,7 @@
      * @throws TransformerException
      */
     public static void simpleTransform(final String sourcePath, final String xsltPath, final String resultDir,
-        final Map<String, String> parameters) throws TransformerException {
+        final Map<String, Object> parameters) throws TransformerException {
         final TransformerFactory tFactory = TransformerFactory.newInstance("net.sf.saxon.TransformerFactoryImpl", null);
         final Transformer transformer = tFactory.newTransformer(new StreamSource(new File(xsltPath)));
         applyParameters(transformer, parameters);
@@ -70,7 +70,7 @@
      * @throws TransformerException
      */
     public static void simpleTransform(final String sourcePath, final StreamSource xsltSource, final String resultDir,
-        final Map<String, String> parameters) throws TransformerException {
+        final Map<String, Object> parameters) throws TransformerException {
         final TransformerFactory tFactory = TransformerFactory.newInstance("net.sf.saxon.TransformerFactoryImpl", null);
         final Transformer transformer = tFactory.newTransformer(xsltSource);
         applyParameters(transformer, parameters);
@@ -92,7 +92,7 @@
      * @throws TransformerException
      */
     public static void simpleTransform(final String contextFile, final InputStream xsltSource, final File result,
-        final Map<String, String> parameters) throws TransformerException {
+        final Map<String, Object> parameters) throws TransformerException {
         final TransformerFactory tFactory = TransformerFactory.newInstance("net.sf.saxon.TransformerFactoryImpl", null);
         final Transformer transformer = tFactory.newTransformer(new StreamSource(xsltSource));
         applyParameters(transformer, parameters);
@@ -106,7 +106,7 @@
      * @param transformer
      * @param parameters
      */
-    private static void applyParameters(final Transformer transformer, final Map<String, String> parameters) {
+    private static void applyParameters(final Transformer transformer, final Map<String, Object> parameters) {
         final Set<String> keys = parameters.keySet();
         for (Iterator<String> iterator = keys.iterator(); iterator.hasNext();) {
             final String key = iterator.next();

thanks in advance