Merge pull request #999 from lat-lon/cleanUpXmlDependencies-5801

Added support of XSLT 2.0
deegree · Jan 24, 2020 · dff6fc9 · dff6fc9
2 parents 51a8ebe + a9d84db
commit dff6fc9
Show file tree

Hide file tree

Showing 15 changed files with 170 additions and 62 deletions.
diff --git a/deegree-core/deegree-core-base/pom.xml b/deegree-core/deegree-core-base/pom.xml
@@ -38,10 +38,6 @@
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
     </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/deegree-core/deegree-core-commons/pom.xml b/deegree-core/deegree-core-commons/pom.xml
@@ -71,6 +71,10 @@
       <groupId>xerces</groupId>
       <artifactId>xercesImpl</artifactId>
     </dependency>
+    <dependency>
+      <groupId>net.sf.saxon</groupId>
+      <artifactId>Saxon-HE</artifactId>
+    </dependency>
     <dependency>
       <groupId>commons-dbcp</groupId>
       <artifactId>commons-dbcp</artifactId>
@@ -103,14 +107,6 @@
       <groupId>org.deegree</groupId>
       <artifactId>deegree-ogcschemas</artifactId>
     </dependency>
-    <dependency>
-      <groupId>xalan</groupId>
-      <artifactId>xalan</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>xalan</groupId>
-      <artifactId>serializer</artifactId>
-    </dependency>
     <dependency>
       <groupId>javax.mail</groupId>
       <artifactId>mail</artifactId>

