This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jakarta-jmeter.
commit 931971392a3b1d01c71786a0dd68a0b84fd1df81 Author: Emmanuel Bourg <[email protected]> Date: Thu Jul 17 18:02:52 2014 +0000 Split 02_disable_components.patch into 3 patches --- debian/changelog | 1 + debian/patches/02_disable-soap-sampler.patch | 19 +++++++++ debian/patches/02_disable_components.patch | 53 -------------------------- debian/patches/03_disable-jdbc-module.patch | 31 +++++++++++++++ debian/patches/06_link-to-system-javadoc.patch | 14 +++++++ debian/patches/series | 4 +- 6 files changed, 68 insertions(+), 54 deletions(-) diff --git a/debian/changelog b/debian/changelog index e9f7b20..d6c193d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ jakarta-jmeter (2.11-1) UNRELEASED; urgency=medium - Removed 03_bouncycastle_update.patch (fixed upstream) * Install ApacheJMeter_native.jar in the main jmeter package * Packaged the MongoDB testing module as jmeter-mongodb + * Split 02_disable_components.patch into 3 patches * Use XZ compression for the upstream tarball -- Emmanuel Bourg <[email protected]> Thu, 17 Jul 2014 13:02:56 +0200 diff --git a/debian/patches/02_disable-soap-sampler.patch b/debian/patches/02_disable-soap-sampler.patch new file mode 100644 index 0000000..211924b --- /dev/null +++ b/debian/patches/02_disable-soap-sampler.patch @@ -0,0 +1,19 @@ +Description: Disable the SOAP sampler since it relies on the old Apache SOAP API + which isn't packaged yet. This library is archived here: + http://archive.apache.org/dist/ws/soap/version-2.3.1/ +Author: Onkar Shinde <[email protected]> +Forwarded: not-needed +--- a/build.xml ++++ b/build.xml +@@ -599,9 +599,10 @@ + <target name="compile-http" depends="compile-jorphan,compile-core,compile-components" description="Compile components specific to HTTP sampling."> + <mkdir dir="${build.http}"/> + <!-- Directory needs to exist, or jar will fail --> +- <javac srcdir="${src.http}" destdir="${build.http}" source="${src.java.version}" optimize="${optimize}" debug="on" target="${target.java.version}" ++ <javac sourcepath="" srcdir="${src.http}" destdir="${build.http}" source="${src.java.version}" optimize="${optimize}" debug="on" target="${target.java.version}" + includeAntRuntime="${includeAntRuntime}" deprecation="${deprecation}" encoding="${encoding}"> + <include name="**/*.java"/> ++ <exclude name="**/WebServiceSampler*.java"/> + <classpath> + <pathelement location="${build.jorphan}"/> + <pathelement location="${build.core}"/> diff --git a/debian/patches/02_disable_components.patch b/debian/patches/02_disable_components.patch deleted file mode 100644 index fc64984..0000000 --- a/debian/patches/02_disable_components.patch +++ /dev/null @@ -1,53 +0,0 @@ -Description: Disable components which fail to build because of yet unpackaged - build dependencies. -Forwarded: not-needed -Author: Onkar Shinde <[email protected]> ---- a/build.xml -+++ b/build.xml -@@ -599,9 +599,10 @@ - <target name="compile-http" depends="compile-jorphan,compile-core,compile-components" description="Compile components specific to HTTP sampling."> - <mkdir dir="${build.http}"/> - <!-- Directory needs to exist, or jar will fail --> -- <javac srcdir="${src.http}" destdir="${build.http}" source="${src.java.version}" optimize="${optimize}" debug="on" target="${target.java.version}" -+ <javac sourcepath="" srcdir="${src.http}" destdir="${build.http}" source="${src.java.version}" optimize="${optimize}" debug="on" target="${target.java.version}" - includeAntRuntime="${includeAntRuntime}" deprecation="${deprecation}" encoding="${encoding}"> - <include name="**/*.java"/> -+ <exclude name="**/WebServiceSampler*.java"/> - <classpath> - <pathelement location="${build.jorphan}"/> - <pathelement location="${build.core}"/> -@@ -748,7 +749,7 @@ - </javac> - </target> - -- <target name="compile-protocols" depends="compile-http,compile-ftp,compile-jdbc,compile-java,compile-ldap,compile-mail,compile-tcp" description="Compile all protocol-specific components."/> -+ <target name="compile-protocols" depends="compile-http,compile-ftp,compile-java,compile-ldap,compile-mail,compile-tcp" description="Compile all protocol-specific components."/> - - <target name="compile-examples" depends="compile-jorphan,compile-core" description="Compile example components."> - <mkdir dir="${build.examples}"/> -@@ -1024,14 +1025,14 @@ - </jar> - - <!-- jdbc --> -- <jar jarfile="${dest.jar}/ApacheJMeter_jdbc.jar" manifest="${build.dir}/MANIFEST_BIN.MF"> -+ <!--jar jarfile="${dest.jar}/ApacheJMeter_jdbc.jar" manifest="${build.dir}/MANIFEST_BIN.MF"> - <zipfileset file="${resources.meta-inf}/default.notice" - fullpath="META-INF/NOTICE" /> - <zipfileset file="${resources.meta-inf}/default.license" - fullpath="META-INF/LICENSE" /> - <fileset dir="${build.jdbc}" includes="**/*.class" /> - <fileset dir="${src.jdbc}" includes="**/*.properties" /> -- </jar> -+ </jar--> - - <!-- java --> - <jar jarfile="${dest.jar}/ApacheJMeter_java.jar" manifest="${build.dir}/MANIFEST_BIN.MF"> -@@ -2236,7 +2237,7 @@ - packagenames="org.apache.jmeter.*,org.apache.jorphan.*" - excludepackagenames="org.apache.jorphan.timer"> - <classpath refid="classpath"/> -- <link href="http://docs.oracle.com/javase/6/docs/api/"/> -+ <link href="file:///usr/share/doc/default-jdk-doc/api/"/> - </javadoc> - <patch-javadoc dir="${dest.docs.api}" docencoding="${javadoc.encoding}"/> - </target> diff --git a/debian/patches/03_disable-jdbc-module.patch b/debian/patches/03_disable-jdbc-module.patch new file mode 100644 index 0000000..dc1293e --- /dev/null +++ b/debian/patches/03_disable-jdbc-module.patch @@ -0,0 +1,31 @@ +Description: Disable the JDBC components since it relies on the excalibur-datasource library + which is not packaged yet +Author: Onkar Shinde <[email protected]> +Forwarded: not-needed +--- a/build.xml ++++ b/build.xml +@@ -749,7 +749,7 @@ + </javac> + </target> + +- <target name="compile-protocols" depends="compile-http,compile-ftp,compile-jdbc,compile-java,compile-ldap,compile-mail,compile-tcp" description="Compile all protocol-specific components."/> ++ <target name="compile-protocols" depends="compile-http,compile-ftp,compile-java,compile-ldap,compile-mail,compile-tcp" description="Compile all protocol-specific components."/> + + <target name="compile-examples" depends="compile-jorphan,compile-core" description="Compile example components."> + <mkdir dir="${build.examples}"/> +@@ -1025,6 +1025,7 @@ + </jar> + + <!-- jdbc --> ++ <!-- + <jar jarfile="${dest.jar}/ApacheJMeter_jdbc.jar" manifest="${build.dir}/MANIFEST_BIN.MF"> + <zipfileset file="${resources.meta-inf}/default.notice" + fullpath="META-INF/NOTICE" /> +@@ -1033,6 +1034,7 @@ + <fileset dir="${build.jdbc}" includes="**/*.class" /> + <fileset dir="${src.jdbc}" includes="**/*.properties" /> + </jar> ++ --> + + <!-- java --> + <jar jarfile="${dest.jar}/ApacheJMeter_java.jar" manifest="${build.dir}/MANIFEST_BIN.MF"> diff --git a/debian/patches/06_link-to-system-javadoc.patch b/debian/patches/06_link-to-system-javadoc.patch new file mode 100644 index 0000000..bca83ec --- /dev/null +++ b/debian/patches/06_link-to-system-javadoc.patch @@ -0,0 +1,14 @@ +Description: Link the API documentation with the system Javadoc provided by the default-jdk-doc package +Author: Onkar Shinde <[email protected]> +Forwarded: not-needed +--- a/build.xml ++++ b/build.xml +@@ -2239,7 +2239,7 @@ + packagenames="org.apache.jmeter.*,org.apache.jorphan.*" + excludepackagenames="org.apache.jorphan.timer"> + <classpath refid="classpath"/> +- <link href="http://docs.oracle.com/javase/6/docs/api/"/> ++ <link href="file:///usr/share/doc/default-jdk-doc/api/"/> + </javadoc> + <patch-javadoc dir="${dest.docs.api}" docencoding="${javadoc.encoding}"/> + </target> diff --git a/debian/patches/series b/debian/patches/series index 319d838..cb34d0b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,6 @@ 01_improve_cli_help.patch -02_disable_components.patch +02_disable-soap-sampler.patch +03_disable-jdbc-module.patch 04_java8_compatibility.patch 05_ignore-jodd.patch +06_link-to-system-javadoc.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jakarta-jmeter.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
