Author: eugene-guest Date: 2013-05-17 07:51:47 +0000 (Fri, 17 May 2013) New Revision: 16684
Added: trunk/saxonhe/debian/patches/fix_compilation.patch trunk/saxonhe/debian/patches/pom_added.patch Removed: trunk/saxonhe/debian/patches/maven.patch Log: patches fixed Added: trunk/saxonhe/debian/patches/fix_compilation.patch =================================================================== --- trunk/saxonhe/debian/patches/fix_compilation.patch (rev 0) +++ trunk/saxonhe/debian/patches/fix_compilation.patch 2013-05-17 07:51:47 UTC (rev 16684) @@ -0,0 +1,30 @@ +Description: Fixes compilation + * Removed dep to non-existing class +Author: Eugene Zhukov <[email protected]> +Last-Update: <2013-05-17> + +--- saxonhe-9.4.0.7.orig/src/main/java/net/sf/saxon/option/sql/SQLElementFactory.java ++++ saxonhe-9.4.0.7/src/main/java/net/sf/saxon/option/sql/SQLElementFactory.java +@@ -1,6 +1,5 @@ + package net.sf.saxon.option.sql; + +-import com.saxonica.xsltextn.ExtensionElementFactory; + import net.sf.saxon.style.StyleElement; + + /** +@@ -17,7 +16,7 @@ import net.sf.saxon.style.StyleElement; + // Note: despite its package name, this class is not part of Saxon-HE. Rather, it is part of an + // open-source + +-public class SQLElementFactory implements ExtensionElementFactory { ++public class SQLElementFactory { + + /** + * Identify the class to be used for stylesheet elements with a given local name. +@@ -55,4 +54,4 @@ public class SQLElementFactory implement + // Portions created by ___ are Copyright (C) ___. All rights reserved. + // + // Contributor(s): +-// +\ No newline at end of file ++// Deleted: trunk/saxonhe/debian/patches/maven.patch =================================================================== --- trunk/saxonhe/debian/patches/maven.patch 2013-05-17 07:50:21 UTC (rev 16683) +++ trunk/saxonhe/debian/patches/maven.patch 2013-05-17 07:51:47 UTC (rev 16684) @@ -1,163 +0,0 @@ -Description: <short summary of the patch> - TODO: Put a short summary on the line above and replace this paragraph - with a longer explanation of this change. Complete the meta-information - with other relevant fields (see below for details). To make it easier, the - information below has been extracted from the changelog. Adjust it or drop - it. - . - saxonhe (9.4.0.7-1) UNRELEASED; urgency=low - . - * Initial release -Author: Eugene Zhukov <[email protected]> - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: <vendor|upstream|other>, <url of original patch> -Bug: <url in upstream bugtracker> -Bug-Debian: http://bugs.debian.org/<bugnumber> -Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> -Forwarded: <no|not-needed|url proving that it has been forwarded> -Reviewed-By: <name and email of someone who approved the patch> -Last-Update: <YYYY-MM-DD> - ---- /dev/null -+++ saxonhe-9.4.0.7/pom.xml -@@ -0,0 +1,110 @@ -+<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; -+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> -+ -+ <modelVersion>4.0.0</modelVersion> -+ <groupId>net.sf.saxon</groupId> -+ <artifactId>Saxon-HE</artifactId> -+ <version>9.4.0.7</version> -+ <packaging>jar</packaging> -+ -+ <name>Saxon-HE</name> -+ <description>The XSLT and XQuery Processor</description> -+ <url>http://www.saxonica.com/</url> -+ -+ <licenses> -+ <license> -+ <name>Mozilla Public License Version 1.0</name> -+ <url>http://www.mozilla.org/MPL/1.0/</url> -+ <distribution>repo</distribution> -+ </license> -+ </licenses> -+ -+ <properties> -+ <configs.path>target/config</configs.path> -+ </properties> -+ -+ <dependencies> -+ <dependency> -+ <groupId>org.jdom</groupId> -+ <artifactId>jdom</artifactId> -+ <version>1.1</version> -+ <scope>compile</scope> -+ <optional>true</optional> -+ </dependency> -+ -+ <dependency> -+ <groupId>xom</groupId> -+ <artifactId>xom</artifactId> -+ <version>1.2.5</version> -+ <scope>compile</scope> -+ <optional>true</optional> -+ </dependency> -+ -+ <dependency> -+ <groupId>dom4j</groupId> -+ <artifactId>dom4j</artifactId> -+ <version>1.6.1</version> -+ <optional>true</optional> -+ </dependency> -+ -+ <dependency> -+ <groupId>xml-resolver</groupId> -+ <artifactId>xml-resolver</artifactId> -+ <version>1.2</version> -+ <optional>true</optional> -+ </dependency> -+ </dependencies> -+ -+ <parent> -+ <groupId>org.sonatype.oss</groupId> -+ <artifactId>oss-parent</artifactId> -+ <version>7</version> -+ </parent> -+ <build> -+ <pluginManagement> -+ <plugins> -+ <plugin> -+ <groupId>org.apache.maven.plugins</groupId> -+ <artifactId>maven-compiler-plugin</artifactId> -+ <version>2.0.2</version> -+ <configuration> -+ <encoding>ISO-8859-1</encoding> -+ <source>1.6</source> -+ <target>1.6</target> -+ </configuration> -+ </plugin> -+ </plugins> -+ </pluginManagement> -+ <resources> -+ <resource> -+ <directory>${configs.path}</directory> -+ <targetPath>META-INF</targetPath> -+ </resource> -+ </resources> -+ <plugins> -+ <plugin> -+ <artifactId>maven-antrun-plugin</artifactId> -+ <version>1.6</version> -+ <executions> -+ <execution> -+ <phase>generate-resources</phase> -+ <configuration> -+ <target> -+ <mkdir dir="${configs.path}/services"/> -+ <echo file="${configs.path}/services/javax.xml.transform.TransformerFactory" -+ message="net.sf.saxon.TransformerFactoryImpl"/> -+ <echo file="${configs.path}/services/javax.xml.xpath.XPathFactory">net.sf.saxon.xpath.XPathFactoryImpl -+http\://java.sun.com/jaxp/xpath/dom: net.sf.saxon.xpath.XPathFactoryImpl -+http\://saxon.sf.net/jaxp/xpath/om: net.sf.saxon.xpath.XPathFactoryImpl -+ </echo> -+ </target> -+ </configuration> -+ <goals> -+ <goal>run</goal> -+ </goals> -+ </execution> -+ </executions> -+ </plugin> -+ </plugins> -+ </build> -+</project> ---- saxonhe-9.4.0.7.orig/src/main/java/net/sf/saxon/option/sql/SQLElementFactory.java -+++ saxonhe-9.4.0.7/src/main/java/net/sf/saxon/option/sql/SQLElementFactory.java -@@ -1,6 +1,5 @@ - package net.sf.saxon.option.sql; - --import com.saxonica.xsltextn.ExtensionElementFactory; - import net.sf.saxon.style.StyleElement; - - /** -@@ -17,7 +16,7 @@ import net.sf.saxon.style.StyleElement; - // Note: despite its package name, this class is not part of Saxon-HE. Rather, it is part of an - // open-source - --public class SQLElementFactory implements ExtensionElementFactory { -+public class SQLElementFactory { - - /** - * Identify the class to be used for stylesheet elements with a given local name. -@@ -55,4 +54,4 @@ public class SQLElementFactory implement - // Portions created by ___ are Copyright (C) ___. All rights reserved. - // - // Contributor(s): --// -\ No newline at end of file -+// Added: trunk/saxonhe/debian/patches/pom_added.patch =================================================================== --- trunk/saxonhe/debian/patches/pom_added.patch (rev 0) +++ trunk/saxonhe/debian/patches/pom_added.patch 2013-05-17 07:51:47 UTC (rev 16684) @@ -0,0 +1,126 @@ +Description: Adds pom.xml for building + * The pom.xml created for packaging purposes +Author: Eugene Zhukov <[email protected]> +Last-Update: <2013-05-17> + +--- /dev/null ++++ saxonhe-9.4.0.7/pom.xml +@@ -0,0 +1,118 @@ ++<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; ++ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> ++ ++ <modelVersion>4.0.0</modelVersion> ++ <groupId>net.sf.saxon</groupId> ++ <artifactId>Saxon-HE</artifactId> ++ <version>9.4.0.7</version> ++ <packaging>jar</packaging> ++ ++ <name>Saxon-HE</name> ++ <description>The XSLT and XQuery Processor</description> ++ <url>http://www.saxonica.com/</url> ++ ++ <licenses> ++ <license> ++ <name>Mozilla Public License Version 1.0</name> ++ <url>http://www.mozilla.org/MPL/1.0/</url> ++ <distribution>repo</distribution> ++ </license> ++ </licenses> ++ ++ <properties> ++ <configs.path>target/config</configs.path> ++ </properties> ++ ++ <dependencies> ++ <dependency> ++ <groupId>org.jdom</groupId> ++ <artifactId>jdom</artifactId> ++ <version>1.1</version> ++ <scope>compile</scope> ++ </dependency> ++ ++ <dependency> ++ <groupId>xom</groupId> ++ <artifactId>xom</artifactId> ++ <version>1.2.5</version> ++ <scope>compile</scope> ++ </dependency> ++ ++ <dependency> ++ <groupId>dom4j</groupId> ++ <artifactId>dom4j</artifactId> ++ <version>1.6.1</version> ++ </dependency> ++ ++ <dependency> ++ <groupId>xml-resolver</groupId> ++ <artifactId>xml-resolver</artifactId> ++ <version>1.2</version> ++ </dependency> ++ </dependencies> ++ ++ <parent> ++ <groupId>org.sonatype.oss</groupId> ++ <artifactId>oss-parent</artifactId> ++ <version>7</version> ++ </parent> ++ <build> ++ <pluginManagement> ++ <plugins> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-compiler-plugin</artifactId> ++ <version>2.0.2</version> ++ <configuration> ++ <encoding>ISO-8859-1</encoding> ++ <source>1.6</source> ++ <target>1.6</target> ++ </configuration> ++ </plugin> ++ </plugins> ++ </pluginManagement> ++ <resources> ++ <resource> ++ <directory>${configs.path}</directory> ++ <targetPath>META-INF</targetPath> ++ </resource> ++ </resources> ++ <plugins> ++ <plugin> ++ <artifactId>maven-antrun-plugin</artifactId> ++ <version>1.6</version> ++ <executions> ++ <execution> ++ <phase>generate-resources</phase> ++ <configuration> ++ <target> ++ <mkdir dir="${configs.path}/services"/> ++ <echo file="${configs.path}/services/javax.xml.transform.TransformerFactory" ++ message="net.sf.saxon.TransformerFactoryImpl"/> ++ <echo file="${configs.path}/services/javax.xml.xpath.XPathFactory">net.sf.saxon.xpath.XPathFactoryImpl ++http\://java.sun.com/jaxp/xpath/dom: net.sf.saxon.xpath.XPathFactoryImpl ++http\://saxon.sf.net/jaxp/xpath/om: net.sf.saxon.xpath.XPathFactoryImpl ++ </echo> ++ </target> ++ </configuration> ++ <goals> ++ <goal>run</goal> ++ </goals> ++ </execution> ++ </executions> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-jar-plugin</artifactId> ++ <configuration> ++ <archive> ++ <manifest> ++ <addClasspath>true</addClasspath> ++ </manifest> ++ </archive> ++ </configuration> ++ <version>2.2</version> ++ </plugin> ++ </plugins> ++ </build> ++</project> _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
