diff --git a/ccm-cms-dabinimporter/src/com/arsdigita/cms/dabin/DaBInImporter.java b/ccm-cms-dabinimporter/src/com/arsdigita/cms/dabin/DaBInImporter.java index 13e0b1655..502c27da2 100644 --- a/ccm-cms-dabinimporter/src/com/arsdigita/cms/dabin/DaBInImporter.java +++ b/ccm-cms-dabinimporter/src/com/arsdigita/cms/dabin/DaBInImporter.java @@ -99,7 +99,7 @@ public class DaBInImporter extends Program { private static final Logger logger = Logger.getLogger(DaBInImporter.class); private Properties config; private String timestamp = null; - private ContentSection section; + private ContentSection section; private ContentSection personsSection; private ContentSection projectsSection; private ContentSection publicationsSection; @@ -110,6 +110,7 @@ public class DaBInImporter extends Program { private Connection connection = null; private Folder root; private Folder personsRootFolder; + private Folder membersRootFolder; private Folder projectsRootFolder; private Folder publicationsRootFolder; private Folder authors; @@ -202,6 +203,7 @@ public class DaBInImporter extends Program { section = getContentSection(config.getProperty("ccm.contentsection")); personsSection = getContentSection(config.getProperty( "ccm.personsContentSection")); + projectsSection = getContentSection(config.getProperty( "ccm.projectsContentSection")); publicationsSection = getContentSection(config.getProperty( @@ -256,6 +258,7 @@ public class DaBInImporter extends Program { "\nCreating CCM folders (if they do not exist already)..."); root = section.getRootFolder(); personsRootFolder = personsSection.getRootFolder(); + membersRootFolder = section.getRootFolder(); projectsRootFolder = projectsSection.getRootFolder(); publicationsRootFolder = publicationsSection.getRootFolder(); @@ -266,7 +269,7 @@ public class DaBInImporter extends Program { departments = createFolder(root, "abteilungen", "Abteilungen"); - members = createFolder(personsRootFolder, "mitglieder", "Mitglieder"); + members = createFolder(membersRootFolder, "mitglieder", "Mitglieder"); organization = createFolder(root, "organisationen", "Organisation(en)"); diff --git a/ccm-core/bin/ccm-run2 b/ccm-core/bin/ccm-run2 index 25f705dc1..3a41c0a6c 100644 --- a/ccm-core/bin/ccm-run2 +++ b/ccm-core/bin/ccm-run2 @@ -43,4 +43,4 @@ fi 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 +java -cp ${CCM_LIB_DIR}/"*":${CATALINA_LIB_DIR}/"*" -Dccm.home=${CCM_HOME_DIR} "$@" \ No newline at end of file