Skip to content

Commit 2014558

Browse files
authored
Merge pull request #1267 from rabbitmq/rename-schema-file
Rename schema file to match application name.
2 parents 1de9c89 + 63c2637 commit 2014558

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed
File renamed without changes.

scripts/rabbitmq-server

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ if [ ! -d ${RABBITMQ_GENERATED_CONFIG_DIR} ]; then
115115
mkdir -p "${RABBITMQ_GENERATED_CONFIG_DIR}"
116116
fi
117117

118-
if [ ! -f "${RABBITMQ_SCHEMA_DIR}/rabbitmq.schema" ]; then
119-
cp "${RABBITMQ_HOME}/priv/schema/rabbitmq.schema" "${RABBITMQ_SCHEMA_DIR}"
118+
if [ ! -f "${RABBITMQ_SCHEMA_DIR}/rabbit.schema" ]; then
119+
cp "${RABBITMQ_HOME}/priv/schema/rabbit.schema" "${RABBITMQ_SCHEMA_DIR}"
120120
fi
121121

122122
set -e

scripts/rabbitmq-server.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ if not exist "!RABBITMQ_GENERATED_CONFIG_DIR!" (
7979
mkdir "!RABBITMQ_GENERATED_CONFIG_DIR!"
8080
)
8181

82-
if not exist "!RABBITMQ_SCHEMA_DIR!\rabbitmq.schema" (
83-
copy "!RABBITMQ_HOME!\priv\schema\rabbitmq.schema" "!RABBITMQ_SCHEMA_DIR!\rabbitmq.schema"
82+
if not exist "!RABBITMQ_SCHEMA_DIR!\rabbit.schema" (
83+
copy "!RABBITMQ_HOME!\priv\schema\rabbit.schema" "!RABBITMQ_SCHEMA_DIR!\rabbit.schema"
8484
)
8585

8686
set RABBITMQ_EBIN_PATH="-pa !RABBITMQ_EBIN_ROOT!"

scripts/rabbitmq-service.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ if not exist "!RABBITMQ_GENERATED_CONFIG_DIR!" (
165165
mkdir "!RABBITMQ_GENERATED_CONFIG_DIR!"
166166
)
167167

168-
if not exist "!RABBITMQ_SCHEMA_DIR!\rabbitmq.schema" (
169-
copy "!RABBITMQ_HOME!\priv\schema\rabbitmq.schema" "!RABBITMQ_SCHEMA_DIR!\rabbitmq.schema"
168+
if not exist "!RABBITMQ_SCHEMA_DIR!\rabbit.schema" (
169+
copy "!RABBITMQ_HOME!\priv\schema\rabbit.schema" "!RABBITMQ_SCHEMA_DIR!\rabbit.schema"
170170
)
171171
REM Try to create advanced config file, if it doesn't exist
172172
REM It still can fail to be created, but at least not for default install

0 commit comments

Comments
 (0)