LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Nachtrag. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@1399 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2011-12-26 16:29:52 +00:00
parent bba7fe7f99
commit 60c58551a9
34 changed files with 79 additions and 438 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ccm-shortcuts/doc/shortcuts-standalone/README
View File

@ -1,5 +1,5 @@
Up to APLAWS version 1.0.4 shortcuts had been installed into its own
application context: [webapps]/ccm-shortcuts.
application context: [webapps]/ccm-ldn-shortcuts.
Now it is installed inside the main APLAWS application context along
with all other applications.
@ -8,7 +8,7 @@ If shortcuts should be installed as its own web context again following
modifications are necessary:
1. remove webapp="xxx" from application.xml
2. move the files in this dir to WEB-INF/
3. change src/com/ad/shortcuts/Shortcuts.java
3. change src/com/ad/london/shortcuts/Shortcuts.java
method getServletContext() as back to "/files"
4. edit __ccm__/.../xsl/index.xsl according the comment
5. edit in ccm-ldn-aplaws /web/__ccm__/themes/aplaws/shortcuts.xml

4
ccm-shortcuts/doc/shortcuts-standalone/web.xml
View File

@ -8,7 +8,7 @@
<servlet-class>com.arsdigita.web.ContextRegistrationServlet</servlet-class>
<init-param>
<param-name>uri</param-name>
<param-value>/ccm-shortcuts/</param-value>
<param-value>/ccm-ldn-shortcuts/</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
@ -18,7 +18,7 @@
<servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
<init-param>
<param-name>template-path</param-name>
<param-value>/templates/ccm-shortcuts</param-value>
<param-value>/templates/ccm-ldn-shortcuts</param-value>
</init-param>
</servlet>

4
ccm-shortcuts/doc/web.xml-shortcuts.in
View File

@ -4,13 +4,13 @@
<servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
<init-param>
<param-name>template-path</param-name>
<param-value>/templates/ccm-shortcuts</param-value>
<param-value>/templates/ccm-ldn-shortcuts</param-value>
</init-param>
</servlet>
<!-- module ccm-ldn-shortcuts - servlet mappings -->
<servlet-mapping>
<servlet-name>shortcuts-files</servlet-name>
<url-pattern>/ccm-shortcuts/files/*</url-pattern>
<url-pattern>/ccm-ldn-shortcuts/files/*</url-pattern>
</servlet-mapping>

11
ccm-shortcuts/pdl/com/arsdigita/london/shortcuts/Shortcut.pdl 100755
View File

@ -0,0 +1,11 @@
model com.arsdigita.london.shortcuts;
object type Shortcut {
BigDecimal[1..1] shortcutID = sc_shortcuts.shortcut_id INTEGER;
String[1..1] urlKey = sc_shortcuts.url_key VARCHAR(1000);
String[1..1] redirect = sc_shortcuts.redirect VARCHAR(1000);
object key (shortcutID);
}

7
ccm-shortcuts/pdl/com/arsdigita/shortcuts/Shortcuts.pdl → ccm-shortcuts/pdl/com/arsdigita/london/shortcuts/Shortcuts.pdl
View File

@ -15,13 +15,10 @@
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
model com.arsdigita.shortcuts;
model com.arsdigita.london.shortcuts;
import com.arsdigita.web.Application;
object type Shortcuts extends Application {
// nothing to persist
// there is only one instance of shortcuts (the admin application) and
// no instance specific settings to be persisted.
// reference key (sc_app.application_id);
reference key (sc_app.application_id);
}

28
ccm-shortcuts/pdl/com/arsdigita/shortcuts/Shortcut.pdl
View File

@ -1,28 +0,0 @@
//
// Copyright (C) 2001-2004 Red Hat Inc. 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
model com.arsdigita.shortcuts;
object type Shortcut {
BigDecimal[1..1] shortcutID = sc_shortcuts.shortcut_id INTEGER;
String[1..1] urlKey = sc_shortcuts.url_key VARCHAR(1000);
String[1..1] redirect = sc_shortcuts.redirect VARCHAR(1000);
object key (shortcutID);
}

0
ccm-shortcuts/sql/ccm-shortcuts/default/sequence-ss_shortcuts_seq.sql → ccm-shortcuts/sql/ccm-ldn-shortcuts/default/sequence-ss_shortcuts_seq.sql
View File

0
ccm-shortcuts/sql/ccm-shortcuts/default/table-sc_shortcuts.sql → ccm-shortcuts/sql/ccm-ldn-shortcuts/default/table-sc_shortcuts.sql
View File

0
ccm-shortcuts/sql/ccm-shortcuts/oracle-se-create.sql → ccm-shortcuts/sql/ccm-ldn-shortcuts/oracle-se-create.sql
View File

0
ccm-shortcuts/sql/ccm-shortcuts/postgres-create.sql → ccm-shortcuts/sql/ccm-ldn-shortcuts/postgres-create.sql
View File

23
ccm-shortcuts/sql/ccm-shortcuts/upgrade/default/6.6.0-6.6.1/drop_app_table.sql
View File

@ -1,23 +0,0 @@
--
-- Copyright (C) 2011 Peter Boy 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
--
-- $Id: drop_app_table.sql pboy $
-- drops table subsite_app which just contained application type id and is
-- never used for any action.
drop table sc_app ;

131
ccm-shortcuts/sql/ccm-shortcuts/upgrade/default/6.6.0-6.6.1/remove_legacy_entries.sql
View File

@ -1,131 +0,0 @@
--
-- Copyright (C) 2011 Peter Boy. 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
--
-- $Id: remove_legacy_entries.sql $
-- Subsite is now initialized as a legacy free type of application so
-- entries in tables apm_package_types are no longer needed.
-- in case there may be several application instances!
-- delete from object_context all entries referring to node_id in site_nodes
delete from object_context
where object_id in
(select node_id from site_nodes object_id where object_id in
( select package_id from applications where application_type_id =
(select application_type_id from application_types
where object_type
like '%shortcuts.Shortcuts%')
)
);
-- delete from acs_objects all entries referring to node_id in site_nodes
alter table site_nodes drop constraint site_nodes_node_id_f_n1m2y ;
delete from acs_objects
where object_id in
(select node_id from site_nodes where object_id in
( select package_id from applications where application_type_id =
(select application_type_id from application_types
where object_type
like '%shortcuts.Shortcuts%')
)
);
-- delete all entries in site_nodes referring to a subsite instance
delete from site_nodes
where object_id in
(select package_id from applications where application_type_id =
(select application_type_id from application_types
where object_type
like '%shortcuts.Shortcuts%')
);
alter table site_nodes add constraint site_nodes_node_id_f_n1m2y
FOREIGN KEY (node_id)
REFERENCES acs_objects (object_id) MATCH SIMPLE
ON UPDATE NO ACTION ON DELETE NO ACTION ;
-- delete from object_context all entries referring to package_id in apm_packages
delete from object_context
where object_id in
(select package_id from apm_packages where package_type_id =
(select package_type_id from application_types
where object_type
like 'com.arsdigita.shortcuts.Shortcuts')
);
-- delete from acs_objects all entries referring to package_id in apm_packages
alter table apm_packages drop constraint apm_package_package_id_f_46may ;
alter table applications drop constraint application_package_id_f_cdaho ;
delete from acs_objects
where object_id in
(select package_id from apm_packages where package_type_id =
(select package_type_id from application_types
where object_type
like 'com.arsdigita.shortcuts.Shortcuts')
);
-- delete all entries for subsite instances in apm_packages
-- identified by package_type_id in application_types
delete from apm_packages
where package_type_id =
(select package_type_id from application_types
where object_type
like 'com.arsdigita.shortcuts.Shortcuts') ;
-- there seem to be no intries for a apm_packages_types entry (row) in
-- acs_objects or object_context!
-- delete all entries for subsite in apm_package_types identified by
-- package_type_id in application_types
alter table application_types drop constraint applica_typ_pac_typ_id_f_v80ma ;
delete from apm_package_types
where package_type_id =
(select package_type_id from application_types
where object_type
like 'com.arsdigita.shortcuts.Shortcuts') ;
-- set package_id to null for all entries referring to a subsite instance
-- (indicating a new legacy free application)
update applications
set package_id = null
where application_type_id =
(select application_type_id from application_types
where object_type
like 'com.arsdigita.shortcuts.Shortcuts') ;
-- set package_id to null for all entries referring to a subsite instance
-- (indicating a new legacy free application)
update application_types
set package_type_id = null
where object_type like 'com.arsdigita.shortcuts.Shortcuts' ;
alter table application_types add constraint applica_typ_pac_typ_id_f_v80ma
FOREIGN KEY (package_type_id)
REFERENCES apm_package_types (package_type_id)
MATCH SIMPLE ON UPDATE NO ACTION ON DELETE NO ACTION ;
alter table applications add constraint application_package_id_f_cdaho
FOREIGN KEY (package_id)
REFERENCES apm_packages (package_id) MATCH SIMPLE
ON UPDATE NO ACTION ON DELETE NO ACTION ;
alter table apm_packages add constraint apm_package_package_id_f_46may
FOREIGN KEY (package_id)
REFERENCES acs_objects (object_id) MATCH SIMPLE
ON UPDATE NO ACTION ON DELETE NO ACTION ;

66
ccm-shortcuts/sql/ccm-shortcuts/upgrade/default/6.6.0-6.6.1/upd_system_tables.sql
View File

@ -1,66 +0,0 @@
--
-- Copyright (C) 2011 Peter Boy 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
--
-- $Id: upd_system_tables.sql pboy $
-- adjust various system tables to the new name of application shortcuts
alter table init_requirements drop constraint init_requirements_init_f_cmmdn ;
alter table init_requirements drop constraint init_require_requ_init_f_i6rgg ;
update inits
set class_name=replace(class_name,'london.shortcuts', 'shortcuts')
where class_name like '%london.shortcuts%' ;
update init_requirements
set init=replace(init,'london.shortcuts', 'shortcuts')
where init like '%london.shortcuts%' ;
update init_requirements
set required_init=replace(required_init,'london.shortcuts', 'shortcuts')
where required_init like '%london.shortcuts%' ;
ALTER TABLE ONLY init_requirements
ADD CONSTRAINT init_requirements_init_f_cmmdn FOREIGN KEY (init)
REFERENCES inits (class_name) MATCH SIMPLE
ON UPDATE NO ACTION ON DELETE NO ACTION;
ALTER TABLE init_requirements
ADD CONSTRAINT init_require_requ_init_f_i6rgg FOREIGN KEY (required_init)
REFERENCES inits (class_name) MATCH SIMPLE
ON UPDATE NO ACTION ON DELETE NO ACTION;
update application_types
set object_type=replace(object_type,'london.shortcuts', 'shortcuts')
where object_type like '%london.shortcuts%' ;
-- table applications doesn't require an update
-- table apm_package_types doesn't require an update
-- table apm_packages doesn't require an update either
-- table site_nodes doesn't require an update either
-- update application type in acs_objects
update acs_objects
set (object_type,default_domain_class) =
(replace(object_type,'london.shortcuts', 'shortcuts') ,
replace(default_domain_class,'london.shortcuts', 'shortcuts') )
where object_type like '%london.shortcuts%' ;

30
ccm-shortcuts/sql/ccm-shortcuts/upgrade/oracle-se-6.6.0-6.6.1.sql
View File

@ -1,30 +0,0 @@
--
-- Copyright (C) 2011 Peter Boy 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
--
-- $DateTime: 2011/03/27 23:15:09 $
-- $Id: oracle-se-6.6.0-6.6.1 pboy $
-- drop table subsite_app - not needed anyway
@@ default/6.6.0-6.6.1/drop_app_table.sql
-- rename table containing defined subsites following ccm naming conventions
@@ default/6.6.0-6.6.1/ren_sites_table.sql
-- rename application from london.subsite to subsite
@@ default/6.6.0-6.6.1/upd_system_tables.sql
-- remove legacy compatible bits
@@ default/6.6.0-6.6.1/remove_legacy_entries.sql
-- adjust class name in content_sections table
@@ default/6.6.0-6.6.1/upd_cms_tables.sql

33
ccm-shortcuts/sql/ccm-shortcuts/upgrade/postgres-6.6.0-6.6.1.sql
View File

@ -1,33 +0,0 @@
--
-- Copyright (C) 2011 Peter Boy 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
--
-- $DateTime: 2010/11/10 23:15:09 $
\echo Red Hat Enterprise ccm-shortcuts 6.6.0 -> 6.6.1 Upgrade Script (PostgreSQL)
begin;
-- drop table sc_app - not needed anyway
\i default/6.6.0-6.6.1/drop_app_table.sql
-- rename application from london.shortcuts to shortcuts
\i default/6.6.0-6.6.1/upd_system_tables.sql
-- remove legacy compatible bits
\i default/6.6.0-6.6.1/remove_legacy_entries.sql
commit;

5
ccm-shortcuts/src/ccm-ldn-shortcuts.config 100755
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<registry>
<config class="com.arsdigita.london.shortcuts.ShortcutsConfig"
storage="ccm-ldn-shortcuts/shortcuts.properties"/>
</registry>

6
ccm-shortcuts/src/ccm-shortcuts.load → ccm-shortcuts/src/ccm-ldn-shortcuts.load
View File

@ -8,10 +8,10 @@
<!--
<table name=""/>
-->
<initializer class="com.arsdigita.shortcuts.Initializer"/>
<initializer class="com.arsdigita.london.shortcuts.Initializer"/>
</provides>
<scripts>
<schema directory="ccm-shortcuts"/>
<data class="com.arsdigita.shortcuts.Loader"/>
<schema directory="ccm-ldn-shortcuts"/>
<data class="com.arsdigita.london.shortcuts.Loader"/>
</scripts>
</load>

5
ccm-shortcuts/src/ccm-shortcuts.config
View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<registry>
<config class="com.arsdigita.shortcuts.ShortcutsConfig"
storage="ccm-shortcuts/shortcuts.properties"/>
</registry>

5
ccm-shortcuts/src/ccm-shortcuts.upgrade
View File

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

4
ccm-shortcuts/src/com/arsdigita/shortcuts/Initializer.java → ccm-shortcuts/src/com/arsdigita/london/shortcuts/Initializer.java
View File

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
package com.arsdigita.shortcuts;
package com.arsdigita.london.shortcuts;
import com.arsdigita.db.DbHelper;
@ -51,7 +51,7 @@ public class Initializer extends CompoundInitializer {
add(new PDLInitializer
(new ManifestSource
("ccm-shortcuts.pdl.mf",
("ccm-ldn-shortcuts.pdl.mf",
new NameFilter(DbHelper.getDatabaseSuffix(database), "pdl"))));
}

37
ccm-shortcuts/src/com/arsdigita/shortcuts/Loader.java → ccm-shortcuts/src/com/arsdigita/london/shortcuts/Loader.java
View File

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
package com.arsdigita.shortcuts;
package com.arsdigita.london.shortcuts;
import com.arsdigita.loader.PackageLoader;
@ -31,10 +31,6 @@ import com.arsdigita.web.Application;
import org.apache.log4j.Logger;
/**
* Executes nonrecurring at install time and loads (and configures ) the
* shortcut application type and the administration instance.
* Shortcuts works by a filter servlet activated in web.xml
*
* Loads the shortcuts application and type.
*
* @author Daniel Berrange
@ -44,11 +40,6 @@ public class Loader extends PackageLoader {
private static final Logger s_log = Logger.getLogger(Loader.class);
/**
* Run script invoked by com.arsdigita.packing loader script.
*
* @param ctx
*/
public void run(final ScriptContext ctx) {
new KernelExcursion() {
public void excurse() {
@ -58,35 +49,17 @@ public class Loader extends PackageLoader {
}.run();
}
/**
* Creates a shortcuts as a legacy-free application type.
*
* No localization here because it is an invariant configuration.
*/
private void setupShortcuts() {
s_log.debug("Creating an application type for shortcuts. " +
"Base Data Object Type: " + Shortcuts.BASE_DATA_OBJECT_TYPE);
/* Create legacy-campatible application type */
/* ApplicationType type = ApplicationType
ApplicationType type = ApplicationType
.createApplicationType("shortcuts",
"CCM Shortcuts Admin",
Shortcuts.BASE_DATA_OBJECT_TYPE); */
/* Create legacy-free application type
* NOTE: The wording in the title parameter of ApplicationType
* determines the name of the subdirectory for the XSL stylesheets.
* It gets "urlized", i.e. trimming leading and trailing blanks and
* replacing blanks between words and illegal characters with an
* hyphen and converted to lower case.
* "Shortcuts" will become "shortcuts". */
ApplicationType type = new ApplicationType(
"Shortcuts",
Shortcuts.BASE_DATA_OBJECT_TYPE);
type.setDescription("CCM Shortcuts Administration instance");
type.setDescription("CCM shortcuts administration");
Application admin = Application.retrieveApplicationForPath("/admin/");
Application app = Application.createApplication(type,
Application app =
Application.createApplication(type,
"shortcuts",
"CCM Shortcuts Admin",
admin);

5
ccm-shortcuts/src/com/arsdigita/shortcuts/Shortcut.java → ccm-shortcuts/src/com/arsdigita/london/shortcuts/Shortcut.java
View File

@ -13,7 +13,7 @@
*
*/
package com.arsdigita.shortcuts;
package com.arsdigita.london.shortcuts;
import com.arsdigita.db.Sequences;
import com.arsdigita.domain.DataObjectNotFoundException;
@ -39,8 +39,7 @@ public class Shortcut extends DomainObject {
public static final String URL_KEY = "urlKey";
public static final String REDIRECT = "redirect";
public static final String BASE_DATA_OBJECT_TYPE =
"com.arsdigita.shortcuts.Shortcut";
public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.london.shortcuts.Shortcut";
protected String getBaseDataObjectType() {
return BASE_DATA_OBJECT_TYPE;

2
ccm-shortcuts/src/com/arsdigita/shortcuts/ShortcutCollection.java → ccm-shortcuts/src/com/arsdigita/london/shortcuts/ShortcutCollection.java
View File

@ -13,7 +13,7 @@
*
*/
package com.arsdigita.shortcuts;
package com.arsdigita.london.shortcuts;
import com.arsdigita.domain.DomainCollection;
import com.arsdigita.domain.DomainObject;

2
ccm-shortcuts/src/com/arsdigita/shortcuts/ShortcutFilter.java → ccm-shortcuts/src/com/arsdigita/london/shortcuts/ShortcutFilter.java
View File

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
package com.arsdigita.shortcuts;
package com.arsdigita.london.shortcuts;
import com.arsdigita.web.BaseFilter;

5
ccm-shortcuts/src/com/arsdigita/shortcuts/ShortcutUtil.java → ccm-shortcuts/src/com/arsdigita/london/shortcuts/ShortcutUtil.java
View File

@ -13,7 +13,7 @@
*
*/
package com.arsdigita.shortcuts;
package com.arsdigita.london.shortcuts;
import com.arsdigita.caching.CacheTable;
import com.arsdigita.persistence.SessionManager;
@ -26,7 +26,8 @@ import org.apache.log4j.Logger;
public class ShortcutUtil {
private static final Logger s_log = Logger.getLogger(ShortcutUtil.class);
private static final Logger s_log =
Logger.getLogger(ShortcutUtil.class);
private static CacheTable s_remote = new CacheTable("shortcuts");
private static Map s_cache = new HashMap();

16
ccm-shortcuts/src/com/arsdigita/shortcuts/Shortcuts.java → ccm-shortcuts/src/com/arsdigita/london/shortcuts/Shortcuts.java
View File

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
package com.arsdigita.shortcuts;
package com.arsdigita.london.shortcuts;
import com.arsdigita.persistence.DataObject;
import com.arsdigita.persistence.OID;
@ -32,10 +32,16 @@ public class Shortcuts extends Application {
private static final Logger logger = Logger.getLogger(Shortcuts.class);
public static final String BASE_DATA_OBJECT_TYPE =
"com.arsdigita.shortcuts.Shortcuts";
public static final String BASE_DATA_OBJECT_TYPE
= "com.arsdigita.london.shortcuts.Shortcuts";
private static ShortcutsConfig s_config = ShortcutsConfig.getConfig();
private static ShortcutsConfig s_config = new ShortcutsConfig();
static {
logger.debug("Static initalizer starting...");
s_config.load();
logger.debug("Static initalizer finished.");
}
public static ShortcutsConfig getConfig() {
return s_config;
@ -87,6 +93,6 @@ public class Shortcuts extends Application {
*/
public String getServletPath() {
// return "/files";
return "/ccm-shortcuts/files";
return "/ccm-ldn-shortcuts/files";
}
}

38
ccm-shortcuts/src/com/arsdigita/shortcuts/ShortcutsConfig.java → ccm-shortcuts/src/com/arsdigita/london/shortcuts/ShortcutsConfig.java
View File

@ -16,9 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
package com.arsdigita.shortcuts;
package com.arsdigita.london.shortcuts;
import com.arsdigita.runtime.AbstractConfig;
import com.arsdigita.util.parameter.IntegerParameter;
import com.arsdigita.util.parameter.Parameter;
import org.apache.log4j.Logger;
@ -34,43 +36,9 @@ import org.apache.log4j.Logger;
*/
public final class ShortcutsConfig extends AbstractConfig {
/** A logger instance to assist debugging. */
private static final Logger s_log = Logger.getLogger(ShortcutsConfig.class);
/** Singelton config object. */
private static ShortcutsConfig s_conf;
/**
* Gain a SubsiteConfig object.
*
* Singelton pattern, don't instantiate a config object using the
* constructor directly!
* @return
*/
public static synchronized ShortcutsConfig getConfig() {
if (s_conf == null) {
s_conf = new ShortcutsConfig();
s_conf.load();
}
return s_conf;
}
// ////////////////////////////////////////////////////////////////////////
// Set of configuration parameters
// Nothing to configurfe yet
/**
* Constructor (singleton pattern).
* Don't instantiate a config object using the constructor directly!
* use getConfig instead!
*/
public ShortcutsConfig() {
// register([parameter]);
loadInfo();
}
}

0
ccm-shortcuts/src/com/arsdigita/shortcuts/ShortcutsConfig_parameter.properties → ccm-shortcuts/src/com/arsdigita/london/shortcuts/ShortcutsConfig_parameter.properties
View File

6
ccm-shortcuts/src/com/arsdigita/shortcuts/ui/AdminPanel.java → ccm-shortcuts/src/com/arsdigita/london/shortcuts/ui/AdminPanel.java
View File

@ -13,7 +13,9 @@
*
*/
package com.arsdigita.shortcuts.ui;
package com.arsdigita.london.shortcuts.ui;
import java.math.BigDecimal;
import org.apache.log4j.Category;
@ -21,6 +23,7 @@ import com.arsdigita.bebop.Page;
import com.arsdigita.bebop.SimpleContainer;
import com.arsdigita.bebop.parameters.BigDecimalParameter;
import com.arsdigita.kernel.ui.ACSObjectSelectionModel;
import com.arsdigita.london.shortcuts.Shortcut;
public class AdminPanel extends SimpleContainer {
@ -35,7 +38,6 @@ public class AdminPanel extends SimpleContainer {
add(new ShortcutsTable(m_shortcut));
}
@Override
public void register(Page p) {
super.register(p);

6
ccm-shortcuts/src/com/arsdigita/shortcuts/ui/ShortcutForm.java → ccm-shortcuts/src/com/arsdigita/london/shortcuts/ui/ShortcutForm.java
View File

@ -17,7 +17,7 @@
*
*/
package com.arsdigita.shortcuts.ui;
package com.arsdigita.london.shortcuts.ui;
import java.math.BigDecimal;
@ -29,8 +29,8 @@ import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.event.FormValidationListener;
import com.arsdigita.bebop.Label;
import com.arsdigita.bebop.form.Submit;
import com.arsdigita.shortcuts.ShortcutUtil;
import com.arsdigita.shortcuts.Shortcut;
import com.arsdigita.london.shortcuts.ShortcutUtil;
import com.arsdigita.london.shortcuts.Shortcut;
import com.arsdigita.bebop.Form;
import com.arsdigita.bebop.parameters.TrimmedStringParameter;
import com.arsdigita.bebop.parameters.NotEmptyValidationListener;

8
ccm-shortcuts/src/com/arsdigita/shortcuts/ui/ShortcutsTable.java → ccm-shortcuts/src/com/arsdigita/london/shortcuts/ui/ShortcutsTable.java
View File

@ -17,7 +17,7 @@
*
*/
package com.arsdigita.shortcuts.ui;
package com.arsdigita.london.shortcuts.ui;
import com.arsdigita.bebop.Table;
import com.arsdigita.bebop.table.TableModelBuilder;
@ -26,9 +26,9 @@ import com.arsdigita.bebop.table.TableModel;
import com.arsdigita.bebop.PageState;
import com.arsdigita.kernel.ui.ACSObjectSelectionModel;
import com.arsdigita.shortcuts.Shortcut;
import com.arsdigita.shortcuts.ShortcutUtil;
import com.arsdigita.shortcuts.ShortcutCollection;
import com.arsdigita.london.shortcuts.Shortcut;
import com.arsdigita.london.shortcuts.ShortcutUtil;
import com.arsdigita.london.shortcuts.ShortcutCollection;
import java.math.BigDecimal;
import org.apache.log4j.Category;

10
ccm-shortcuts/web/WEB-INF/web.ccm-shortcuts.xml → ccm-shortcuts/web/WEB-INF/web.ccm-ldn-shortcuts.xml
View File

@ -6,7 +6,7 @@
<filter>
<filter-name>shortcuts</filter-name>
<filter-class>com.arsdigita.shortcuts.ShortcutFilter</filter-class>
<filter-class>com.arsdigita.london.shortcuts.ShortcutFilter</filter-class>
</filter>
<filter-mapping>
@ -14,20 +14,20 @@
<url-pattern>/*</url-pattern>
</filter-mapping>
<!-- module ccm-shortcuts - servlet definitions -->
<!-- module ccm-ldn-shortcuts - servlet definitions -->
<servlet>
<servlet-name>shortcuts-files</servlet-name>
<servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
<init-param>
<param-name>template-path</param-name>
<param-value>/templates/ccm-shortcuts</param-value>
<param-value>/templates/ccm-ldn-shortcuts</param-value>
</init-param>
</servlet>
<!-- module ccm-shortcuts - servlet mappings -->
<!-- module ccm-ldn-shortcuts - servlet mappings -->
<servlet-mapping>
<servlet-name>shortcuts-files</servlet-name>
<url-pattern>/ccm-shortcuts/files/*</url-pattern>
<url-pattern>/ccm-ldn-shortcuts/files/*</url-pattern>
</servlet-mapping>
</web-app>

6
ccm-shortcuts/web/themes/heirloom/apps/shortcuts/xsl/index.xsl → ccm-shortcuts/web/__ccm__/apps/shortcuts/xsl/index.xsl
View File

@ -4,14 +4,14 @@
xmlns:shortcuts="http://www.arsdigita.com/shortcuts/1.0"
xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
<!-- IMPORT DEFINITIONS ccm-shortcuts installed as separate web application
<!-- IMPORT DEFINITIONS ccm-ldn-shortcuts installed as separate web application
<xsl:import href="../../../../../ROOT/packages/bebop/xsl/bebop.xsl"/>
<xsl:import href="../../../../../ROOT/packages/ui/xsl/ui.xsl"/>
-->
<!-- IMPORT DEFINITIONS ccm-ldn-shortcuts installed into the main CCM webapp
-->
<xsl:import href="../../../packages/bebop/xsl/bebop.xsl"/>
<xsl:import href="../../../packages/ui/xsl/ui.xsl"/>
<xsl:import href="../../../../packages/bebop/xsl/bebop.xsl"/>
<xsl:import href="../../../../packages/ui/xsl/ui.xsl"/>
</xsl:stylesheet>

2
ccm-shortcuts/web/templates/ccm-shortcuts/index.jsp → ccm-shortcuts/web/templates/ccm-ldn-shortcuts/index.jsp
View File

@ -16,7 +16,7 @@
title="Shortcuts Admin" cache="true">
<define:component name="admin"
classname="com.arsdigita.shortcuts.ui.AdminPanel"/>
classname="com.arsdigita.london.shortcuts.ui.AdminPanel"/>
<jsp:scriptlet>
shortcutsPage.addRequestListener(new ApplicationAuthenticationListener());