Verschiedene kleinere Formatierungen und Anpassungen.

git-svn-id: https://svn.libreccm.org/ccm/trunk@1465 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2012-01-22 11:25:37 +00:00
parent e4ba9dd81e
commit ee9cf3e769
9 changed files with 18 additions and 8 deletions

View File

@ -69,7 +69,7 @@ import org.apache.log4j.Logger;
* @author Jack Chung * @author Jack Chung
* @author Sören Bernstein (quasimodo) <sbernstein@zes.uni-bremen.de> * @author Sören Bernstein (quasimodo) <sbernstein@zes.uni-bremen.de>
* *
* @version $Id: ContentItemPage.java 754 2005-09-02 13:26:17Z sskracic $ * @version $Id: ContentItemPage.java 2245 2011-11-15 08:03:57Z pboy $
*/ */
public class ContentItemPage extends CMSPage implements ActionListener { public class ContentItemPage extends CMSPage implements ActionListener {

View File

@ -89,8 +89,7 @@ import com.arsdigita.workflow.simple.WorkflowTemplate;
* @author Xixi D'moon &lt;xdmoon@redhat.com&gt; * @author Xixi D'moon &lt;xdmoon@redhat.com&gt;
* @author Justin Ross &lt;jross@redhat.com&gt; * @author Justin Ross &lt;jross@redhat.com&gt;
* @author Jens Pelzetter jens@jp-digital.de * @author Jens Pelzetter jens@jp-digital.de
* @version $Id: ItemLifecycleSelectForm.java 1643 2007-09-17 14:19:06Z chrisg23 * @version $Id: ItemLifecycleSelectForm.java 2267 2012-01-09 16:50:14Z pboy $
* $
*/ */
class ItemLifecycleSelectForm extends BaseForm { class ItemLifecycleSelectForm extends BaseForm {

View File

@ -190,10 +190,12 @@ public class Loader extends PackageLoader {
"Portal Workspace", "Portal Workspace",
Workspace.BASE_DATA_OBJECT_TYPE ); Workspace.BASE_DATA_OBJECT_TYPE );
type.setDescription("Portal based collaborative workspaces"); type.setDescription("Portal based collaborative workspaces");
/* Create an application type specific group in user administration * /* Create an application type specific group in user administration *
* which serves as a container for subgroups, each subgroup coupled * * which serves as a container for subgroups, each subgroup coupled *
* to an application (instances) of this type. */ * to an application (instances) of this type. */
type.createGroup(); type.createGroup();
return type; return type;
} }

View File

@ -7,7 +7,7 @@
<!-- module ccm-portalworkspace - servlet definitions BEGIN --> <!-- module ccm-portalworkspace - servlet definitions BEGIN -->
<servlet> <servlet>
<!-- <servlet-name>files</servlet-name> --> <!-- <servlet-name>files</servlet-name> -->
<servlet-name>portalworkspace-files</servlet-name> <servlet-name>portalworkspace-files</servlet-name>
<servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class> <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
<init-param> <init-param>

View File

@ -46,7 +46,7 @@ com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
com.arsdigita.cms.default_template_resolver_class=com.arsdigita.subsite.dispatcher.SubsiteItemTemplateResolver com.arsdigita.cms.default_template_resolver_class=com.arsdigita.subsite.dispatcher.SubsiteItemTemplateResolver
; Configure dhtml editor for use in cms content-center ; Configure dhtml editor for use in cms content-center
; Xinha is default and should work out of the box ; Xinha is default and does work out of the box
; A CCM specific configuration file is used to prevent a mess with the standard ; A CCM specific configuration file is used to prevent a mess with the standard
; configuration, default is: ; configuration, default is:
; com.arsdigita.cms.dhtml_editor_config=Xinha.Config,/assets/xinha/CCMcmsXinhaConfig.js ; com.arsdigita.cms.dhtml_editor_config=Xinha.Config,/assets/xinha/CCMcmsXinhaConfig.js

View File

@ -24,7 +24,7 @@ import com.arsdigita.domain.DomainObject;
import com.arsdigita.kernel.ACSObjectInstantiator; import com.arsdigita.kernel.ACSObjectInstantiator;
import com.arsdigita.persistence.pdl.ManifestSource; // import com.arsdigita.persistence.pdl.ManifestSource;
import com.arsdigita.persistence.pdl.NameFilter; import com.arsdigita.persistence.pdl.NameFilter;
import com.arsdigita.persistence.pdl.ManifestSource; import com.arsdigita.persistence.pdl.ManifestSource;
import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.DataObject;
@ -59,12 +59,14 @@ public class Initializer extends CompoundInitializer {
* Implementation of the init(DomainInitEvent) initializer. * Implementation of the init(DomainInitEvent) initializer.
* @param e * @param e
*/ */
@Override
public void init(DomainInitEvent e) { public void init(DomainInitEvent e) {
super.init(e); super.init(e);
e.getFactory().registerInstantiator( e.getFactory().registerInstantiator(
Shortcuts.BASE_DATA_OBJECT_TYPE, Shortcuts.BASE_DATA_OBJECT_TYPE,
new ACSObjectInstantiator() { new ACSObjectInstantiator() {
@Override
public DomainObject doNewInstance(DataObject dataObject) { public DomainObject doNewInstance(DataObject dataObject) {
return new Shortcuts(dataObject); return new Shortcuts(dataObject);
} }

View File

@ -53,6 +53,8 @@ public class Loader extends PackageLoader {
new KernelExcursion() { new KernelExcursion() {
public void excurse() { public void excurse() {
setEffectiveParty(Kernel.getSystemParty()); setEffectiveParty(Kernel.getSystemParty());
// setup application
setupShortcuts(); setupShortcuts();
} }
}.run(); }.run();

View File

@ -42,6 +42,11 @@ public class Loader extends PackageLoader {
private static final Logger s_log = Logger.getLogger(Loader.class); 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) { public void run(final ScriptContext ctx) {
new KernelExcursion() { new KernelExcursion() {
public void excurse() { public void excurse() {

View File

@ -107,13 +107,13 @@ public class Subsite extends Application {
* <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class> * <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
* <init-param> * <init-param>
* <param-name>template-path</param-name> * <param-name>template-path</param-name>
* <param-value>/templates/ccm-ldn-subsite</param-value> * <param-value>/templates/ccm-subsite</param-value>
* </init-param> * </init-param>
* </servlet> * </servlet>
* *
* <servlet-mapping> * <servlet-mapping>
* <servlet-name>subsite-files</servlet-name> * <servlet-name>subsite-files</servlet-name>
* <url-pattern>/ccm-ldn-subsite/files/*</url-pattern> * <url-pattern>/ccm-subsite/files/*</url-pattern>
* </servlet-mapping> * </servlet-mapping>
* *
* @return path name to the applications servlet/JSP * @return path name to the applications servlet/JSP