From aa9fbcc278f9f56619eee988b26fca47dedcc076 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Mon, 7 Mar 2011 16:09:23 +0000
Subject: [PATCH] Neues ccm-run Skript, das mit Wildcards im Classpath
 arbeitet.

git-svn-id: https://svn.libreccm.org/ccm/trunk@781 8810af33-2d31-482b-a856-94f89814c4df
---
 ccm-core/bin/ccm-run2                         | 46 +++++++++++++++++++
 .../ui/PublicationResources_de.properties     |  4 +-
 2 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 ccm-core/bin/ccm-run2

diff --git a/ccm-core/bin/ccm-run2 b/ccm-core/bin/ccm-run2
new file mode 100644
index 000000000..32d8a1909
--- /dev/null
+++ b/ccm-core/bin/ccm-run2
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+# This script is a wrapper for calling the CCM commandline utilites 
+# used for maintence of a CCM installation.
+
+# Variables for directories.
+# The path are relative to the bin directory of the CCM installation. This
+# means that this script has to be executed from the bin directory. If you
+# want to use this script from another directory, or include it into your 
+# PATH, you have to adjust the paths.
+CCM_LIB_DIR="../lib"
+CCM_HOME_DIR="../.."
+# Path of the lib directory of the Tomcat Server which runs the CCM installation.
+# If the CATALINA_HOME enviroment variable is not set on your system you have
+# to adjust this path to point to the lib directory of your Tomcat installation
+# (if you installed the Tomcat using the package manager of your distribution
+# this is usally /usr/share/tomcat6/lib)
+CATALINA_LIB_DIR="${CATALINA_HOME}/lib"
+
+# Script logic starts here
+echo "checking if all paths are correct..."
+files=$(ls ${CCM_LIB_DIR}/ccm-core*.jar 2> /dev/null | wc -l)
+
+if [ "$files" == "0" ]
+then
+    echo "Error: CCM_LIB_DIR is invalid \(no ccm-core*.jar file\(s\) in CCM_LIB_DIR\)."
+    exit 1
+fi
+
+if [ ! -d ${CCM_HOME_DIR}/__ccm__ ]
+then
+    echo "Error: CCM_HOME_DIR path is invalid \(no __ccm__ directory in CCM_HOME_DIR\)."
+    exit 1
+fi
+
+if [ ! -f ${CATALINA_LIB_DIR}/catalina.jar ]
+then
+    echo "Error: CATALINA_LIB_DIR is invalid \(no catalina.jar in CATALINA_LIB_DIR\)."
+    exit 1
+fi
+
+#Convert to absolute path:
+CCM_HOME_DIR=`cd ${CCM_HOME_DIR}; pwd`
+
+echo "executing ccm-run"
+java -cp ${CCM_LIB_DIR}/"*":${CATALINA_LIB_DIR}/"*" -Dccm.home=${CCM_HOME_DIR} $@
\ No newline at end of file
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources_de.properties b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources_de.properties
index 873ef5e30..b290bc2ef 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources_de.properties
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources_de.properties
@@ -203,7 +203,7 @@ publications.ui.series.volumes.select_publication=Publikation zum Hinzuf\u00fcge
 publications.ui.series.volumes.name=Name
 publications.ui.series.volumes.none=Keine B\u00e4nde gefunden.
 publications.ui.series.volumes.remove=Band entfernen.
-publications.ui.series.volumes.remove.confirm=Diesen Band wirklich entfernen
+publications.ui.series.volumes.remove.confirm=Diesen Band wirklich entfernen?
 publications.ui.series.volumes.volume_of_series=Band der Serie
 sciauthor.ui.edit_basic_properties=Basiseigenschaften
 publications.ui.inproceedings.pages_to=Seiten von
@@ -257,7 +257,7 @@ publications.ui.articleInCollectedVolume.selectCollectedVolume=Sammelband
 publications.ui.collectedVolume.addCollectedVolume=Diesen Artikel einem Sammelband zuordnen
 publication.ui.articleInJournal.journal=Zeitschrift
 publications.ui.articleInCollectedVolume.collectedVolume.confirm_remove=Wollen Sie diese Zuordnung wirklich entfernen?
-publications.ui.articleInJournal.addJournal=Dieses Artikel einer Zeitschrift zuordnen
+publications.ui.articleInJournal.addJournal=Diesen Artikel einer Zeitschrift zuordnen
 publication.ui.articleInJournal.journal.confirm_remove=Wollen Sie diese Zuordnung wirklich entfernen?
 publications.ui.articleInJournal.journal.none=Dieser Artikel ist derzeit keiner Zeitschrift zugeordnet
 publications.ui.articleInJournal.journal=Zeitschrift