Skip to content
Permalink
Browse files

Use dash rather than underscore in file/dir names

Updated a number of file and directory names to replace underscores
with dashes.  This includes the name of the SLAMD client and
resource monitor client packages and the scripts and config files
used to start them.
  • Loading branch information...
dirmgr committed Mar 18, 2019
1 parent 927ce1b commit dfc256383c3dcd2bdea3a96554fd1022fff528a0
Showing with 46 additions and 46 deletions.
  1. 0 base_client/slamd_client/slamd_client.conf → base-client/slamd-client/slamd-client.conf
  2. 0 base_client/slamd_client/standalone_client.bat → base-client/slamd-client/standalone-client.bat
  3. 0 base_client/slamd_client/standalone_client.sh → base-client/slamd-client/standalone-client.sh
  4. +1 −1 base_client/slamd_client/start_client_manager.sh → base-client/slamd-client/start-client-manager.sh
  5. +1 −1 base_client/slamd_client/start_client.bat → base-client/slamd-client/start-client.bat
  6. +1 −1 base_client/slamd_client/start_client.sh → base-client/slamd-client/start-client.sh
  7. +1 −1 base_client/slamd_client/swing_client.bat → base-client/slamd-client/swing-client.bat
  8. +1 −1 base_client/slamd_client/swing_client.sh → base-client/slamd-client/swing-client.sh
  9. 0 ...tor_client/slamd_monitor_client → base-monitor-client/slamd-monitor-client}/config/dsmonitor.conf
  10. 0 ...onitor_client/slamd_monitor_client → base-monitor-client/slamd-monitor-client}/config/iostat.conf
  11. 0 ...r_client/slamd_monitor_client → base-monitor-client/slamd-monitor-client}/config/ldapmonitor.conf
  12. 0 ...onitor_client/slamd_monitor_client → base-monitor-client/slamd-monitor-client}/config/mpstat.conf
  13. 0 ...nitor_client/slamd_monitor_client → base-monitor-client/slamd-monitor-client}/config/netstat.conf
  14. 0 ..._client/slamd_monitor_client → base-monitor-client/slamd-monitor-client}/config/process_size.conf
  15. 0 .../slamd_monitor_client → base-monitor-client/slamd-monitor-client}/config/replication_latency.conf
  16. 0 ...itor_client/slamd_monitor_client → base-monitor-client/slamd-monitor-client}/config/udp_ping.conf
  17. 0 ...onitor_client/slamd_monitor_client → base-monitor-client/slamd-monitor-client}/config/vmstat.conf
  18. 0 ...nitor_client/slamd_monitor_client → base-monitor-client/slamd-monitor-client}/config/zfspool.conf
  19. 0 ...nt/slamd_monitor_client.conf → base-monitor-client/slamd-monitor-client/slamd-monitor-client.conf
  20. +1 −1 ...ient/start_monitor_client.bat → base-monitor-client/slamd-monitor-client/start-monitor-client.bat
  21. +1 −1 ...client/start_monitor_client.sh → base-monitor-client/slamd-monitor-client/start-monitor-client.sh
  22. 0 {base_server → base-server}/slamd/README
  23. 0 {base_server → base-server}/slamd/SLAMD-License.txt
  24. 0 {base_server → base-server}/slamd/bin/shutdown.bat
  25. 0 {base_server → base-server}/slamd/bin/shutdown.sh
  26. 0 {base_server → base-server}/slamd/bin/startup.bat
  27. 0 {base_server → base-server}/slamd/bin/startup.sh
  28. 0 {base_server → base-server}/slamd/conf/server.xml
  29. 0 {base_server → base-server}/slamd/start-slamd-server.bat
  30. 0 {base_server → base-server}/slamd/start-slamd-server.sh
  31. 0 {base_server → base-server}/slamd/stop-slamd-server.bat
  32. 0 {base_server → base-server}/slamd/stop-slamd-server.sh
  33. 0 {base_server → base-server}/slamd/tools/user-build/build.xml
  34. 0 {base_server → base-server}/slamd/webapps/ROOT/WEB-INF/web.xml
  35. 0 {base_server → base-server}/slamd/webapps/ROOT/index.html
  36. 0 {base_server → base-server}/slamd/webapps/ROOT/scripts/ISAuthRate.script
  37. 0 {base_server → base-server}/slamd/webapps/ROOT/scripts/MindcraftExtranet.script
  38. 0 {base_server → base-server}/slamd/webapps/ROOT/scripts/MindcraftLogin.script
  39. 0 {base_server → base-server}/slamd/webapps/ROOT/scripts/getRate.script
  40. 0 {base_server → base-server}/slamd/webapps/ROOT/scripts/populate_table.script
  41. 0 {base_server → base-server}/slamd/webapps/ROOT/scripts/searchrate.script
  42. 0 {base_server → base-server}/slamd/webapps/ROOT/scripts/siteminder.script
  43. 0 {base_server → base-server}/slamd/webapps/ROOT/scripts/sql_searchrate.script
  44. 0 {base_server → base-server}/slamd/webapps/slamd/WEB-INF/slamd.conf
  45. 0 {base_server → base-server}/slamd/webapps/slamd/WEB-INF/web.xml
  46. +39 −39 build.xml