diff --git a/deegree-core/deegree-core-commons/src/test/java/org/deegree/commons/xml/XsltUtilsTest.java b/deegree-core/deegree-core-commons/src/test/java/org/deegree/commons/xml/XsltUtilsTest.java
@@ -0,0 +1,53 @@
+package org.deegree.commons.xml;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.net.URL;
+
+import javax.xml.transform.TransformerFactory;
+
+import org.junit.Test;
+
+/**
+ * @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz </a>
+ */
+public class XsltUtilsTest {
+
+    @Test
+    public void verifyXslt_20_ImplementationIsAvailable() {
+        TransformerFactory factory = TransformerFactory.newInstance();
+        assertThat( factory, is( instanceOf( net.sf.saxon.TransformerFactoryImpl.class ) ) );
+    }
+
+    @Test
+    public void testXslt10()
+                            throws Exception {
+        InputStream docToTransform = XsltUtilsTest.class.getResourceAsStream( "feature.gml" );
+        URL xslt = XsltUtilsTest.class.getResource( "featureToHtml-Xslt10.xslt" );
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        XsltUtils.transform( docToTransform, xslt, bos );
+        bos.close();
+
+        assertThat( bos.toString(), containsString( "Identifier: i1 Name: feature name 1 Props: 1a, 1b" ) );
+        assertThat( bos.toString(), containsString( "Identifier: i2 Name: feature name 2 Props: 2a, 2b, 2c" ) );
+    }
+
+    @Test
+    public void testXslt20()
+                            throws Exception {
+        InputStream docToTransform = XsltUtilsTest.class.getResourceAsStream( "feature.gml" );
+        URL xslt = XsltUtilsTest.class.getResource( "featureToHtml-Xslt20.xslt" );
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        XsltUtils.transform( docToTransform, xslt, bos );
+        bos.close();
+
+        assertThat( bos.toString(), containsString( "Identifier: i1 Name: feature name 1 Props: 1a, 1b" ) );
+        assertThat( bos.toString(), containsString( "Identifier: i2 Name: feature name 2 Props: 2a, 2b, 2c" ) );
+    }
+
+}
diff --git a/deegree-core/deegree-core-commons/src/test/resources/org/deegree/commons/xml/feature.gml b/deegree-core/deegree-core-commons/src/test/resources/org/deegree/commons/xml/feature.gml
@@ -0,0 +1,25 @@
+<gml:FeatureCollection xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:app="http://deegree.org/app">
+  <gml:boundedBy>
+    <gml:Envelope srsName="EPSG:25833">
+      <gml:lowerCorner>334830.868300 5871407.128200</gml:lowerCorner>
+      <gml:upperCorner>358634.056200 5900836.645100</gml:upperCorner>
+    </gml:Envelope>
+  </gml:boundedBy>
+  <gml:featureMember>
+    <app:Instance gml:id="Instance_1">
+      <app:identifier>i1</app:identifier>
+      <app:name>feature name 1</app:name>
+      <app:prop1>1a</app:prop1>
+      <app:prop1>1b</app:prop1>
+    </app:Instance>
+  </gml:featureMember>
+  <gml:featureMember>
+    <app:Instance gml:id="Instance_2">
+      <app:identifier>i2</app:identifier>
+      <app:name>feature name 2</app:name>
+      <app:prop1>2a</app:prop1>
+      <app:prop1>2b</app:prop1>
+      <app:prop1>2c</app:prop1>
+    </app:Instance>
+  </gml:featureMember>
+</gml:FeatureCollection>
diff --git a/...deegree-core-commons/src/test/resources/org/deegree/commons/xml/featureToHtml-Xslt10.xslt b/...deegree-core-commons/src/test/resources/org/deegree/commons/xml/featureToHtml-Xslt10.xslt
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:app="http://deegree.org/app">
+
+  <xsl:output method="html" indent="yes"/>
+
+  <xsl:template match="/">
+    <html lang="de">
+      <head/>
+      <body>
+        <div>
+          <ul>
+            <xsl:for-each select="//app:Instance">
+              <xsl:apply-templates select="."/>
+            </xsl:for-each>
+          </ul>
+        </div>
+      </body>
+    </html>
+  </xsl:template>
+
+  <xsl:template match="app:Instance">
+    <li>
+      <xsl:text>Identifier: </xsl:text>
+      <xsl:value-of select="app:identifier"/>
+      <xsl:text> Name: </xsl:text>
+      <xsl:value-of select="app:name"/>
+      <xsl:text> Props: </xsl:text>
+      <xsl:for-each select="app:prop1">
+        <xsl:value-of select="."/>
+        <xsl:if test="position() != last()">, </xsl:if>
+      </xsl:for-each>
+    </li>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/...deegree-core-commons/src/test/resources/org/deegree/commons/xml/featureToHtml-Xslt20.xslt b/...deegree-core-commons/src/test/resources/org/deegree/commons/xml/featureToHtml-Xslt20.xslt
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<xsl:stylesheet version="2.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:app="http://deegree.org/app">
+
+  <xsl:output method="html" indent="yes"/>
+
+  <xsl:template match="/">
+    <html lang="de">
+      <head/>
+      <body>
+        <h1>Ergebnis GFI</h1>
+        <div>
+          <ul>
+            <xsl:for-each select="//app:Instance">
+              <xsl:apply-templates select="."/>
+            </xsl:for-each>
+          </ul>
+        </div>
+      </body>
+    </html>
+  </xsl:template>
+
+  <xsl:template match="app:Instance">
+    <li>
+      <xsl:text> </xsl:text>
+      <xsl:value-of select="('Identifier:', app:identifier, 'Name:', app:name)" separator=" "/>
+      <xsl:text> Props: </xsl:text>
+      <xsl:value-of select="app:prop1" separator=", "/>
+    </li>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/deegree-core/deegree-core-coverage/pom.xml b/deegree-core/deegree-core-coverage/pom.xml
@@ -47,10 +47,6 @@
       <groupId>net.sf.ehcache</groupId>
       <artifactId>ehcache-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-    </dependency>
     <dependency>
       <groupId>jai</groupId>
       <artifactId>jai-codec</artifactId>

diff --git a/deegree-core/deegree-core-protocol/deegree-protocol-wms/pom.xml b/deegree-core/deegree-core-protocol/deegree-protocol-wms/pom.xml
@@ -49,10 +49,6 @@
       <artifactId>deegree-core-layer</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/deegree-services/deegree-services-wms/pom.xml b/deegree-services/deegree-services-wms/pom.xml
@@ -53,10 +53,6 @@
       <artifactId>deegree-core-filterfunctions</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.deegree</groupId>
       <artifactId>deegree-mdstore-commons</artifactId>

diff --git a/...esources/org/deegree/services/wms/controller/capabilities/serialize/capabilities2html.xsl b/...esources/org/deegree/services/wms/controller/capabilities/serialize/capabilities2html.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/TR/REC-html40"
-  xmlns:wms="http://www.opengis.net/wms">
+  xmlns:wms="http://www.opengis.net/wms" version="1.0">
 
   <xsl:output method="html" />
 

diff --git a/...wms/src/test/resources/org/deegree/services/wms/controller/exceptions/exceptions2html.xsl b/...wms/src/test/resources/org/deegree/services/wms/controller/exceptions/exceptions2html.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/TR/REC-html40"
-  xmlns:ogc="http://www.opengis.net/ogc">
+  xmlns:ogc="http://www.opengis.net/ogc" version="1.0">
 
   <xsl:output method="html" />
 

