Author: norman
Date: Mon Oct 25 11:12:50 2010
New Revision: 1027057
URL: http://svn.apache.org/viewvc?rev=1027057&view=rev
Log:
Make sure the system properties are correctly set in run.sh and james script
(JAMES-1087)
Modified:
james/server/trunk/container-spring/pom.xml
james/server/trunk/pom.xml
Modified: james/server/trunk/container-spring/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/pom.xml?rev=1027057&r1=1027056&r2=1027057&view=diff
==============================================================================
--- james/server/trunk/container-spring/pom.xml (original)
+++ james/server/trunk/container-spring/pom.xml Mon Oct 25 11:12:50 2010
@@ -138,13 +138,64 @@
</property>
<property>
<name>wrapper.java.additional.2</name>
- <value>${jmx.system-properties}</value>
+ <value>${jmx.system-property1}</value>
</property>
<property>
<name>wrapper.java.additional.3</name>
- <value>${javamail.system-properties}</value>
+ <value>${jmx.system-property2}</value>
+ </property>
+ <property>
+ <name>wrapper.java.additional.4</name>
+ <value>${jmx.system-property3}</value>
+ </property>
+ <property>
+ <name>wrapper.java.additional.5</name>
+ <value>${jmx.system-property4}</value>
+ </property>
+ <property>
+ <name>wrapper.java.additional.6</name>
+ <value>${jmx.system-property5}</value>
+ </property>
+ <property>
+ <name>wrapper.java.additional.7</name>
+ <value>${javamail.system-property1}</value>
+ </property>
+ <property>
+ <name>wrapper.java.additional.8</name>
+ <value>${javamail.system-property2}</value>
+ </property>
+ <property>
+ <name>wrapper.java.additional.9</name>
+ <value>${javamail.system-property3}</value>
+ </property>
+ <property>
+ <name>wrapper.java.additional.10</name>
+ <value>${javamail.system-property4}</value>
+ </property>
+ <property>
+ <name>wrapper.java.additional.11</name>
+ <value>${javamail.system-property5}</value>
+ </property>
+ <property>
+ <name>wrapper.java.additional.12</name>
+ <value>${javamail.system-property6}</value>
+ </property>
+ <property>
+ <name>wrapper.java.additional.13</name>
+ <value>${javamail.system-property7}</value>
+ </property>
+ <property>
+ <name>wrapper.java.additional.14</name>
+ <value>${javamail.system-property8}</value>
+ </property>
+ <property>
+ <name>wrapper.java.additional.15</name>
+ <value>${javamail.system-property9}</value>
+ </property>
+ <property>
+ <name>wrapper.java.additional.16</name>
+ <value>${javamail.system-property10}</value>
</property>
-
</configuration>
</generatorConfiguration>
</generatorConfigurations>
Modified: james/server/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1027057&r1=1027056&r2=1027057&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Mon Oct 25 11:12:50 2010
@@ -1152,26 +1152,31 @@
<jsieve.version>0.4</jsieve.version>
<jackrabbit.version>2.1.0</jackrabbit.version>
<commons.logging.version>1.1</commons.logging.version>
+
<!-- For more details see -->
<!--
http://java.sun.com/products/javamail/javadocs/javax/mail/internet/package-summary.html
-->
- <javamail.system-properties>
- -Dmail.mime.multipart.ignoremissingendboundary=true
- -Dmail.mime.multipart.ignoremissingboundaryparameter=true
- -Dmail.mime.ignoreunknownencoding=true
- -Dmail.mime.uudecode.ignoreerrors=true
- -Dmail.mime.uudecode.ignoremissingbeginend=true
- -Dmail.mime.multipart.allowempty=true
- -Dmail.mime.base64.ignoreerrors=true
- -Dmail.mime.encodeparameters=true
- -Dmail.mime.decodeparameters=true
- -Dmail.mime.address.strict=false
- </javamail.system-properties>
- <jmx.system-properties>
- -Dcom.sun.management.jmxremote.ssl=false
- -Dcom.sun.management.jmxremote.access.file=../conf/jmx.access
- -Dcom.sun.management.jmxremote.password.file=../conf/jmx.password
- -Dcom.sun.management.jmxremote.port=9999
- </jmx.system-properties>
+
<javamail.system-property1>-Dmail.mime.multipart.ignoremissingendboundary=true</javamail.system-property1>
+
<javamail.system-property2>-Dmail.mime.multipart.ignoremissingboundaryparameter=true</javamail.system-property2>
+
<javamail.system-property3>-Dmail.mime.ignoreunknownencoding=true</javamail.system-property3>
+
<javamail.system-property4>-Dmail.mime.uudecode.ignoreerrors=true</javamail.system-property4>
+
<javamail.system-property5>-Dmail.mime.uudecode.ignoremissingbeginend=true</javamail.system-property5>
+
<javamail.system-property6>-Dmail.mime.multipart.allowempty=true</javamail.system-property6>
+
<javamail.system-property7>-Dmail.mime.base64.ignoreerrors=true</javamail.system-property7>
+ <javamail.system-property8>-Dmail.mime.encodeparameters=true
</javamail.system-property8>
+
<javamail.system-property9>-Dmail.mime.decodeparameters=true</javamail.system-property9>
+
<javamail.system-property10>-Dmail.mime.address.strict=false</javamail.system-property10>
+ <javamail.system-properties>${javamail.system-property1}
${javamail.system-property2} ${javamail.system-property3}
${javamail.system-property4} ${javamail.system-property5}
${javamail.system-property6} ${javamail.system-property7}
${javamail.system-property8} ${javamail.system-property9}
${javamail.system-property10}</javamail.system-properties>
+
+ <!-- JMX system properties -->
+ <!-- For more details see -->
+ <!--
http://download.oracle.com/javase/1.5.0/docs/guide/management/agent.html -->
+
<jmx.system-property1>-Dcom.sun.management.jmxremote=true</jmx.system-property1>
+
<jmx.system-property2>-Dcom.sun.management.jmxremote.ssl=false</jmx.system-property2>
+
<jmx.system-property3>-Dcom.sun.management.jmxremote.access.file=../conf/jmx.access</jmx.system-property3>
+
<jmx.system-property4>-Dcom.sun.management.jmxremote.password.file=../conf/jmx.password</jmx.system-property4>
+
<jmx.system-property5>-Dcom.sun.management.jmxremote.port=9999</jmx.system-property5>
+ <jmx.system-properties>${jmx.system-property1} ${jmx.system-property2}
${jmx.system-property3} ${jmx.system-property4}
${jmx.system-property5}</jmx.system-properties>
+
</properties>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
