opendev
/
gerrit
Code Issues Proposed changes

Use consistent test site locations in documentation and debug configs 

The naming of the test site is inconsistent in the documentation.  Some
parts refer to `gerrit_testsite` while other parts, and the default
debug configurations, refer to `test_site`.

Update the documentation and debug configs to use `gerrit_testsite`.

Change-Id: I5b1fb5c9dcc6c9a39e7d95e88d4e0ea9df384b09
This commit is contained in:
David Pursehouse 2013-12-17 11:59:22 +09:00
parent 79d4ebec49
commit 9db23781da
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/dev-eclipse.txt
View File

@ -44,7 +44,7 @@ Duplicate the existing launch configuration:
* Switch to Arguments tab.
* Edit the `-d` program argument flag to match the path used during
'init'. The template launch configuration resolves to ../test_site
'init'. The template launch configuration resolves to ../gerrit_testsite
since that is what the documentation recommends.
* Switch to Common tab.
@ -66,7 +66,7 @@ Duplicate the existing launch configuration:
* Switch to Arguments tab.
* Edit the `-Dgerrit.site_path=` VM argument to match the path
used during 'init'. The template launch configuration resolves
to ../test_site since that is what the documentation recommends.
to ../gerrit_testsite since that is what the documentation recommends.
* Switch to Common tab.
* Change Save as to be Local file.

10
Documentation/dev-readme.txt
View File

@ -74,7 +74,7 @@ After compiling (above), run Gerrit's 'init' command to create a
testing site for development use:
----
java -jar buck-out/gen/gerrit.war init -d ../test_site
java -jar buck-out/gen/gerrit.war init -d ../gerrit_testsite
----
Accept defaults by pressing Enter until 'init' completes, or add
@ -89,7 +89,7 @@ Shutdown the daemon after registering the administrator account
through the web interface:
----
../test_site/bin/gerrit.sh stop
../gerrit_testsite/bin/gerrit.sh stop
----
@ -120,7 +120,7 @@ The daemon can be directly launched from the build area, without
copying to the test site:
----
java -jar buck-out/gen/gerrit.war daemon -d ../test_site
java -jar buck-out/gen/gerrit.war daemon -d ../gerrit_testsite
----
Running the Daemon with Gerrit Inspector
@ -140,7 +140,7 @@ Gerrit Inspect can be started by adding '-s' option to the
command used to launch the daemon:
----
java -jar buck-out/gen/gerrit.war daemon -d ../test_site -s
java -jar buck-out/gen/gerrit.war daemon -d ../gerrit_testsite -s
----
Gerrit Inspector examines Java libraries first, then loads
@ -168,7 +168,7 @@ The embedded H2 database can be queried and updated from the
command line. If the daemon is not currently running:
----
java -jar buck-out/gen/gerrit.war gsql -d ../test_site
java -jar buck-out/gen/gerrit.war gsql -d ../gerrit_testsite
----
Or, if it is running and the database is in use, connect over SSH

2
tools/eclipse/gerrit_daemon.launch
View File

@ -11,7 +11,7 @@
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="Main"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="daemon --console-log --show-stack-trace -d ${resource_loc:/gerrit}/../test_site"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="daemon --console-log --show-stack-trace -d ${resource_loc:/gerrit}/../gerrit_testsite"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="gerrit"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dgerrit.plugin-classes=${resource_loc:/gerrit/buck-out}/eclipse/plugins"/>
</launchConfiguration>

2
tools/eclipse/gerrit_gwt_debug.launch
View File

@ -13,5 +13,5 @@
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.DevMode"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-startupUrl /&#10;-war ${resource_loc:/gerrit}/buck-out/gen/gerrit-gwtui/ui_dbg__tmp/war&#10;-server com.google.gerrit.gwtdebug.GerritDebugLauncher&#10;com.google.gerrit.GerritGwtUI"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="gerrit"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx256M&#10;-XX:MaxPermSize=128M&#10;-Dgwt.persistentunitcachedir=${resource_loc:/gerrit}/buck-out/gen/gerrit-gwtui/ui_dbg__tmp/unit_cache&#10;-Dgerrit.source_root=${resource_loc:/gerrit}&#10;-Dgerrit.site_path=${resource_loc:/gerrit}/../test_site&#10;-da:com.google.gwtexpui.globalkey.client.KeyCommandSet"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx256M&#10;-XX:MaxPermSize=128M&#10;-Dgwt.persistentunitcachedir=${resource_loc:/gerrit}/buck-out/gen/gerrit-gwtui/ui_dbg__tmp/unit_cache&#10;-Dgerrit.source_root=${resource_loc:/gerrit}&#10;-Dgerrit.site_path=${resource_loc:/gerrit}/../gerrit_testsite&#10;-da:com.google.gwtexpui.globalkey.client.KeyCommandSet"/>
</launchConfiguration>