[pkg-java] r3583 - trunk/libmx4j-java/debian/patches
marcusb-guest at alioth.debian.org
marcusb-guest at alioth.debian.org
Sun Jun 3 18:55:32 UTC 2007
Author: marcusb-guest
Date: 2007-06-03 18:55:32 +0000 (Sun, 03 Jun 2007)
New Revision: 3583
Modified:
trunk/libmx4j-java/debian/patches/01-mx4j-javaxssl.patch
trunk/libmx4j-java/debian/patches/mx4j-build.patch
trunk/libmx4j-java/debian/patches/mx4j-caucho-build.patch
trunk/libmx4j-java/debian/patches/mx4j-docbook.patch
trunk/libmx4j-java/debian/patches/mx4j-no-iiop.patch
Log:
Convert from DOS to Unix EOL format (the upstream tarball is in Unix
format).
--Denna och nedanst?\195?\165ende rader kommer inte med i loggmeddelandet--
M patches/01-mx4j-javaxssl.patch
M patches/mx4j-no-iiop.patch
M patches/mx4j-build.patch
M patches/mx4j-caucho-build.patch
M patches/mx4j-docbook.patch
Modified: trunk/libmx4j-java/debian/patches/01-mx4j-javaxssl.patch
===================================================================
--- trunk/libmx4j-java/debian/patches/01-mx4j-javaxssl.patch 2007-06-03 17:02:08 UTC (rev 3582)
+++ trunk/libmx4j-java/debian/patches/01-mx4j-javaxssl.patch 2007-06-03 18:55:32 UTC (rev 3583)
@@ -1,24 +1,24 @@
--- mx4j/src/tools/mx4j/tools/adaptor/ssl/SSLAdaptorServerSocketFactory.java.orig Thu Dec 23 19:07:29 2004
+++ mx4j/src/tools/mx4j/tools/adaptor/ssl/SSLAdaptorServerSocketFactory.java Thu Dec 23 19:08:43 2004
@@ -21,9 +21,9 @@
- import javax.net.ssl.SSLServerSocket;
- import javax.net.ssl.SSLServerSocketFactory;
-
--import com.sun.net.ssl.KeyManagerFactory;
--import com.sun.net.ssl.SSLContext;
--import com.sun.net.ssl.TrustManagerFactory;
-+import javax.net.ssl.KeyManagerFactory;
-+import javax.net.ssl.SSLContext;
-+import javax.net.ssl.TrustManagerFactory;
- import mx4j.log.Log;
- import mx4j.log.Logger;
-
+ import javax.net.ssl.SSLServerSocket;
+ import javax.net.ssl.SSLServerSocketFactory;
+
+-import com.sun.net.ssl.KeyManagerFactory;
+-import com.sun.net.ssl.SSLContext;
+-import com.sun.net.ssl.TrustManagerFactory;
++import javax.net.ssl.KeyManagerFactory;
++import javax.net.ssl.SSLContext;
++import javax.net.ssl.TrustManagerFactory;
+ import mx4j.log.Log;
+ import mx4j.log.Logger;
+
@@ -60,7 +60,7 @@
- {
- static
- {
-- addProvider(new com.sun.net.ssl.internal.ssl.Provider());
-+ //addProvider(new com.sun.net.ssl.internal.ssl.Provider());
- }
-
- private String m_keyStoreType = "JKS";
+ {
+ static
+ {
+- addProvider(new com.sun.net.ssl.internal.ssl.Provider());
++ //addProvider(new com.sun.net.ssl.internal.ssl.Provider());
+ }
+
+ private String m_keyStoreType = "JKS";
Modified: trunk/libmx4j-java/debian/patches/mx4j-build.patch
===================================================================
--- trunk/libmx4j-java/debian/patches/mx4j-build.patch 2007-06-03 17:02:08 UTC (rev 3582)
+++ trunk/libmx4j-java/debian/patches/mx4j-build.patch 2007-06-03 18:55:32 UTC (rev 3583)
@@ -1,75 +1,75 @@
--- mx4j/build/build.xml.orig Thu Dec 23 18:35:27 2004
+++ mx4j/build/build.xml Thu Dec 23 19:52:49 2004
@@ -55,6 +55,9 @@
- <property name="rjmx.jar.file" value="${dist.lib.dir}/${name}-rjmx.jar"/>
- <property name="rimpl.jar.file" value="${dist.lib.dir}/${name}-rimpl.jar"/>
- <property name="rmx4j.jar.file" value="${dist.lib.dir}/${name}-remote.jar"/>
-+ <property name="rjmx-boa.jar.file" value="${dist.lib.dir}/boa/${name}-rjmx-boa.jar"/>
-+ <property name="rimpl-boa.jar.file" value="${dist.lib.dir}/boa/${name}-rimpl-boa.jar"/>
-+ <property name="rmx4j-boa.jar.file" value="${dist.lib.dir}/boa/${name}-remote-boa.jar"/>
-
- <property name="tools.jar.file" value="${dist.lib.dir}/${name}-tools.jar"/>
-
+ <property name="rjmx.jar.file" value="${dist.lib.dir}/${name}-rjmx.jar"/>
+ <property name="rimpl.jar.file" value="${dist.lib.dir}/${name}-rimpl.jar"/>
+ <property name="rmx4j.jar.file" value="${dist.lib.dir}/${name}-remote.jar"/>
++ <property name="rjmx-boa.jar.file" value="${dist.lib.dir}/boa/${name}-rjmx-boa.jar"/>
++ <property name="rimpl-boa.jar.file" value="${dist.lib.dir}/boa/${name}-rimpl-boa.jar"/>
++ <property name="rmx4j-boa.jar.file" value="${dist.lib.dir}/boa/${name}-remote-boa.jar"/>
+
+ <property name="tools.jar.file" value="${dist.lib.dir}/${name}-tools.jar"/>
+
@@ -224,6 +227,7 @@
- <target name="compile.jmx" description="Compiles the JMX (JSR 3) classes" depends="flags">
- <mkdir dir="${core.classes.dir}"/>
- <mkdir dir="${dist.lib.dir}"/>
-+ <mkdir dir="${dist.lib.dir}/boa"/>
-
- <javac srcdir="${core.src.dir}" destdir="${core.classes.dir}" debug="on" deprecation="on" encoding="US-ASCII">
- <patternset refid="mx4j.classes"/>
+ <target name="compile.jmx" description="Compiles the JMX (JSR 3) classes" depends="flags">
+ <mkdir dir="${core.classes.dir}"/>
+ <mkdir dir="${dist.lib.dir}"/>
++ <mkdir dir="${dist.lib.dir}/boa"/>
+
+ <javac srcdir="${core.src.dir}" destdir="${core.classes.dir}" debug="on" deprecation="on" encoding="US-ASCII">
+ <patternset refid="mx4j.classes"/>
@@ -270,6 +274,25 @@
- </javac>
- <rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIServerImpl" classpathref="classpath" debug="yes" stubversion="1.2"/>
- <rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIConnectionImpl" classpathref="classpath" debug="yes" stubversion="1.2"/>
-+
-+ <jar jarfile="${rjmx-boa.jar.file}" manifest="${etc.dir}/MANIFEST.MF">
-+ <fileset dir="${core.classes.dir}">
-+ <patternset refid="rjmx.classes"/>
-+ </fileset>
-+ </jar>
-+
-+ <jar jarfile="${rimpl-boa.jar.file}" manifest="${etc.dir}/MANIFEST.MF">
-+ <fileset dir="${core.classes.dir}">
-+ <patternset refid="rimpl.classes"/>
-+ </fileset>
-+ </jar>
-+
-+ <jar jarfile="${rmx4j-boa.jar.file}" manifest="${etc.dir}/MANIFEST.MF">
-+ <fileset dir="${core.classes.dir}">
-+ <patternset refid="rmx4j.classes"/>
-+ </fileset>
-+ </jar>
-+
- <antcall target="rmic.iiop"/>
- <antcall target="rmic.iiop.poa"/>
-
+ </javac>
+ <rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIServerImpl" classpathref="classpath" debug="yes" stubversion="1.2"/>
+ <rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIConnectionImpl" classpathref="classpath" debug="yes" stubversion="1.2"/>
++
++ <jar jarfile="${rjmx-boa.jar.file}" manifest="${etc.dir}/MANIFEST.MF">
++ <fileset dir="${core.classes.dir}">
++ <patternset refid="rjmx.classes"/>
++ </fileset>
++ </jar>
++
++ <jar jarfile="${rimpl-boa.jar.file}" manifest="${etc.dir}/MANIFEST.MF">
++ <fileset dir="${core.classes.dir}">
++ <patternset refid="rimpl.classes"/>
++ </fileset>
++ </jar>
++
++ <jar jarfile="${rmx4j-boa.jar.file}" manifest="${etc.dir}/MANIFEST.MF">
++ <fileset dir="${core.classes.dir}">
++ <patternset refid="rmx4j.classes"/>
++ </fileset>
++ </jar>
++
+ <antcall target="rmic.iiop"/>
+ <antcall target="rmic.iiop.poa"/>
+
@@ -440,8 +463,7 @@
- author="true"
- version="true"
- use="true"
-- windowtitle="MX4J API"
-- classpathref="classpath">
-+ windowtitle="MX4J API">
- <package name="mx4j.*"/>
-
- <bottom><![CDATA[<center><small>Copyright © 2001-2003 MX4J Team. All Rights Reserved.</small></center>]]></bottom>
+ author="true"
+ version="true"
+ use="true"
+- windowtitle="MX4J API"
+- classpathref="classpath">
++ windowtitle="MX4J API">
+ <package name="mx4j.*"/>
+
+ <bottom><![CDATA[<center><small>Copyright © 2001-2003 MX4J Team. All Rights Reserved.</small></center>]]></bottom>
@@ -454,8 +476,6 @@
- </target>
-
- <target name="docs" description="Builds the MX4J documentation">
-- <unzip src="${docbook.dtd.zip.file}" dest="${docs.src.dir}/docbook"/>
-- <unzip src="${docbook.xsl.zip.file}" dest="${docs.src.dir}/docbookx"/>
- <mkdir dir="${dist.docs.dir}"/>
-
- <style processor="trax"
+ </target>
+
+ <target name="docs" description="Builds the MX4J documentation">
+- <unzip src="${docbook.dtd.zip.file}" dest="${docs.src.dir}/docbook"/>
+- <unzip src="${docbook.xsl.zip.file}" dest="${docs.src.dir}/docbookx"/>
+ <mkdir dir="${dist.docs.dir}"/>
+
+ <style processor="trax"
@@ -467,9 +487,6 @@
- classpathref="lib.classpath"
- />
-
-- <delete dir="${docs.src.dir}/docbook" quiet="true"/>
-- <delete dir="${docs.src.dir}/docbookx" quiet="true"/>
--
- <!-- Bug in Ant forces this move, since destdir of the style task does not work -->
- <move todir="${dist.docs.dir}">
- <fileset dir="${basedir}/build">
+ classpathref="lib.classpath"
+ />
+
+- <delete dir="${docs.src.dir}/docbook" quiet="true"/>
+- <delete dir="${docs.src.dir}/docbookx" quiet="true"/>
+-
+ <!-- Bug in Ant forces this move, since destdir of the style task does not work -->
+ <move todir="${dist.docs.dir}">
+ <fileset dir="${basedir}/build">
Modified: trunk/libmx4j-java/debian/patches/mx4j-caucho-build.patch
===================================================================
--- trunk/libmx4j-java/debian/patches/mx4j-caucho-build.patch 2007-06-03 17:02:08 UTC (rev 3582)
+++ trunk/libmx4j-java/debian/patches/mx4j-caucho-build.patch 2007-06-03 18:55:32 UTC (rev 3583)
@@ -1,15 +1,15 @@
--- mx4j/build/build.xml.orig Thu Dec 23 20:05:06 2004
+++ mx4j/build/build.xml Thu Dec 23 20:06:16 2004
@@ -306,9 +306,9 @@
- <exclude name="mx4j/tools/remote/**" unless="jaas.present"/>
- <exclude name="mx4j/tools/remote/rmi/SSL*" unless="jdk14.present"/>
- <exclude name="mx4j/tools/remote/http/jetty/**" unless="jetty.present"/>
-- <exclude name="mx4j/tools/remote/caucho/**" unless="jdk14.present"/>
-- <exclude name="mx4j/tools/remote/**/hessian/**" unless="jdk14.present"/>
-- <exclude name="mx4j/tools/remote/**/burlap/**" unless="jdk14.present"/>
-+ <exclude name="mx4j/tools/remote/caucho/**"/>
-+ <exclude name="mx4j/tools/remote/**/hessian/**"/>
-+ <exclude name="mx4j/tools/remote/**/burlap/**"/>
- <classpath>
- <path refid="classpath"/>
- <pathelement location="${core.classes.dir}"/>
+ <exclude name="mx4j/tools/remote/**" unless="jaas.present"/>
+ <exclude name="mx4j/tools/remote/rmi/SSL*" unless="jdk14.present"/>
+ <exclude name="mx4j/tools/remote/http/jetty/**" unless="jetty.present"/>
+- <exclude name="mx4j/tools/remote/caucho/**" unless="jdk14.present"/>
+- <exclude name="mx4j/tools/remote/**/hessian/**" unless="jdk14.present"/>
+- <exclude name="mx4j/tools/remote/**/burlap/**" unless="jdk14.present"/>
++ <exclude name="mx4j/tools/remote/caucho/**"/>
++ <exclude name="mx4j/tools/remote/**/hessian/**"/>
++ <exclude name="mx4j/tools/remote/**/burlap/**"/>
+ <classpath>
+ <path refid="classpath"/>
+ <pathelement location="${core.classes.dir}"/>
Modified: trunk/libmx4j-java/debian/patches/mx4j-docbook.patch
===================================================================
--- trunk/libmx4j-java/debian/patches/mx4j-docbook.patch 2007-06-03 17:02:08 UTC (rev 3582)
+++ trunk/libmx4j-java/debian/patches/mx4j-docbook.patch 2007-06-03 18:55:32 UTC (rev 3583)
@@ -1,20 +1,20 @@
--- mx4j/src/docs/xsl/mx4j-chunk.xsl.orig Sun Nov 14 16:33:03 2004
+++ mx4j/src/docs/xsl/mx4j-chunk.xsl Thu Dec 23 20:17:30 2004
@@ -1,6 +1,6 @@
- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'>
-
-- <xsl:import href="../docbookx/html/chunk.xsl"/>
-+ <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl"/>
- <xsl:import href="autotoc.xsl"/>
-
- <xsl:param name="html.stylesheet">styles.css</xsl:param>
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'>
+
+- <xsl:import href="../docbookx/html/chunk.xsl"/>
++ <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl"/>
+ <xsl:import href="autotoc.xsl"/>
+
+ <xsl:param name="html.stylesheet">styles.css</xsl:param>
--- mx4j/src/docs/index.xml.orig Sun Nov 14 16:31:54 2004
+++ mx4j/src/docs/index.xml Thu Dec 23 20:19:00 2004
@@ -1,5 +1,6 @@
- <?xml version="1.0" encoding="ISO-8859-1"?>
--<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "docbook/docbookx.dtd" [
-+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
- <!ENTITY english SYSTEM "english/index.xml">
-
- <!ENTITY license_en SYSTEM "english/license.xml">
+ <?xml version="1.0" encoding="ISO-8859-1"?>
+-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "docbook/docbookx.dtd" [
++<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
++ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+ <!ENTITY english SYSTEM "english/index.xml">
+
+ <!ENTITY license_en SYSTEM "english/license.xml">
Modified: trunk/libmx4j-java/debian/patches/mx4j-no-iiop.patch
===================================================================
--- trunk/libmx4j-java/debian/patches/mx4j-no-iiop.patch 2007-06-03 17:02:08 UTC (rev 3582)
+++ trunk/libmx4j-java/debian/patches/mx4j-no-iiop.patch 2007-06-03 18:55:32 UTC (rev 3583)
@@ -1,17 +1,17 @@
--- mx4j-2.1.0/build/build.xml.orig 2005-03-04 13:46:19.610032808 +0000
+++ mx4j-2.1.0/build/build.xml 2005-03-04 13:50:12.555578739 +0000
@@ -254,12 +254,14 @@
- </target>
-
- <target name="rmic.iiop.poa" description="RMI compiles the remote JMX (JSR 160) classes using the -poa option" if="jdk14.present">
-+<!--
- <rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIServerImpl" classpathref="classpath" debug="yes" iiop="yes">
- <compilerarg value="-poa"/>
- </rmic>
- <rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIConnectionImpl" classpathref="classpath" debug="yes" iiop="yes">
- <compilerarg value="-poa"/>
- </rmic>
-+-->
- </target>
-
- <target name="rmic.iiop" description="RMI compiles the remote JMX (JSR 160) classes" unless="jdk14.present">
+ </target>
+
+ <target name="rmic.iiop.poa" description="RMI compiles the remote JMX (JSR 160) classes using the -poa option" if="jdk14.present">
++<!--
+ <rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIServerImpl" classpathref="classpath" debug="yes" iiop="yes">
+ <compilerarg value="-poa"/>
+ </rmic>
+ <rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIConnectionImpl" classpathref="classpath" debug="yes" iiop="yes">
+ <compilerarg value="-poa"/>
+ </rmic>
++-->
+ </target>
+
+ <target name="rmic.iiop" description="RMI compiles the remote JMX (JSR 160) classes" unless="jdk14.present">
More information about the pkg-java-commits
mailing list