File renamed without changes.
@@ -48,4 +48,4 @@ fi
TOOL_CLASS="com.slamd.tools.CommandLineClientManager"
exec "${JAVA_CMD}" ${JVM_ARGS} ${TOOL_CLASS} \
-c "${SCRIPT_DIR}/start_client.sh" \
-f "${SCRIPT_DIR}/slamd_client.conf" "${@}"
-f "${SCRIPT_DIR}/slamd-client.conf" "${@}"
@@ -38,7 +38,7 @@ if not %JAVA_HOME_ERROR% == 0 exit /B %JAVA_HOME_ERROR%

rem Invoke the tool.
set TOOL_CLASS=com.slamd.tools.CommandLineClient
"%JAVA_CMD%" %JVM_ARGS% %TOOL_CLASS% -f slamd_client.conf -c classes %*
"%JAVA_CMD%" %JVM_ARGS% %TOOL_CLASS% -f slamd-client.conf -c classes %*
goto end


@@ -47,5 +47,5 @@ fi
# Invoke the tool.
TOOL_CLASS="com.slamd.tools.CommandLineClient"
exec "${JAVA_CMD}" ${JVM_ARGS} ${TOOL_CLASS} \
-f "${SCRIPT_DIR}/slamd_client.conf" -c "${SCRIPT_DIR}/classes" "${@}"
-f "${SCRIPT_DIR}/slamd-client.conf" -c "${SCRIPT_DIR}/classes" "${@}"

@@ -38,7 +38,7 @@ if not %JAVA_HOME_ERROR% == 0 exit /B %JAVA_HOME_ERROR%

rem Invoke the tool.
set TOOL_CLASS=com.slamd.tools.SwingClient
"%JAVA_CMD%" %JVM_ARGS% %TOOL_CLASS% -f slamd_client.conf -c classes %*
"%JAVA_CMD%" %JVM_ARGS% %TOOL_CLASS% -f slamd-client.conf -c classes %*
goto end


@@ -47,5 +47,5 @@ fi
# Invoke the tool.
TOOL_CLASS="com.slamd.tools.SwingClient"
exec "${JAVA_CMD}" ${JVM_ARGS} ${TOOL_CLASS} \
-f "${SCRIPT_DIR}/slamd_client.conf" -c "${SCRIPT_DIR}/classes" "${@}"
-f "${SCRIPT_DIR}/slamd-client.conf" -c "${SCRIPT_DIR}/classes" "${@}"

@@ -38,7 +38,7 @@ if not %JAVA_HOME_ERROR% == 0 exit /B %JAVA_HOME_ERROR%

rem Invoke the tool.
set TOOL_CLASS=com.slamd.tools.CommandLineResourceMonitorClient
"%JAVA_CMD%" %JVM_ARGS% %TOOL_CLASS% -f slamd_monitor_client.conf -c config %*
"%JAVA_CMD%" %JVM_ARGS% %TOOL_CLASS% -f slamd-monitor-client.conf -c config %*
goto end


@@ -47,6 +47,6 @@ fi
# Invoke the tool.
TOOL_CLASS="com.slamd.tools.CommandLineResourceMonitorClient"
exec "${JAVA_CMD}" ${JVM_ARGS} ${TOOL_CLASS} \
-f "${SCRIPT_DIR}/slamd_monitor_client.conf" -c "${SCRIPT_DIR}/config" \
-f "${SCRIPT_DIR}/slamd-monitor-client.conf" -c "${SCRIPT_DIR}/config" \
"${@}"

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -32,9 +32,9 @@
<property name="docs.dir" location="docs" />
<property name="scripts.dir" location="scripts" />
<property name="thirdparty.dir" location="thirdparty" />
<property name="base.server.dir" location="base_server" />
<property name="base.client.dir" location="base_client" />
<property name="base.monitor.dir" location="base_monitor_client" />
<property name="base.server.dir" location="base-server" />
<property name="base.client.dir" location="base-client" />
<property name="base.monitor.dir" location="base-monitor-client" />
<property name="checkstyle.dir" location="${ext.dir}/checkstyle" />
<property name="official_build" value="false" />
<property file="VERSION" />
@@ -239,29 +239,29 @@ public class DynamicConstants
<fileset dir="${base.client.dir}" includes="**/*" excludes="**/.svn" />
</copy>

