You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by bp...@apache.org on 2010/08/13 04:34:38 UTC
svn commit: r985075 - in
/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/planexporter:
CreateHTMLFile.java resources/advancedViewXSL.xsl
resources/advancedViewXSL2.xsl resources/vanilla_html.xsl
Author: bpendleton
Date: Fri Aug 13 02:34:38 2010
New Revision: 985075
URL: http://svn.apache.org/viewvc?rev=985075&view=rev
Log:
DERBY-4587: Add tools for improved analysis of query plans
This patch was contributed by Nirmal Fernando (nirmal070125 at gmail dot com)
This patch changes the comment markers in the XSL files from slash-star
to lessthan-bang-dash-dash, and updates a javadoc comment and a variable
name in CreateHTMLFile.java.
Modified:
db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/planexporter/CreateHTMLFile.java
db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/planexporter/resources/advancedViewXSL.xsl
db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/planexporter/resources/advancedViewXSL2.xsl
db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/planexporter/resources/vanilla_html.xsl
Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/planexporter/CreateHTMLFile.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/planexporter/CreateHTMLFile.java?rev=985075&r1=985074&r2=985075&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/planexporter/CreateHTMLFile.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/planexporter/CreateHTMLFile.java Fri Aug 13 02:34:38 2010
@@ -37,7 +37,17 @@ import java.net.URL;
* a query plan.
*/
public class CreateHTMLFile {
+
+ private static String xslStyleSheetName ="resources/vanilla_html.xsl";//default xsl
+ /**
+ *
+ * @param XMLFileName name of the XML file
+ * @param XSLSheetName name of the XSL file
+ * @param HTMLFile name of the HTML file
+ * @param def whether to use the default XSL or not
+ * @throws Exception
+ */
public void getHTML(String XMLFileName, String XSLSheetName,
String HTMLFile, boolean def) throws Exception{
@@ -58,7 +68,7 @@ public class CreateHTMLFile {
transformer =
transFactory.newTransformer(new StreamSource(XSLSheetName));
else{
- URL url=getClass().getResource("resources/vanilla_html.xsl");
+ URL url=getClass().getResource(xslStyleSheetName);
transformer =
transFactory.newTransformer(new StreamSource(url.openStream()));
}
Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/planexporter/resources/advancedViewXSL.xsl
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/planexporter/resources/advancedViewXSL.xsl?rev=985075&r1=985074&r2=985075&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/planexporter/resources/advancedViewXSL.xsl (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/planexporter/resources/advancedViewXSL.xsl Fri Aug 13 02:34:38 2010
@@ -1,4 +1,4 @@
-/*
+<!--
Derby - Class advancedViewXSL
@@ -16,8 +16,8 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+-->
- */
<xsl:stylesheet
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version="1.0">
Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/planexporter/resources/advancedViewXSL2.xsl
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/planexporter/resources/advancedViewXSL2.xsl?rev=985075&r1=985074&r2=985075&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/planexporter/resources/advancedViewXSL2.xsl (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/planexporter/resources/advancedViewXSL2.xsl Fri Aug 13 02:34:38 2010
@@ -1,4 +1,4 @@
-/*
+<!--
Derby - Class advancedViewXSL2
@@ -17,7 +17,7 @@
See the License for the specific language governing permissions and
limitations under the License.
- */
+ -->
<xsl:stylesheet
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version="1.0">
Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/planexporter/resources/vanilla_html.xsl
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/planexporter/resources/vanilla_html.xsl?rev=985075&r1=985074&r2=985075&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/planexporter/resources/vanilla_html.xsl (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/planexporter/resources/vanilla_html.xsl Fri Aug 13 02:34:38 2010
@@ -1,4 +1,4 @@
-/*
+<!--
Derby - Class vanilla_html
@@ -16,8 +16,8 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+-->
- */
<xsl:stylesheet
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version="1.0">