From c4b7c6e47f4df6814092d8c692532378d8ba5df1 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Fri, 28 Sep 2012 17:47:05 +0000
Subject: [PATCH] BIS-221 / SP-31 Core Plugins Improvements: rename
core_plugins.properties to core-plugins.properties.
SVN: 26855
---
datastore_server/build/build.xml | 2 +-
.../ch/systemsx/cisd/openbis/installer/izpack/Utils.java | 2 +-
openbis/build/build.xml | 8 ++++----
openbis/dist/server/install.sh | 4 ++--
.../generic/shared/coreplugin/CorePluginsUtils.java | 4 ++--
openbis_standard_technologies/build/build.xml | 4 ++--
screening/build/build.xml | 2 +-
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/datastore_server/build/build.xml b/datastore_server/build/build.xml
index a22f0bbcf5a..5bbbdae91ab 100644
--- a/datastore_server/build/build.xml
+++ b/datastore_server/build/build.xml
@@ -122,7 +122,7 @@
<param name="project-path" value="" />
<param name="plugin-kind" value="dss" />
</antcall>
- <delete file="${dist}/core-plugins/core_plugins.properties"/>
+ <delete file="${dist}/core-plugins/core-plugins.properties"/>
<move todir="${dist.datastore_server}">
<fileset dir="${dist}">
<include name="*.MD5"/>
diff --git a/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/Utils.java b/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/Utils.java
index 5e07d0f0f79..5f1d8373c8d 100644
--- a/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/Utils.java
+++ b/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/Utils.java
@@ -44,7 +44,7 @@ class Utils
static final String AS_PATH = SERVERS_PATH + "openBIS-server/jetty/";
static final String DSS_PATH = SERVERS_PATH + "datastore_server/";
static final String SERVICE_PROPERTIES_PATH = "etc/service.properties";
- static final String CORE_PLUGINS_PROPERTIES_PATH = CORE_PLUGINS_PATH + "core_plugins.properties";
+ static final String CORE_PLUGINS_PROPERTIES_PATH = CORE_PLUGINS_PATH + "core-plugins.properties";
static final String JETTY_XML_PATH = "etc/jetty.xml";
static final String KEYSTORE_PATH = "etc/openBIS.keystore";
diff --git a/openbis/build/build.xml b/openbis/build/build.xml
index c7001720922..1b8ba8e1816 100644
--- a/openbis/build/build.xml
+++ b/openbis/build/build.xml
@@ -210,7 +210,7 @@
</fileset>
<fileset dir="dist/server/etc">
<include name="log.xml" />
- <include name="core_plugins.properties" />
+ <include name="core-plugins.properties" />
</fileset>
</checksum>
</target>
@@ -647,10 +647,10 @@
<copy todir="${dist}/core-plugins">
<fileset dir="${project-path}${core-plugins.folder}" erroronmissingdir="false"
includesfile="${dist}/core-plugin-paths">
- <exclude name="core_plugins.properties"/>
+ <exclude name="core-plugins.properties"/>
</fileset>
<fileset dir="${project-path}dist/server" erroronmissingdir="false">
- <include name="core_plugins.properties"/>
+ <include name="core-plugins.properties"/>
</fileset>
</copy>
<delete file="${dist}/core-plugin-paths"/>
@@ -693,7 +693,7 @@
<classes dir="${original.server.dist}">
<include name="etc/log.xml" />
<include name="etc/passwd" />
- <include name="etc/core_plugins.properties" />
+ <include name="etc/core-plugins.properties" />
</classes>
<classes dir="${classes}">
<include name="${build.info.filename}" />
diff --git a/openbis/dist/server/install.sh b/openbis/dist/server/install.sh
index d541fd9fd3d..e97dfc4fdd9 100755
--- a/openbis/dist/server/install.sh
+++ b/openbis/dist/server/install.sh
@@ -101,8 +101,8 @@ echo "Make the configuration checksum file available : " $checksum_file
test -f "$checksum_file" && cp -p "$checksum_file" "$jetty_folder"
echo installing core-plugins
-if [ -f "$server_folder/../core-plugins/core_plugins.properties" ]; then
- excludingStuff="-x core-plugins/core_plugins.properties"
+if [ -f "$server_folder/../core-plugins/core-plugins.properties" ]; then
+ excludingStuff="-x core-plugins/core-plugins.properties"
fi
unzip -quo "$installation_folder/core-plugins.zip" $excludingStuff -d "$server_folder/.."
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginsUtils.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginsUtils.java
index f38f126ca9c..7d636ff926b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginsUtils.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginsUtils.java
@@ -35,10 +35,10 @@ public class CorePluginsUtils
static final String DEFAULT_AS_CORE_PLUGINS_FOLDER = "../../core-plugins";
- public static final String CORE_PLUGINS_PROPERTIES_FILE = "core_plugins.properties";
+ public static final String CORE_PLUGINS_PROPERTIES_FILE = "core-plugins.properties";
/**
- * Adds the content of <code>core_plugins.properties</code> file to the specified properties.
+ * Adds the content of <code>core-plugins.properties</code> file to the specified properties.
* The folder with the core plugins properties file is specified by the property
* <code>core-plugins-folder</code> of the specified properties. If undefined a default value is
* used. Note, that the core plugin properties might overwrite value in the specified properties
diff --git a/openbis_standard_technologies/build/build.xml b/openbis_standard_technologies/build/build.xml
index b02615c44f0..45a5abf6cc9 100644
--- a/openbis_standard_technologies/build/build.xml
+++ b/openbis_standard_technologies/build/build.xml
@@ -21,7 +21,7 @@
<param name="project-path" value="../deep_sequencing_unit/"/>
<param name="plugin-kind" value="as"/>
</antcall>
- <copy todir="${dist}/core-plugins" file="dist/etc/core_plugins.properties"/>
+ <copy todir="${dist}/core-plugins" file="dist/etc/core-plugins.properties"/>
</target>
<target name="dist" depends="clean">
@@ -61,7 +61,7 @@
<param name="project-path" value="../screening/" />
<param name="plugin-kind" value="dss" />
</antcall>
- <delete file="${dist}/core-plugins/core_plugins.properties"/>
+ <delete file="${dist}/core-plugins/core-plugins.properties"/>
<antcall target="screening.add-stuff-to-dss-dist"/>
<antcall target="screening.compute-dss-checksum"/>
diff --git a/screening/build/build.xml b/screening/build/build.xml
index 25d56d44eb4..f427f3d5e74 100644
--- a/screening/build/build.xml
+++ b/screening/build/build.xml
@@ -151,7 +151,7 @@
<checksum todir="${dist}" pattern="{0} etc/{1}">
<fileset dir="../screening/dist/etc">
<include name="service.properties" />
- <include name="core_plugins.properties" />
+ <include name="core-plugins.properties" />
<include name="tabular-data-graph.properties" />
<include name="log.xml" />
<include name="openBIS.keystore" />
--
GitLab