From: <blu...@us...> - 2008-10-27 13:38:59
|
Revision: 1637 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=1637&view=rev Author: bluenetdevteam Date: 2008-10-27 13:38:51 +0000 (Mon, 27 Oct 2008) Log Message: ----------- Fix gast so that it can detect the xslt transformerfactory if different from xalan by inserting code to 1. make its URLClassLoader the context class loader so jaxp can use it and 2. read the class name of the xslt transformer factory from the appropriate place in the WEB-INF directory Other small fixes to sort categories and privileges for presentation. Modified Paths: -------------- sandbox/BlueNetMEST/src/org/fao/gast/boot/Util.java sandbox/BlueNetMEST/web/geonetwork/xsl/metadata-admin.xsl sandbox/BlueNetMEST/web/geonetwork/xsl/metadata-category.xsl Modified: sandbox/BlueNetMEST/src/org/fao/gast/boot/Util.java =================================================================== --- sandbox/BlueNetMEST/src/org/fao/gast/boot/Util.java 2008-10-26 13:31:14 UTC (rev 1636) +++ sandbox/BlueNetMEST/src/org/fao/gast/boot/Util.java 2008-10-27 13:38:51 UTC (rev 1637) @@ -23,7 +23,9 @@ package org.fao.gast.boot; +import java.io.BufferedReader; import java.io.File; +import java.io.FileReader; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.net.URL; @@ -32,6 +34,7 @@ import java.util.ArrayList; import javax.swing.JOptionPane; +import javax.xml.transform.TransformerFactory; //============================================================================== @@ -127,7 +130,18 @@ String args[]) throws Exception { URLClassLoader mcl = new URLClassLoader(jarFiles); + Thread.currentThread().setContextClassLoader(mcl); + FileReader fReader = new FileReader(appPath + "/web/geonetwork/WEB-INF/classes/META-INF/services/javax.xml.transform.TransformerFactory"); + if (fReader != null) { + BufferedReader bReader = new BufferedReader(fReader); + String trans = bReader.readLine(); + if (trans != null) { + System.setProperty("javax.xml.transform.TransformerFactory",trans); + } + } + System.out.println("GAST is using XSLT factory : "+ TransformerFactory.newInstance().newTransformer().getClass().getName()); + try { Starter starter = (Starter) Class.forName(className, true, mcl).newInstance(); Modified: sandbox/BlueNetMEST/web/geonetwork/xsl/metadata-admin.xsl =================================================================== --- sandbox/BlueNetMEST/web/geonetwork/xsl/metadata-admin.xsl 2008-10-26 13:31:14 UTC (rev 1636) +++ sandbox/BlueNetMEST/web/geonetwork/xsl/metadata-admin.xsl 2008-10-27 13:38:51 UTC (rev 1637) @@ -60,6 +60,7 @@ <!-- loop on other groups except --> <xsl:for-each select="/root/response/groups/group"> + <xsl:sort select="name"/> <xsl:if test="id!='0' and id!='1'"> <xsl:variable name="groupId" select="id"/> <tr id="row.{id}"> Modified: sandbox/BlueNetMEST/web/geonetwork/xsl/metadata-category.xsl =================================================================== --- sandbox/BlueNetMEST/web/geonetwork/xsl/metadata-category.xsl 2008-10-26 13:31:14 UTC (rev 1636) +++ sandbox/BlueNetMEST/web/geonetwork/xsl/metadata-category.xsl 2008-10-27 13:38:51 UTC (rev 1637) @@ -26,6 +26,7 @@ <!-- loop on all categories --> <xsl:for-each select="/root/response/categories/category"> + <xsl:sort select="name"/> <xsl:variable name="categId" select="id"/> <tr> <td class="padded"><xsl:value-of select="label/child::*[name() = $lang]"/></td> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |