Beseitigen von svn mess.

git-svn-id: https://svn.libreccm.org/ccm/trunk@1346 8810af33-2d31-482b-a856-94f89814c4df

ccm-sci-bundle/bundles/devel/cfg/integration.properties

@@ -1,15 +1,21 @@
 # Scientific CMS devel bundle integration.properties
 #
-
 waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
-waf.categorization.show_internal_name=true
-waf.dispatcher.default_expiry=3600
+#
+; dhtml editor to use (system wide)
+; Xinha is default
+; default: Xinha editor & src=/assets/xinha/XinhaLoader.js
+#waf.bebop.dhtml_editor=FCKeditor
 
+waf.categorization.show_internal_name=true
+
+waf.dispatcher.default_expiry=3600
+;
 waf.kernel.data_permission_check_enabled=false
 waf.kernel.primary_user_identifier=email
+; if you activate screen_name, forum loader does not work.
+; waf.kernel.primary_user_identifier=screen_name
 waf.kernel.supported_languages=de,en
-waf.kernel.language_independent_item=true
-waf.kernel.language_independent_code=de
 
 ; security.properties: 
 waf.auto_registration_on=false
@@ -31,6 +37,7 @@ waf.xml.xsl_transformer=xalan
 waf.xml.activate_full_date_formatter=true
 
 # ccm-cms parameters
+
 com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker
 
 com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp
@@ -38,17 +45,27 @@ com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
 com.arsdigita.cms.default_template_resolver_class=com.arsdigita.subsite.dispatcher.SubsiteItemTemplateResolver
 
 ; Configure dhtml editor for use in cms content-center
+; Xinha is default and should work out of the box
+; com.arsdigita.cms.dhtml_editor_config=Xinha.Config,/assets/xinha/XinhaConfig.js
+; as a temporary measure a different configuration file which includes a link selection box for CCM items
+; and CCM images should be specified:
 com.arsdigita.cms.dhtml_editor_config=Xinha.Config,/assets/xinha/CCMcmsXinhaConfig.js
+
+; to use FCKeditor:
+; com.arsdigita.cms.dhtml_editor_config=FCKEditor.Config.StyleDefault?,/assets/fckeditor/config/fckconfigOpenCCM.js
+; com.arsdigita.cms.dhtml_editor_config=Xinha.Config,/assets/xinha/XinhaConfig.js
+; com.arsdigita.cms.dhtml_editor_hidden_buttons=
+; com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
 com.arsdigita.cms.dhtml_editor_plugins=
 
 com.arsdigita.cms.disable_item_pfs=true
 
-com.arsdigita.cms.hide_admin_tabs=false
+com.arsdigita.cms.hide_admin_tabs=true
 com.arsdigita.cms.hide_folder_index_checkbox=true
-com.arsdigita.cms.hide_launch_date=false
-com.arsdigita.cms.hide_templates_tab=false
-com.arsdigita.cms.hide_timezone=false
-com.arsdigita.cms.hide_udct_ui=false
+com.arsdigita.cms.hide_launch_date=true
+com.arsdigita.cms.hide_templates_tab=true
+com.arsdigita.cms.hide_timezone=true
+com.arsdigita.cms.hide_udct_ui=true
 
 com.arsdigita.cms.use_section_categories=false
 com.arsdigita.cms.use_streamlined_creation=true
@@ -95,21 +112,25 @@ com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCat
 
 # ccm-themedirector application
 themedirector.default_theme_context=
+# themedirector.default_theme_manifest=ccm-zes-aplaws.web.mf
 themedirector.default_theme_path=themes/static/aplaws-generic
 themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl
 
 
+# ccm-sci-bundle (Loader only)
+#com.arsdigita.bundle.loader.category_files=bundle/categories/sci-nav-domain-1.00.xml,bundle/categories/sci-nav-hierarchy-1.00.xml
+
 # =============================================================================================
 # runtime specific configurations
 
-waf.admin.email=webmaster@ccm.uni-bremen.de
-waf.admin.name.given=CCM
+waf.admin.email=webmaster@scientificCMS.org
+waf.admin.name.given=SCI
 waf.admin.name.family=Administrator
-waf.admin.password=nge2015
+waf.admin.password=sci2000
 waf.admin.password.question=12345
 waf.admin.password.answer=6
 
-waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm?user\=ccm&password\=ccm
+waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm-sci?user\=sci&password\=sci47web&stringtype\=unspecified
 waf.runtime.jdbc_pool_size=30
 
 waf.web.server=localhost\:8080

ccm-sci-bundle/bundles/devel/cfg/project.xml

@@ -49,7 +49,7 @@
         <ccm:application name="ccm-ldn-util"/>
 
 <!--   SCI extension  -->
-        <ccm:application name="ccm-quasi-aplaws"/>
+        <ccm:application name="ccm-sci-bundle"/>
 
 
 

ccm-sci-bundle/src/ccm-sci-bundle.config

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<registry>
+   <!-- Config specifies the name of the class which handles configuration
+        properties and the directory and file name of the config parameters
+        in registry.                                                         -->
+   <!--  currently nothing to config
+   <config class="com.arsdigita.bundle.BundleConfig"
+         storage="ccm-sci-bundle/bundle.properties"/>
+   -->
+
+</registry>

ccm-sci-bundle/src/ccm-sci-bundle.load

@@ -0,0 +1,22 @@
+<load>
+  <requires>
+    <table name="inits"/>
+    <table name="acs_objects"/>
+    <initializer class="com.arsdigita.core.Initializer"/>
+    <table name="cms_items"/>
+    <initializer class="com.arsdigita.cms.Initializer"/>
+    <initializer class="com.arsdigita.portalworkspace.Initializer"/>
+    <initializer class="com.arsdigita.subsite.Initializer"/>
+    <initializer class="com.arsdigita.london.search.Initializer"/>
+    <initializer class="com.arsdigita.london.terms.Initializer"/>
+  </requires>
+  <provides>
+  <!--
+    <table name=""/>
+  -->
+    <initializer class="com.arsdigita.bundle.Initializer"/>
+  </provides>
+  <scripts>
+    <data class="com.arsdigita.bundle.Loader"/>
+  </scripts>
+</load>

ccm-sci-bundle/src/ccm-sci-bundle.upgrade

@@ -0,0 +1,5 @@
+<upgrade>
+  <version from="0.0.0" to="6.6.0">
+    <script sql="ccm-sci-bundle/upgrade/::database::-0.0.0-6.6.0.sql"/>
+  </version>
+</upgrade>

ccm-sci-bundle/src/com/arsdigita/bundle/Bundle.java.nolongerInUse

@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2002-2005 Runtime Collective Ltd. All Rights Reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+package com.arsdigita.aplaws;
+
+import org.apache.log4j.Logger;
+
+public class Aplaws {
+    public static final String versionId =
+        "$Id: Aplaws.java 1297 2006-08-25 18:17:50Z apevec $";
+
+    private static final Logger LOG = Logger.getLogger(Aplaws.class);
+
+    private static AplawsConfig aplawsConfig = new AplawsConfig();
+
+    static {
+        aplawsConfig.load();
+    }
+
+    public static final AplawsConfig getAplawsConfig() {
+        return aplawsConfig;
+    }
+}

ccm-sci-bundle/src/com/arsdigita/bundle/BundleConfig.java.nolongerInUse

@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2002-2005 Runtime Collective Ltd. All Rights Reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+package com.arsdigita.aplaws;
+
+import com.arsdigita.runtime.AbstractConfig;
+import com.arsdigita.util.parameter.Parameter;
+import com.arsdigita.util.parameter.BooleanParameter;
+import com.arsdigita.util.parameter.StringParameter;
+
+/**
+ * AplawsConfig
+ *
+ * @version $Revision: 1.2 $ $Date: 2005/01/07 19:01:40 $
+ * @version $Id: AplawsConfig.java 1565 2007-04-18 16:46:14Z apevec $
+ */
+public class AplawsConfig extends AbstractConfig {
+
+	private final Parameter m_ajaxExpandAllBranches = new BooleanParameter(
+                "com.arsdigita.aplaws.ajax_expand_on_all_branches", 
+                Parameter.OPTIONAL, 
+                Boolean.FALSE);
+	
+
+
+    public AplawsConfig() {
+        register(m_ajaxExpandAllBranches);
+        loadInfo();
+    }
+
+    
+    
+    public boolean ajaxExpandAllBranches () {
+    	return ((Boolean)get(m_ajaxExpandAllBranches)).booleanValue();
+    }
+}

ccm-sci-bundle/src/com/arsdigita/bundle/BundleConfig_parameter.properties.nolongerInUse

@@ -0,0 +1,4 @@
+com.arsdigita.aplaws.ajax_expand_on_all_branches.title=Use Ajax on all branch expansions
+com.arsdigita.aplaws.ajax_expand_on_all_branches.purpose=Use Ajax on all branches, or bring back entire subtree on expansion of top level root
+com.arsdigita.aplaws.ajax_expand_on_all_branches.example=true|false
+com.arsdigita.aplaws.ajax_expand_on_all_branches.format=[boolean]