<mkdir dir="${package.dir}/slamd/slamd_client/classes" />
<mkdir dir="${package.dir}/slamd/slamd-client/classes" />

<mkdir dir="${package.dir}/slamd/slamd_client/lib" />
<mkdir dir="${package.dir}/slamd/slamd-client/lib" />

<copy file="${package.dir}/slamd/webapps/slamd/WEB-INF/lib/slamd.jar"
todir="${package.dir}/slamd/slamd_client/lib" />
todir="${package.dir}/slamd/slamd-client/lib" />

<copy todir="${package.dir}/slamd/slamd_client/lib">
<copy todir="${package.dir}/slamd/slamd-client/lib">
<fileset dir="${lib.dir}" includes="**/*" excludes="**/.svn" />
</copy>

<copy todir="${package.dir}/slamd">
<fileset dir="${base.monitor.dir}" includes="**/*" excludes="**/.svn" />
</copy>

<mkdir dir="${package.dir}/slamd/slamd_monitor_client/classes" />
<mkdir dir="${package.dir}/slamd/slamd-monitor-client/classes" />

<mkdir dir="${package.dir}/slamd/slamd_monitor_client/lib" />
<mkdir dir="${package.dir}/slamd/slamd-monitor-client/lib" />

<copy file="${package.dir}/slamd/webapps/slamd/WEB-INF/lib/slamd.jar"
todir="${package.dir}/slamd/slamd_monitor_client/lib" />
todir="${package.dir}/slamd/slamd-monitor-client/lib" />

<copy todir="${package.dir}/slamd/slamd_monitor_client/lib">
<copy todir="${package.dir}/slamd/slamd-monitor-client/lib">
<fileset dir="${lib.dir}" includes="**/*" excludes="**/.svn" />
</copy>

@@ -271,47 +271,47 @@ public class DynamicConstants
<fixcrlf srcDir="${scripts.dir}" destDir="${package.dir}/slamd/tools"
includes="**/*.bat" eol="crlf" />

<mkdir dir="${package.dir}/slamd/slamd_client/tools" />
<mkdir dir="${package.dir}/slamd/slamd-client/tools" />
<fixcrlf srcDir="${scripts.dir}"
destDir="${package.dir}/slamd/slamd_client/tools"
destDir="${package.dir}/slamd/slamd-client/tools"
includes="**/*.sh" eol="lf" />
<fixcrlf srcDir="${scripts.dir}"
destDir="${package.dir}/slamd/slamd_client/tools"
destDir="${package.dir}/slamd/slamd-client/tools"
includes="**/*.bat" eol="crlf" />

<mkdir dir="${package.dir}/slamd/slamd_monitor_client/tools" />
<mkdir dir="${package.dir}/slamd/slamd-monitor-client/tools" />
<fixcrlf srcDir="${scripts.dir}"
destDir="${package.dir}/slamd/slamd_monitor_client/tools"
destDir="${package.dir}/slamd/slamd-monitor-client/tools"
includes="**/*.sh" eol="lf" />
<fixcrlf srcDir="${scripts.dir}"
destDir="${package.dir}/slamd/slamd_monitor_client/tools"
destDir="${package.dir}/slamd/slamd-monitor-client/tools"
includes="**/*.bat" eol="crlf" />

<fixcrlf srcDir="${package.dir}/slamd/bin" includes="*.sh" eol="lf" />
<fixcrlf srcDir="${package.dir}/slamd/bin" includes="*.bat" eol="crlf" />

<fixcrlf srcDir="${package.dir}/slamd/slamd_client" includes="*.sh"
<fixcrlf srcDir="${package.dir}/slamd/slamd-client" includes="*.sh"
eol="lf" />
<fixcrlf srcDir="${package.dir}/slamd/slamd_client" includes="*.bat"
<fixcrlf srcDir="${package.dir}/slamd/slamd-client" includes="*.bat"
eol="crlf" />

