Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[8207] branches/BIGDATA_RELEASE_1_3_0
|
From: <tho...@us...> - 2014-05-06 13:54:45
|
Revision: 8207
http://sourceforge.net/p/bigdata/code/8207
Author: thompsonbry
Date: 2014-05-06 13:54:41 +0000 (Tue, 06 May 2014)
Log Message:
-----------
Added the jetty-jmx and jetty-jndi dependencies. The jmx dependency is necessary if you want to export the MBeans from the jetty server to another host. The jndi dependency is just foward looking - jndi provides a flexible mechanism for configuring jetty.
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_3_0/.classpath
branches/BIGDATA_RELEASE_1_3_0/bigdata-war/src/jetty.xml
branches/BIGDATA_RELEASE_1_3_0/build.xml
branches/BIGDATA_RELEASE_1_3_0/pom.xml
Added Paths:
-----------
branches/BIGDATA_RELEASE_1_3_0/bigdata/lib/jetty/jetty-jmx-9.1.4.v20140401.jar
branches/BIGDATA_RELEASE_1_3_0/bigdata/lib/jetty/jetty-jndi-9.1.4.v20140401.jar
Modified: branches/BIGDATA_RELEASE_1_3_0/.classpath
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/.classpath 2014-05-06 10:49:40 UTC (rev 8206)
+++ branches/BIGDATA_RELEASE_1_3_0/.classpath 2014-05-06 13:54:41 UTC (rev 8207)
@@ -58,6 +58,8 @@
<classpathentry exported="true" kind="lib" path="bigdata/lib/unimi/fastutil-5.1.5.jar"/>
<classpathentry exported="true" kind="lib" path="bigdata/lib/lucene/lucene-analyzers-3.0.0.jar"/>
<classpathentry exported="true" kind="lib" path="bigdata/lib/lucene/lucene-core-3.0.0.jar"/>
+ <classpathentry kind="lib" path="bigdata/lib/jetty/jetty-jmx-9.1.4.v20140401.jar"/>
+ <classpathentry kind="lib" path="bigdata/lib/jetty/jetty-jndi-9.1.4.v20140401.jar"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry exported="true" kind="lib" path="bigdata/lib/high-scale-lib-v1.1.2.jar"/>
<classpathentry exported="true" kind="lib" path="bigdata/lib/junit-ext-1.1-b3-dev.jar"/>
Added: branches/BIGDATA_RELEASE_1_3_0/bigdata/lib/jetty/jetty-jmx-9.1.4.v20140401.jar
===================================================================
(Binary files differ)
Index: branches/BIGDATA_RELEASE_1_3_0/bigdata/lib/jetty/jetty-jmx-9.1.4.v20140401.jar
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata/lib/jetty/jetty-jmx-9.1.4.v20140401.jar 2014-05-06 10:49:40 UTC (rev 8206)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata/lib/jetty/jetty-jmx-9.1.4.v20140401.jar 2014-05-06 13:54:41 UTC (rev 8207)
Property changes on: branches/BIGDATA_RELEASE_1_3_0/bigdata/lib/jetty/jetty-jmx-9.1.4.v20140401.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: branches/BIGDATA_RELEASE_1_3_0/bigdata/lib/jetty/jetty-jndi-9.1.4.v20140401.jar
===================================================================
(Binary files differ)
Index: branches/BIGDATA_RELEASE_1_3_0/bigdata/lib/jetty/jetty-jndi-9.1.4.v20140401.jar
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata/lib/jetty/jetty-jndi-9.1.4.v20140401.jar 2014-05-06 10:49:40 UTC (rev 8206)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata/lib/jetty/jetty-jndi-9.1.4.v20140401.jar 2014-05-06 13:54:41 UTC (rev 8207)
Property changes on: branches/BIGDATA_RELEASE_1_3_0/bigdata/lib/jetty/jetty-jndi-9.1.4.v20140401.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
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-06 10:49:40 UTC (rev 8206)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-war/src/jetty.xml 2014-05-06 13:54:41 UTC (rev 8207)
@@ -31,6 +31,46 @@
<Set name="detailedDump">false</Set>
</Get>
+ <!-- =========================================================== -->
+ <!-- Get the platform mbean server -->
+ <!-- =========================================================== -->
+ <Call id="MBeanServer" class="java.lang.management.ManagementFactory"
+ name="getPlatformMBeanServer" />
+
+ <!-- =========================================================== -->
+ <!-- Initialize the Jetty MBean container -->
+ <!-- =========================================================== -->
+ <Call name="addBean">
+ <Arg>
+ <New id="MBeanContainer" class="org.eclipse.jetty.jmx.MBeanContainer">
+ <Arg>
+ <Ref refid="MBeanServer" />
+ </Arg>
+ </New>
+ </Arg>
+ </Call>
+
+ <!-- Add the static log to the MBean server. -->
+ <Call name="addBean">
+ <Arg>
+ <New class="org.eclipse.jetty.util.log.Log" />
+ </Arg>
+ </Call>
+
+ <!-- For remote MBean access (optional) -->
+ <New id="ConnectorServer" class="org.eclipse.jetty.jmx.ConnectorServer">
+ <Arg>
+ <New class="javax.management.remote.JMXServiceURL">
+ <Arg type="java.lang.String">rmi</Arg>
+ <Arg type="java.lang.String" />
+ <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>
+ <Call name="start" />
+ </New>
+
<!-- =========================================================== -->
<!-- Http Configuration. -->
<!-- This is a common configuration instance used by all -->
@@ -88,7 +128,7 @@
<Item>
<!-- This is the bigdata web application. -->
<New id="WebAppContext" class="org.eclipse.jetty.webapp.WebAppContext">
- <Set name="resourceBase">
+ <Set name="war">
<!-- The location of the top-level of the bigdata webapp. -->
<SystemProperty name="jetty.resourceBase" default="bigdata-war/src" />
</Set>
@@ -98,30 +138,11 @@
<Set name="extractWAR">false</Set>
</New>
</Item>
- <Item>
- <!-- This appears to be necessary in addition to the above. -->
- <!-- Without this, it will not resolve http://localhost:8080/ -->
- <!-- and can fail to deliver some of the static content. -->
- <New id="ResourceHandler" class="org.eclipse.jetty.server.handler.ResourceHandler">
- <Set name="resourceBase">
- <!-- The location of the top-level of the bigdata webapp. -->
- <SystemProperty name="jetty.resourceBase" default="bigdata-war/src" />
- </Set>
- <Set name="welcomeFiles">
- <Array type="java.lang.String">
- <Item>html/index.html</Item>
- </Array>
- </Set>
- </New>
- </Item>
- <!-- <Item>
- <New id="DefaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler"></New>
- </Item> -->
</Array>
</Set>
</New>
</Set>
-
+
<!-- =========================================================== -->
<!-- extra server options -->
<!-- =========================================================== -->
Modified: branches/BIGDATA_RELEASE_1_3_0/build.xml
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/build.xml 2014-05-06 10:49:40 UTC (rev 8206)
+++ branches/BIGDATA_RELEASE_1_3_0/build.xml 2014-05-06 13:54:41 UTC (rev 8207)
@@ -980,8 +980,12 @@
tofile="${dist.lib}/jetty-continuation.jar" />
<copy file="${bigdata-jetty.lib}/jetty-http-${jetty.version}.jar"
tofile="${dist.lib}/jetty-http.jar" />
- <copy file="${bigdata-jetty.lib}/jetty-io-${jetty.version}.jar"
- tofile="${dist.lib}/jetty-io.jar" />
+ <copy file="${bigdata-jetty.lib}/jetty-io-${jetty.version}.jar"
+ tofile="${dist.lib}/jetty-io.jar" />
+ <copy file="${bigdata-jetty.lib}/jetty-jmx-${jetty.version}.jar"
+ tofile="${dist.lib}/jetty-jmx.jar" />
+ <copy file="${bigdata-jetty.lib}/jetty-jndi-${jetty.version}.jar"
+ tofile="${dist.lib}/jetty-jndi.jar" />
<copy file="${bigdata-jetty.lib}/jetty-server-${jetty.version}.jar"
tofile="${dist.lib}/jetty-server.jar" />
<copy file="${bigdata-jetty.lib}/jetty-util-${jetty.version}.jar"
@@ -1208,10 +1212,10 @@
todir="${dist.dir}/doc" />
<!-- Stage documentation from the wiki. -->
- <get dest="${dist.doc}/HAJournalServer.html"
+ <get dest="${dist.doc}/HAJournalServer.html" ignoreerrors="true"
src="http://wiki.bigdata.com/wiki/index.php/HAJournalServer?printable=yes"
/>
- <get dest="${dist.doc}/NanoSparqlServer.html"
+ <get dest="${dist.doc}/NanoSparqlServer.html" ignoreerrors="true"
src="http://wiki.bigdata.com/wiki/index.php/NanoSparqlServer?printable=yes"
/>
@@ -1752,7 +1756,7 @@
<!-- TODO ${path.separator}${dist.lib}/bigdata-gas.jar -->
<property name="javac.test.classpath"
- value="${classes.dir}${path.separator}${junit.jar}${path.separator}${junit-ext.jar}${path.separator}${sesame-sparql-test.jar}${path.separator}${sesame-store-test.jar}${path.separator}${sesame-rio-test.jar}${path.separator}${dist.lib}/classserver.jar${path.separator}${dist.lib}/highscalelib.jar${path.separator}${dist.lib}/dsiutils.jar${path.separator}${dist.lib}/lgplutils.jar${path.separator}${dist.lib}/fastutil.jar${path.separator}${dist.lib}/bigdata-ganglia.jar${path.separator}${dist.lib}/icu4j.jar${path.separator}${dist.lib}/icu4j-charset.jar${path.separator}${dist.lib}/log4j.jar${path.separator}${dist.lib}/lucene-analyzer.jar${path.separator}${dist.lib}/lucene-core.jar${path.separator}${path.separator}${dist.lib}/openrdf-sesame.jar${path.separator}${dist.lib}/slf4j.jar${path.separator}${dist.lib}/jsk-lib.jar${path.separator}${dist.lib}/jsk-platform.jar${path.separator}${dist.lib}/nxparser.jar${path.separator}${dist.lib}/zookeeper.jar${path.separator}${dist.lib}/jetty-continuation.jar${path.separator}${dist.lib}/jetty-http.jar${path.separator}${dist.lib}/jetty-io.jar${path.separator}${dist.lib}/jetty-server.jar${path.separator}${dist.lib}/jetty-util.jar${path.separator}${dist.lib}/jetty-webapp.jar${path.separator}${dist.lib}/jetty-servlet.jar${path.separator}${dist.lib}/jetty-security.jar${path.separator}${dist.lib}/jetty-xml.jar${path.separator}${dist.lib}/jetty-rewrite.jar${path.separator}${dist.lib}/jetty-client.jar${path.separator}${dist.lib}/jetty-proxy.jar${path.separator}${dist.lib}/servlet-api.jar${path.separator}${dist.lib}/commons-codec.jar${path.separator}${dist.lib}/commons-fileupload.jar${path.separator}${dist.lib}/commons-io.jar${path.separator}${dist.lib}/commons-logging.jar${path.separator}${dist.lib}/httpclient.jar${path.separator}${dist.lib}/httpclient-cache.jar${path.separator}${dist.lib}/httpcore.jar${path.separator}${dist.lib}/httpmime.jar" />
+ value="${classes.dir}${path.separator}${junit.jar}${path.separator}${junit-ext.jar}${path.separator}${sesame-sparql-test.jar}${path.separator}${sesame-store-test.jar}${path.separator}${sesame-rio-test.jar}${path.separator}${dist.lib}/classserver.jar${path.separator}${dist.lib}/highscalelib.jar${path.separator}${dist.lib}/dsiutils.jar${path.separator}${dist.lib}/lgplutils.jar${path.separator}${dist.lib}/fastutil.jar${path.separator}${dist.lib}/bigdata-ganglia.jar${path.separator}${dist.lib}/icu4j.jar${path.separator}${dist.lib}/icu4j-charset.jar${path.separator}${dist.lib}/log4j.jar${path.separator}${dist.lib}/lucene-analyzer.jar${path.separator}${dist.lib}/lucene-core.jar${path.separator}${path.separator}${dist.lib}/openrdf-sesame.jar${path.separator}${dist.lib}/slf4j.jar${path.separator}${dist.lib}/jsk-lib.jar${path.separator}${dist.lib}/jsk-platform.jar${path.separator}${dist.lib}/nxparser.jar${path.separator}${dist.lib}/zookeeper.jar${path.separator}${dist.lib}/jetty-continuation.jar${path.separator}${dist.lib}/jetty-http.jar${path.separator}${dist.lib}/jetty-io.jar${path.separator}${dist.lib}/jetty-jmx.jar${path.separator}${dist.lib}/jetty-jndi.jar${path.separator}${dist.lib}/jetty-server.jar${path.separator}${dist.lib}/jetty-util.jar${path.separator}${dist.lib}/jetty-webapp.jar${path.separator}${dist.lib}/jetty-servlet.jar${path.separator}${dist.lib}/jetty-security.jar${path.separator}${dist.lib}/jetty-xml.jar${path.separator}${dist.lib}/jetty-rewrite.jar${path.separator}${dist.lib}/jetty-client.jar${path.separator}${dist.lib}/jetty-proxy.jar${path.separator}${dist.lib}/servlet-api.jar${path.separator}${dist.lib}/commons-codec.jar${path.separator}${dist.lib}/commons-fileupload.jar${path.separator}${dist.lib}/commons-io.jar${path.separator}${dist.lib}/commons-logging.jar${path.separator}${dist.lib}/httpclient.jar${path.separator}${dist.lib}/httpclient-cache.jar${path.separator}${dist.lib}/httpcore.jar${path.separator}${dist.lib}/httpmime.jar" />
<echo>javac
</echo>
@@ -2112,6 +2116,8 @@
<pathelement location="${dist.lib}/jetty-continuation.jar" />
<pathelement location="${dist.lib}/jetty-http.jar" />
<pathelement location="${dist.lib}/jetty-io.jar" />
+ <pathelement location="${dist.lib}/jetty-jmx.jar" />
+ <pathelement location="${dist.lib}/jetty-jndi.jar" />
<pathelement location="${dist.lib}/jetty-server.jar" />
<pathelement location="${dist.lib}/jetty-util.jar" />
<pathelement location="${dist.lib}/jetty-webapp.jar" />
@@ -2133,7 +2139,7 @@
</path>
<property name="run.class.path"
- value="${junit.jar}${path.separator}${bigdata-test.jar}${path.separator}${junit-ext.jar}${path.separator}${sesame-sparql-test.jar}${path.separator}${sesame-store-test.jar}${path.separator}${sesame-rio-test.jar}${path.separator}${dist.lib}/bigdata.jar${path.separator}${dist.lib}/colt.jar${path.separator}${dist.lib}/highscalelib.jar${path.separator}${dist.lib}/dsiutils.jar${path.separator}${dist.lib}/lgplutils.jar${path.separator}${dist.lib}/fastutil.jar${path.separator}${dist.lib}/bigdata-ganglia.jar${path.separator}${dist.lib}/bigdata-gas${path.separator}${dist.lib}/icu4j.jar${path.separator}${dist.lib}/icu4j-charset.jar${path.separator}${dist.lib}/jsk-lib.jar${path.separator}${dist.lib}/jsk-platform.jar${path.separator}${dist.lib}/log4j.jar${path.separator}${dist.lib}/lucene-analyzer.jar${path.separator}${dist.lib}/lucene-core.jar${path.separator}${dist.lib}/openrdf-sesame.jar${path.separator}${dist.lib}/slf4j.jar${path.separator}${dist.lib}/slf4j-log4j.jar${path.separator}${dist.lib}/nxparser.jar${path.separator}${dist.lib}/zookeeper.jar${path.separator}${dist.lib}/jetty-continuation.jar${path.separator}${dist.lib}/jetty-http.jar${path.separator}${dist.lib}/jetty-io.jar${path.separator}${dist.lib}/jetty-server.jar${path.separator}${dist.lib}/jetty-util.jar${path.separator}${dist.lib}/jetty-webapp.jar${path.separator}${dist.lib}/jetty-servlet.jar${path.separator}${dist.lib}/jetty-security.jar${path.separator}${dist.lib}/jetty-xml.jar${path.separator}${dist.lib}/jetty-rewrite.jar${path.separator}${dist.lib}/jetty-client.jar${path.separator}${dist.lib}/jetty-proxy.jar${path.separator}${dist.lib}/servlet-api.jar${path.separator}${dist.lib}/commons-codec.jar${path.separator}${dist.lib}/commons-fileupload.jar${path.separator}${dist.lib}/commons-io.jar${path.separator}${dist.lib}/commons-logging.jar${path.separator}${dist.lib}/httpclient.jar${path.separator}${dist.lib}/httpclient-cache.jar${path.separator}${dist.lib}/httpcore.jar${path.separator}${dist.lib}/httpmime.jar" />
+ value="${junit.jar}${path.separator}${bigdata-test.jar}${path.separator}${junit-ext.jar}${path.separator}${sesame-sparql-test.jar}${path.separator}${sesame-store-test.jar}${path.separator}${sesame-rio-test.jar}${path.separator}${dist.lib}/bigdata.jar${path.separator}${dist.lib}/colt.jar${path.separator}${dist.lib}/highscalelib.jar${path.separator}${dist.lib}/dsiutils.jar${path.separator}${dist.lib}/lgplutils.jar${path.separator}${dist.lib}/fastutil.jar${path.separator}${dist.lib}/bigdata-ganglia.jar${path.separator}${dist.lib}/bigdata-gas${path.separator}${dist.lib}/icu4j.jar${path.separator}${dist.lib}/icu4j-charset.jar${path.separator}${dist.lib}/jsk-lib.jar${path.separator}${dist.lib}/jsk-platform.jar${path.separator}${dist.lib}/log4j.jar${path.separator}${dist.lib}/lucene-analyzer.jar${path.separator}${dist.lib}/lucene-core.jar${path.separator}${dist.lib}/openrdf-sesame.jar${path.separator}${dist.lib}/slf4j.jar${path.separator}${dist.lib}/slf4j-log4j.jar${path.separator}${dist.lib}/nxparser.jar${path.separator}${dist.lib}/zookeeper.jar${path.separator}${dist.lib}/jetty-continuation.jar${path.separator}${dist.lib}/jetty-http.jar${path.separator}${dist.lib}/jetty-io.jar${path.separator}${dist.lib}/jetty-jmx.jar${path.separator}${dist.lib}/jetty-jndi.jar${path.separator}${dist.lib}/jetty-server.jar${path.separator}${dist.lib}/jetty-util.jar${path.separator}${dist.lib}/jetty-webapp.jar${path.separator}${dist.lib}/jetty-servlet.jar${path.separator}${dist.lib}/jetty-security.jar${path.separator}${dist.lib}/jetty-xml.jar${path.separator}${dist.lib}/jetty-rewrite.jar${path.separator}${dist.lib}/jetty-client.jar${path.separator}${dist.lib}/jetty-proxy.jar${path.separator}${dist.lib}/servlet-api.jar${path.separator}${dist.lib}/commons-codec.jar${path.separator}${dist.lib}/commons-fileupload.jar${path.separator}${dist.lib}/commons-io.jar${path.separator}${dist.lib}/commons-logging.jar${path.separator}${dist.lib}/httpclient.jar${path.separator}${dist.lib}/httpclient-cache.jar${path.separator}${dist.lib}/httpcore.jar${path.separator}${dist.lib}/httpmime.jar" />
<echo> classpath: ${run.class.path}
</echo>
@@ -2279,6 +2285,8 @@
<sysproperty key="jetty-continuation.jar" value="${dist.lib}/jetty-continuation.jar" />
<sysproperty key="jetty-http.jar" value="${dist.lib}/jetty-http.jar" />
<sysproperty key="jetty-io.jar" value="${dist.lib}/jetty-io.jar" />
+ <sysproperty key="jetty-jmx.jar" value="${dist.lib}/jetty-jmx.jar" />
+ <sysproperty key="jetty-jndi.jar" value="${dist.lib}/jetty-jndi.jar" />
<sysproperty key="jetty-server.jar" value="${dist.lib}/jetty-server.jar" />
<sysproperty key="jetty-util.jar" value="${dist.lib}/jetty-util.jar" />
<sysproperty key="jetty-webapp.jar" value="${dist.lib}/jetty-webapp.jar" />
Modified: branches/BIGDATA_RELEASE_1_3_0/pom.xml
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/pom.xml 2014-05-06 10:49:40 UTC (rev 8206)
+++ branches/BIGDATA_RELEASE_1_3_0/pom.xml 2014-05-06 13:54:41 UTC (rev 8207)
@@ -409,6 +409,8 @@
jetty-continuation
jetty-http
jetty-io
+ jetty-jmx
+ jetty-jndi
jetty-server
jetty-util
jetty-webapp
@@ -435,6 +437,16 @@
<artifactId>jetty-io</artifactId>
<version>${jetty.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-jmx</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-jndi</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
