Repository: phoenix Updated Branches: refs/heads/4.x-HBase-0.98 ee93ce2ec -> cf58424e2
PHOENIX-2403 Reduce size of Phoenix Server runnable jar Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/cf58424e Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/cf58424e Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/cf58424e Branch: refs/heads/4.x-HBase-0.98 Commit: cf58424e2455e0b0b43177b0598e24f0483ffb9b Parents: ee93ce2 Author: Mujtaba <[email protected]> Authored: Mon Nov 16 11:21:54 2015 -0800 Committer: Mujtaba <[email protected]> Committed: Mon Nov 16 11:21:54 2015 -0800 ---------------------------------------------------------------------- bin/queryserver.py | 2 +- phoenix-server/pom.xml | 1 - phoenix-server/src/build/query-server-runnable.xml | 8 ++++++-- 3 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/cf58424e/bin/queryserver.py ---------------------------------------------------------------------- diff --git a/bin/queryserver.py b/bin/queryserver.py index 7666246..11f5aeb 100755 --- a/bin/queryserver.py +++ b/bin/queryserver.py @@ -118,7 +118,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_queryserver_jar + \ +java_cmd = '%(java)s -cp ' + hbase_config_path + os.pathsep + phoenix_utils.phoenix_queryserver_jar + os.pathsep + phoenix_utils.phoenix_client_jar + \ " -Dproc_phoenixserver" + \ " -Dlog4j.configuration=file:" + os.path.join(phoenix_utils.current_dir, "log4j.properties") + \ " -Dpsql.root.logger=%(root_logger)s" + \ http://git-wip-us.apache.org/repos/asf/phoenix/blob/cf58424e/phoenix-server/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml index 0d856a8..7b91fcd 100644 --- a/phoenix-server/pom.xml +++ b/phoenix-server/pom.xml @@ -76,7 +76,6 @@ <version>${calcite.version}</version> </dependency> <dependency> - <!-- TODO: really don't need all of Phoenix, just the thick client. --> <groupId>org.apache.phoenix</groupId> <artifactId>phoenix-core</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/phoenix/blob/cf58424e/phoenix-server/src/build/query-server-runnable.xml ---------------------------------------------------------------------- diff --git a/phoenix-server/src/build/query-server-runnable.xml b/phoenix-server/src/build/query-server-runnable.xml index ef22b14..d4259bf 100644 --- a/phoenix-server/src/build/query-server-runnable.xml +++ b/phoenix-server/src/build/query-server-runnable.xml @@ -39,10 +39,14 @@ </containerDescriptorHandlers> <dependencySets> <dependencySet> - <outputDirectory>/</outputDirectory> - <useProjectArtifact>true</useProjectArtifact> <unpack>true</unpack> <scope>runtime</scope> + <outputDirectory>/</outputDirectory> + <includes> + <include>org.apache.phoenix:phoenix-server</include> + <include>org.apache.phoenix:phoenix-server-client</include> + <include>org.apache.calcite:*</include> + </includes> </dependencySet> </dependencySets> </assembly>
