Author: aheritier
Date: Mon Aug 22 15:12:36 2005
New Revision: 239258
URL: http://svn.apache.org/viewcvs?rev=239258&view=rev
Log:
MPPDF-7 : PDF generation doesn't use proxy settings for external resources.
Modified:
maven/maven-1/plugins/trunk/pdf/plugin.jelly
maven/maven-1/plugins/trunk/pdf/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/pdf/plugin.jelly
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/pdf/plugin.jelly?rev=239258&r1=239257&r2=239258&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/pdf/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/pdf/plugin.jelly Mon Aug 22 15:12:36 2005
@@ -220,6 +220,22 @@
<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}">
Modified: maven/maven-1/plugins/trunk/pdf/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/pdf/xdocs/changes.xml?rev=239258&r1=239257&r2=239258&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/pdf/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/pdf/xdocs/changes.xml Mon Aug 22 15:12:36 2005
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
