Allow overriding of startup properties using a properties file.

PR:             41538
Submitted by:   Goran Lowkrantz <goran.lowkrantz@ismobile.com>
See also:	http://kb.atlassian.com/content/atlassian/howto/orionproperties.jsp

3 files changed, 5 insertions, 1 deletions

diff --git a/www/orion-devel/Makefile b/www/orion-devel/Makefile
index 6e0f5a6838a4..c66b2bd1c815 100644
--- a/www/orion-devel/Makefile
+++ b/www/orion-devel/Makefile
@@ -113,6 +113,7 @@ do-install:
 
 	@${ECHO_CMD} -n ">> Copying files to destination directory..."
 	@${CP} -R ${WRKSRC}/* ${APP_HOME}
+	@${CP} ${PATCHDIR}/orion.properties ${APP_HOME}
 	@${CP} ${WRKDIR}/default-web-site.xml ${WRKDIR}/rmi.xml ${APP_HOME}/config
 	@${ECHO_CMD} " [ DONE ]"
 
@@ -126,7 +127,7 @@ do-install:
 	@${ECHO_CMD} -n ">> Compiling and installing control program..."
 	@${SED} \
 	-e "/%%JAVA_ARGS%%/s///g" \
-	-e "/%%JAR_ARGS%%/s///g" \
+	-e "/%%JAR_ARGS%%/s//\"-p\",/g" \
 	${WRKDIR}/daemonctl.c > ${WRKDIR}/daemonctl_.c
 	@cd ${WRKDIR} && ${CC} -ansi -o ${CONTROL_SCRIPT_NAME} daemonctl_.c
 	@${CP} ${WRKDIR}/${CONTROL_SCRIPT_NAME} ${CONTROL_SCRIPT}
diff --git a/www/orion-devel/files/orion.properties b/www/orion-devel/files/orion.properties
new file mode 100644
index 000000000000..130fd10eda41
--- /dev/null
+++ b/www/orion-devel/files/orion.properties
@@ -0,0 +1,2 @@
+# Properties read by Orion on startup
+#
diff --git a/www/orion-devel/pkg-plist b/www/orion-devel/pkg-plist
index 67b0c7ddb733..b0397f455df6 100644
--- a/www/orion-devel/pkg-plist
+++ b/www/orion-devel/pkg-plist
@@ -317,6 +317,7 @@ bin/orionctl
 %%T%%/taglibassembler.jar
 %%T%%/parser.jar
 %%T%%/orionconsole.jar
+%%T%%/orion.properties
 %%T%%/orion.jar
 %%T%%/tools.jar
 %%T%%/mail.jar