<fixcrlf srcDir="${package.dir}/slamd/slamd_monitor_client" includes="*.sh"
<fixcrlf srcDir="${package.dir}/slamd/slamd-monitor-client" includes="*.sh"
eol="lf" />
<fixcrlf srcDir="${package.dir}/slamd/slamd_monitor_client" includes="*.bat"
<fixcrlf srcDir="${package.dir}/slamd/slamd-monitor-client" includes="*.bat"
eol="crlf" />

<mkdir dir="${package.dir}/slamd/tools/MakeLDIF" />
<copy toDir="${package.dir}/slamd/tools/MakeLDIF">
<fileset dir="${scripts.dir}/MakeLDIF" excludes="**/.svn" />
</copy>

<mkdir dir="${package.dir}/slamd/slamd_client/tools/MakeLDIF" />
<copy toDir="${package.dir}/slamd/slamd_client/tools/MakeLDIF">
<mkdir dir="${package.dir}/slamd/slamd-client/tools/MakeLDIF" />
<copy toDir="${package.dir}/slamd/slamd-client/tools/MakeLDIF">
<fileset dir="${scripts.dir}/MakeLDIF" excludes="**/.svn" />
</copy>

<mkdir dir="${package.dir}/slamd/slamd_monitor_client/tools/MakeLDIF" />
<copy toDir="${package.dir}/slamd/slamd_monitor_client/tools/MakeLDIF">
<mkdir dir="${package.dir}/slamd/slamd-monitor-client/tools/MakeLDIF" />
<copy toDir="${package.dir}/slamd/slamd-monitor-client/tools/MakeLDIF">
<fileset dir="${scripts.dir}/MakeLDIF" excludes="**/.svn" />
</copy>

@@ -339,31 +339,31 @@ public class DynamicConstants
description="Package the SLAMD Server for distribution">
<echo message="Packaging SLAMD...." />

<zip destfile="${package.dir}/slamd/slamd_client-${build.id}.zip">
<zipfileset dir="${package.dir}/slamd" includes="slamd_client/**/*"
excludes="slamd_client/**/*.sh" filemode="644"
<zip destfile="${package.dir}/slamd/slamd-client-${build.id}.zip">
<zipfileset dir="${package.dir}/slamd" includes="slamd-client/**/*"
excludes="slamd-client/**/*.sh" filemode="644"
dirmode="755" />
<zipfileset dir="${package.dir}/slamd" includes="slamd_client/**/*.sh"
<zipfileset dir="${package.dir}/slamd" includes="slamd-client/**/*.sh"
filemode="755" dirmode="755" />
</zip>

<delete dir="${package.dir}/slamd/slamd_client" />
<copy file="${package.dir}/slamd/slamd_client-${build.id}.zip"
tofile="${package.dir}/slamd_client-${build.id}.zip" />
<delete dir="${package.dir}/slamd/slamd-client" />
<copy file="${package.dir}/slamd/slamd-client-${build.id}.zip"
tofile="${package.dir}/slamd-client-${build.id}.zip" />

<zip destfile="${package.dir}/slamd/slamd_monitor_client-${build.id}.zip">
<zip destfile="${package.dir}/slamd/slamd-monitor-client-${build.id}.zip">
<zipfileset dir="${package.dir}/slamd"
includes="slamd_monitor_client/**/*"
excludes="slamd_monitor_client/**/*.sh" filemode="644"
includes="slamd-monitor-client/**/*"
excludes="slamd-monitor-client/**/*.sh" filemode="644"
dirmode="755" />
<zipfileset dir="${package.dir}/slamd"
includes="slamd_monitor_client/**/*.sh" filemode="755"
includes="slamd-monitor-client/**/*.sh" filemode="755"
dirmode="755" />
</zip>

<delete dir="${package.dir}/slamd/slamd_monitor_client" />
<copy file="${package.dir}/slamd/slamd_monitor_client-${build.id}.zip"
tofile="${package.dir}/slamd_monitor_client-${build.id}.zip" />
<delete dir="${package.dir}/slamd/slamd-monitor-client" />
<copy file="${package.dir}/slamd/slamd-monitor-client-${build.id}.zip"
tofile="${package.dir}/slamd-monitor-client-${build.id}.zip" />

<zip destfile="${package.dir}/slamd-${build.id}.zip">
<zipfileset dir="${package.dir}" includes="slamd/**/*"

0 comments on commit dfc2563

Please sign in to comment.
You can’t perform that action at this time.