diff --git a/deegree-tools/deegree-tools-base/pom.xml b/deegree-tools/deegree-tools-base/pom.xml
@@ -40,10 +40,6 @@
       <artifactId>deegree-featurestore-sql</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.deegree</groupId>
       <artifactId>deegree-mdstore-iso</artifactId>

diff --git a/...ols/deegree-tools-migration/src/main/java/org/deegree/tools/migration/ThemeExtractor.java b/...ols/deegree-tools-migration/src/main/java/org/deegree/tools/migration/ThemeExtractor.java
@@ -37,18 +37,16 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.InputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.URISyntaxException;
 import java.nio.charset.Charset;
 import java.util.List;
 
 import javax.xml.stream.XMLStreamException;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
 
+import org.deegree.commons.xml.XsltUtils;
 import org.deegree.services.OWS;
 import org.deegree.services.OwsManager;
 import org.deegree.services.wms.controller.WMSController;
@@ -68,27 +66,22 @@
  */
 public class ThemeExtractor {
 
-    private final Workspace workspace;
-
-    private Transformer transformer;
-
-    public ThemeExtractor( Workspace workspace ) throws TransformerConfigurationException {
-        this.workspace = workspace;
-        TransformerFactory fac = TransformerFactory.newInstance();
-        InputStream xsl = ThemeExtractor.class.getResourceAsStream( "extracttheme.xsl" );
-        this.transformer = fac.newTransformer( new StreamSource( xsl ) );
+    private ThemeExtractor() {
     }
 
-    public void transform()
-                            throws TransformerException, XMLStreamException {
+    public static void transform( Workspace workspace )
+                            throws TransformerException, XMLStreamException, URISyntaxException, IOException {
         OwsManager mgr = workspace.getResourceManager( OwsManager.class );
         List<OWS> wmss = mgr.getByOWSClass( WMSController.class );
         for ( OWS ows : wmss ) {
             ResourceMetadata<? extends Resource> md = ows.getMetadata();
             ResourceIdentifier<? extends Resource> id = md.getIdentifier();
             File loc = md.getLocation().resolveToFile( id.getId() + ".xml" );
             ByteArrayOutputStream bos = new ByteArrayOutputStream();
-            transformer.transform( new StreamSource( loc ), new StreamResult( bos ) );
+
+            FileInputStream doc = new FileInputStream( loc );
+            XsltUtils.transform( doc, ThemeExtractor.class.getResource( "extracttheme.xsl" ), bos );
+            doc.close();
 
             ThemeXmlStreamEncoder.writeOut( bos );
 

diff --git a/...-tools/deegree-tools-migration/src/main/java/org/deegree/tools/migration/WMSMigrator.java b/...-tools/deegree-tools-migration/src/main/java/org/deegree/tools/migration/WMSMigrator.java
@@ -69,7 +69,7 @@ public static void main( String[] args ) {
             ws = new DefaultWorkspace( wsloc );
             ws.initAll();
             new FeatureLayerExtractor( ws ).extract();
-            new ThemeExtractor( ws ).transform();
+            ThemeExtractor.transform(ws);
         } catch ( Throwable e ) {
             System.out.println( "There was a problem transforming the configuration." );
             e.printStackTrace();

diff --git a/pom.xml b/pom.xml
@@ -660,19 +660,7 @@
       <dependency>
         <groupId>xerces</groupId>
         <artifactId>xercesImpl</artifactId>
-        <version>2.11.0</version>
-      </dependency>
-      <dependency>
-        <groupId>xalan</groupId>
-        <artifactId>xalan</artifactId>
-        <version>2.7.2</version>
-        <scope>runtime</scope>
-      </dependency>
-      <dependency>
-        <groupId>xalan</groupId>
-        <artifactId>serializer</artifactId>
-        <version>2.7.2</version>
-        <scope>runtime</scope>
+        <version>2.12.0</version>
       </dependency>
       <dependency>
         <groupId>de.odysseus.staxon</groupId>
@@ -689,6 +677,11 @@
         <artifactId>netty</artifactId>
         <version>3.2.10.Final</version>
       </dependency>
+      <dependency>
+        <groupId>net.sf.saxon</groupId>
+        <artifactId>Saxon-HE</artifactId>
+        <version>9.9.1-4</version>
+      </dependency>
       <!-- JAI -->
       <dependency>
         <groupId>jai</groupId>