From 5a19924b49d5bd49c330e392d67b9f4864f12442 Mon Sep 17 00:00:00 2001
From: aheritier <aheritier@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 22 Aug 2005 22:12:36 +0000
Subject: [PATCH] MPPDF-7 : PDF generation doesn't use proxy settings for
 external resources.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@239258 13f79535-47bb-0310-9956-ffa450edef68
---
 pdf/plugin.jelly      | 16 ++++++++++++++++
 pdf/xdocs/changes.xml |  1 +
 2 files changed, 17 insertions(+)

diff --git a/pdf/plugin.jelly b/pdf/plugin.jelly
index d74960fe..ff406fa0 100644
--- a/pdf/plugin.jelly
+++ b/pdf/plugin.jelly
@@ -220,6 +220,22 @@ maven_version                   = [${maven_version}]
     <java classname="org.apache.fop.apps.Fop" fork="true" failonerror="true">
       <sysproperty key="javax.xml.parsers.SAXParserFactory" value="org.apache.xerces.jaxp.SAXParserFactoryImpl"/>
       <sysproperty key="javax.xml.transform.TransformerFactory" value="org.apache.xalan.processor.TransformerFactoryImpl"/>
+      <!-- System proxies for jdk 1.5+ -->
+      <sysproperty key="java.net.useSystemProxies" value="true"/>
+      <!-- Proxy settings -->
+      <j:if test="${!empty(maven.proxy.host)}">
+        <jvmarg value="-DproxySet=true"/>
+        <jvmarg value="-DproxyHost=${maven.proxy.host}"/>
+        <jvmarg value="-DproxyPort=${maven.proxy.port}"/>
+        <jvmarg value="-Dhttp.proxyHost=${maven.proxy.host}"/>
+        <jvmarg value="-Dhttp.proxyPort=${maven.proxy.port}"/>
+        <jvmarg value="-Dhttp.proxyUser=${maven.proxy.username}"/>
+        <jvmarg value="-Dhttp.proxyPassword=${maven.proxy.password}"/>
+        <jvmarg value="-Dhttps.proxyHost=${maven.proxy.host}"/>
+        <jvmarg value="-Dhttps.proxyPort=${maven.proxy.port}"/>
+        <jvmarg value="-Dftp.proxyHost=${maven.proxy.host}"/>
+        <jvmarg value="-Dftp.proxyPort=${maven.proxy.port}"/>
+      </j:if>
       <arg value="-c"/>
       <arg value="${internal_pdf_workingDir}/userconfig.xml"/>
       <j:if test="${maven.pdf.debug}">
diff --git a/pdf/xdocs/changes.xml b/pdf/xdocs/changes.xml
index 90a9859b..a9c927fe 100644
--- a/pdf/xdocs/changes.xml
+++ b/pdf/xdocs/changes.xml
@@ -36,6 +36,7 @@
       <action dev="aheritier" type="fix" issue="MPPDF-22" due-to="Lukas Theussl">Allow copy and paste from pdf to text editor.</action>
       <action dev="aheritier" type="add" issue="MPPDF-9" due-to="Fabrizio Giustina">Allow the pdf plugin to be added as a project's report.</action>
       <action dev="aheritier" type="fix" issue="MPPDF-8" due-to="Fabio Franco Uechi">Add support for external imaging libraries like jimi and jai to use PNG images in generated pdf files.</action>
+      <action dev="aheritier" type="fix" issue="MPPDF-7">PDF generation doesn't use proxy settings for external resources.</action>
     </release>
     <release version="2.3" date="2005-06-16">
       <action dev="aheritier" type="update" issue="MPPDF-38">Use the ant task for the xsl transformation and remove xerces and xalan dependencies. People using java 5 will have to use this release with maven 1.1 or maven 1.0 with at the most the PDF plugin 2.2.X.</action>