[Bigdata-commit] SF.net SVN: bigdata:[8418] branches/BIGDATA_RELEASE_1_3_0/bigdata-war/src/ jetty.xml

[<tho...@us...>]

Revision: 8418
          http://sourceforge.net/p/bigdata/code/8418
Author:   thompsonbry
Date:     2014-05-23 19:11:29 +0000 (Fri, 23 May 2014)
Log Message:
-----------
rolling back changes from Property to SystemProperty in jetty.xml.  This broken the build.  The HA test suites were not starting correctly.  See #951 and #958

Modified Paths:
--------------
    branches/BIGDATA_RELEASE_1_3_0/bigdata-war/src/jetty.xml

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-war/src/jetty.xml
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-war/src/jetty.xml	2014-05-23 16:08:41 UTC (rev 8417)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-war/src/jetty.xml	2014-05-23 19:11:29 UTC (rev 8418)
@@ -62,8 +62,8 @@
        <New class="javax.management.remote.JMXServiceURL">
          <Arg type="java.lang.String">rmi</Arg>
          <Arg type="java.lang.String" />
-         <Arg type="java.lang.Integer"><Property name="jetty.jmxrmiport" default="1090"/></Arg>
-         <Arg type="java.lang.String">/jndi/rmi://<Property name="jetty.jmxrmihost" default="localhost"/>:<Property name="jetty.jmxrmiport" default="1099"/>/jmxrmi</Arg>
+         <Arg type="java.lang.Integer"><SystemProperty name="jetty.jmxrmiport" default="1090"/></Arg>
+         <Arg type="java.lang.String">/jndi/rmi://<SystemProperty name="jetty.jmxrmihost" default="localhost"/>:<SystemProperty name="jetty.jmxrmiport" default="1099"/>/jmxrmi</Arg>
        </New>
      </Arg>
      <Arg>org.eclipse.jetty.jmx:name=rmiconnectorserver</Arg>
@@ -110,9 +110,9 @@
                </Item>
              </Array>
            </Arg>
-           <Set name="host"><Property name="jetty.host" /></Set>
-           <Set name="port"><Property name="jetty.port" default="8080" /></Set>
-           <Set name="idleTimeout"><Property name="http.timeout" default="30000"/></Set>
+           <Set name="host"><SystemProperty name="jetty.host" /></Set>
+           <Set name="port"><SystemProperty name="jetty.port" default="8080" /></Set>
+           <Set name="idleTimeout"><SystemProperty name="http.timeout" default="30000"/></Set>
          </New>
        </Arg>
      </Call>
@@ -142,12 +142,12 @@
                     <Arg>
                         <!-- This is the bigdata web application. -->
                         <New id="WebAppContext" class="org.eclipse.jetty.webapp.WebAppContext">
-                         <Set name="war"><Property name="jetty.resourceBase" default="bigdata-war/src"/></Set>
+                         <Set name="war"><SystemProperty name="jetty.resourceBase" default="bigdata-war/src"/></Set>
                          <Set name="contextPath">/bigdata</Set>
                          <Set name="descriptor">WEB-INF/web.xml</Set>
                          <Set name="parentLoaderPriority">true</Set>
                          <Set name="extractWAR">false</Set>
-                         <Set name="overrideDescriptor"><Property name="jetty.overrideWebXml" default="bigdata-war/src/WEB-INF/override-web.xml"/></Set>
+                         <Set name="overrideDescriptor"><SystemProperty name="jetty.overrideWebXml" default="bigdata-war/src/WEB-INF/override-web.xml"/></Set>
                         </New>
                     </Arg>
                   </Call>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.