Repository: phoenix Updated Branches: refs/heads/4.x-HBase-0.98 cf58424e2 -> 715de5e95
PHOENIX-2391 Reduce size of Tracing web-app uber jar Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/715de5e9 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/715de5e9 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/715de5e9 Branch: refs/heads/4.x-HBase-0.98 Commit: 715de5e951244766bed03b405bbfd71f55758950 Parents: cf58424 Author: Mujtaba <mujt...@apache.org> Authored: Mon Nov 16 11:27:24 2015 -0800 Committer: Mujtaba <mujt...@apache.org> Committed: Mon Nov 16 11:27:24 2015 -0800 ---------------------------------------------------------------------- bin/traceserver.py | 4 ++-- phoenix-tracing-webapp/pom.xml | 2 -- phoenix-tracing-webapp/src/build/trace-server-runnable.xml | 8 +++++--- 3 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/715de5e9/bin/traceserver.py ---------------------------------------------------------------------- diff --git a/bin/traceserver.py b/bin/traceserver.py index 3d12193..082b417 100755 --- a/bin/traceserver.py +++ b/bin/traceserver.py @@ -116,7 +116,7 @@ else: # " -Xdebug -Xrunjdwp:transport=dt_socket,address=5005,server=y,suspend=n " + \ # " -XX:+UnlockCommercialFeatures -XX:+FlightRecorder -XX:FlightRecorderOptions=defaultrecording=true,dumponexit=true" + \ -java_cmd = '%(java)s -cp ' + hbase_config_path + os.pathsep + phoenix_utils.phoenix_traceserver_jar + \ +java_cmd = '%(java)s -cp ' + hbase_config_path + os.pathsep + phoenix_utils.phoenix_traceserver_jar + os.pathsep + phoenix_utils.phoenix_client_jar + \ " -Dproc_phoenixtraceserver" + \ " -Dlog4j.configuration=file:" + os.path.join(phoenix_utils.current_dir, "log4j.properties") + \ " -Dpsql.root.logger=%(root_logger)s" + \ @@ -185,4 +185,4 @@ else: # run in the foreground using defaults from log4j.properties cmd = java_cmd % {'java': java, 'root_logger': 'INFO,console', 'log_dir': '.', 'log_file': 'psql.log'} child = subprocess.Popen(cmd.split()) - sys.exit(child.wait()) \ No newline at end of file + sys.exit(child.wait()) http://git-wip-us.apache.org/repos/asf/phoenix/blob/715de5e9/phoenix-tracing-webapp/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-tracing-webapp/pom.xml b/phoenix-tracing-webapp/pom.xml index a9f16c3..bba695b 100755 --- a/phoenix-tracing-webapp/pom.xml +++ b/phoenix-tracing-webapp/pom.xml @@ -44,14 +44,12 @@ <artifactId>jetty-server</artifactId> <!-- TODO : pick the same jetty version throughout the project (PHOENIX-2211)--> <version>${jettyVersion}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-webapp</artifactId> <!-- TODO : pick the same jetty version throughout the project (PHOENIX-2211)--> <version>${jettyVersion}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> http://git-wip-us.apache.org/repos/asf/phoenix/blob/715de5e9/phoenix-tracing-webapp/src/build/trace-server-runnable.xml ---------------------------------------------------------------------- diff --git a/phoenix-tracing-webapp/src/build/trace-server-runnable.xml b/phoenix-tracing-webapp/src/build/trace-server-runnable.xml index 21b3bde..d099b03 100755 --- a/phoenix-tracing-webapp/src/build/trace-server-runnable.xml +++ b/phoenix-tracing-webapp/src/build/trace-server-runnable.xml @@ -39,10 +39,12 @@ </containerDescriptorHandlers> <dependencySets> <dependencySet> - <outputDirectory>/</outputDirectory> - <useProjectArtifact>true</useProjectArtifact> <unpack>true</unpack> - <scope>provided</scope> + <outputDirectory>/</outputDirectory> + <includes> + <include>org.apache.phoenix:phoenix-tracing-webapp</include> + <include>org.eclipse.jetty:*</include> + </includes> </dependencySet> </dependencySets> <fileSets>
