From a78cad138b6080bf95a9e32dfea23a7f762ab3fa Mon Sep 17 00:00:00 2001
From: Aled Sage <aled.sage@gmail.com>
Date: Tue, 1 Apr 2014 17:37:12 +0100
Subject: [PATCH] rename "dropin" dir to "dropins"

---
 usage/dist/src/main/config/build-distribution-archive.xml | 4 ++--
 usage/dist/src/main/config/build-distribution-dir.xml     | 4 ++--
 usage/dist/src/main/dist/bin/brooklyn                     | 2 +-
 usage/dist/src/main/dist/bin/brooklyn.ps1                 | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/usage/dist/src/main/config/build-distribution-archive.xml b/usage/dist/src/main/config/build-distribution-archive.xml
index d6ad4682d4..929701041e 100644
--- a/usage/dist/src/main/config/build-distribution-archive.xml
+++ b/usage/dist/src/main/config/build-distribution-archive.xml
@@ -31,9 +31,9 @@
             </includes>
         </fileSet>
         <fileSet>
-            <!-- Add an empty dropin folder (so need to reference an existing dir, and exclude everything) -->
+            <!-- Add an empty dropins folder (so need to reference an existing dir, and exclude everything) -->
             <directory>${project.basedir}/src/main/dist/lib</directory>
-            <outputDirectory>/lib/dropin</outputDirectory>
+            <outputDirectory>/lib/dropins</outputDirectory>
             <fileMode>0755</fileMode>
             <directoryMode>0755</directoryMode>
             <excludes>
diff --git a/usage/dist/src/main/config/build-distribution-dir.xml b/usage/dist/src/main/config/build-distribution-dir.xml
index 9b21b6ea7e..e12aa4a3ff 100644
--- a/usage/dist/src/main/config/build-distribution-dir.xml
+++ b/usage/dist/src/main/config/build-distribution-dir.xml
@@ -31,9 +31,9 @@
             </includes>
         </fileSet>
         <fileSet>
-            <!-- Add an empty dropin folder (so need to reference an existing dir, and exclude everything) -->
+            <!-- Add an empty dropins folder (so need to reference an existing dir, and exclude everything) -->
             <directory>${project.basedir}/src/main/dist/lib</directory>
-            <outputDirectory>/lib/dropin</outputDirectory>
+            <outputDirectory>/lib/dropins</outputDirectory>
             <fileMode>0755</fileMode>
             <directoryMode>0755</directoryMode>
             <excludes>
diff --git a/usage/dist/src/main/dist/bin/brooklyn b/usage/dist/src/main/dist/bin/brooklyn
index 61ebf5af52..6f6c1321fd 100755
--- a/usage/dist/src/main/dist/bin/brooklyn
+++ b/usage/dist/src/main/dist/bin/brooklyn
@@ -21,7 +21,7 @@ if [ -z "${JAVA_OPTS}" ] ; then
 fi
 
 # set up the classpath
-INITIAL_CLASSPATH=${BROOKLYN_HOME}/conf:${BROOKLYN_HOME}/lib/patch/*:${BROOKLYN_HOME}/lib/brooklyn/*:${BROOKLYN_HOME}/lib/dropin/*
+INITIAL_CLASSPATH=${BROOKLYN_HOME}/conf:${BROOKLYN_HOME}/lib/patch/*:${BROOKLYN_HOME}/lib/brooklyn/*:${BROOKLYN_HOME}/lib/dropins/*
 # specify additional CP args in BROOKLYN_CLASSPATH
 if [ ! -z "${BROOKLYN_CLASSPATH}" ]; then
     INITIAL_CLASSPATH=${BROOKLYN_CLASSPATH}:${INITIAL_CLASSPATH}
diff --git a/usage/dist/src/main/dist/bin/brooklyn.ps1 b/usage/dist/src/main/dist/bin/brooklyn.ps1
index 2c8abe1693..0bea983e9e 100644
--- a/usage/dist/src/main/dist/bin/brooklyn.ps1
+++ b/usage/dist/src/main/dist/bin/brooklyn.ps1
@@ -72,8 +72,8 @@ if ( Test-Path ${BROOKLYN_HOME}\patch ) {
 
 $cp += Get-ChildItem ${BROOKLYN_HOME}\lib\brooklyn | Select-Object -ExpandProperty FullName
 
-if ( Test-Path ${BROOKLYN_HOME}\dropin ) {
-    $cp += Get-ChildItem ${BROOKLYN_HOME}\dropin | Select-Object -ExpandProperty FullName
+if ( Test-Path ${BROOKLYN_HOME}\dropins ) {
+    $cp += Get-ChildItem ${BROOKLYN_HOME}\dropins | Select-Object -ExpandProperty FullName
 }
 
 $INITIAL_CLASSPATH = $cp -join ';'