ZeS Bundle complet angepasst, damit funktioniert alles mit themedirector, auch publish, aber noch nicht die Anzeige der Dateien im devel Directory (sie sind aber da).

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

ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java

@@ -18,18 +18,18 @@ package com.arsdigita.aplaws.ui;
 import com.arsdigita.bebop.SimpleContainer;
 import com.arsdigita.bebop.ActionLink;
 import com.arsdigita.bebop.Page;
+import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.event.ActionEvent;
 import com.arsdigita.bebop.event.ActionListener;
-import com.arsdigita.london.portal.ui.PersistentPortal;
-import com.arsdigita.london.portal.Workspace;
-import com.arsdigita.bebop.PageState;
-import com.arsdigita.xml.Element;
-import com.arsdigita.london.portal.ui.PortalConstants;
 import com.arsdigita.kernel.permissions.PermissionService;
 import com.arsdigita.kernel.permissions.PermissionDescriptor;
 import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
 import com.arsdigita.kernel.Party;
 import com.arsdigita.kernel.Kernel;
+import com.arsdigita.london.portal.ui.PersistentPortal;
+import com.arsdigita.london.portal.ui.PortalConstants;
+import com.arsdigita.london.portal.Workspace;
+import com.arsdigita.xml.Element;
 
 
 public class HomepageWorkspace extends SimpleContainer {
@@ -121,6 +121,7 @@ public class HomepageWorkspace extends SimpleContainer {
         m_editor.setVisible(state, !browse);
     }
 
+    @Override
     public void register(Page page) {
         super.register(page);
         
@@ -131,6 +132,7 @@ public class HomepageWorkspace extends SimpleContainer {
         page.setVisibleDefault(m_editor, false);
     }
 
+    @Override
     public void generateXML(PageState state,
                             Element parent) {
         Party party = Kernel.getContext().getParty();

ccm-ldn-aplaws/web/templates/ccm-ldn-portal/portal/index.jsp

@@ -19,6 +19,7 @@
 
     <jsp:scriptlet>
       HomepageWorkspaceSelectionModel workspace = new HomepageWorkspaceSelectionModel();
+
       ((HomepageWorkspace)left).setModel(new HomepagePortalSelectionModel(workspace, 0));
       ((HomepageWorkspace)left).setReadOnly(true);
       ((HomepageWorkspace)left).setName("left");

ccm-ldn-portal/src/com/arsdigita/london/portal/ui/DefaultPortalSelectionModel.java

@@ -50,6 +50,7 @@ public class DefaultPortalSelectionModel extends ACSObjectSelectionModel
 		return m_workspace.getSelectedWorkspace(state);
 	}
 
+    @Override
 	public Object getSelectedKey(PageState state) {
 		BigDecimal key = (BigDecimal) super.getSelectedKey(state);
 		if (key == null) {
@@ -59,6 +60,7 @@ public class DefaultPortalSelectionModel extends ACSObjectSelectionModel
 		return super.getSelectedKey(state);
 	}
 
+    @Override
 	public DomainObject getSelectedObject(PageState state) {
 		BigDecimal key = (BigDecimal) super.getSelectedKey(state);
 		if (key == null) {

ccm-ldn-portal/src/com/arsdigita/london/portal/ui/DefaultWorkspace.java

@@ -42,12 +42,19 @@ public class DefaultWorkspace extends WorkspaceComponent implements
 	private static final Logger s_log = Logger
 			.getLogger(DefaultWorkspace.class);
 
+	/**
+     * Constructor
+     */
     public DefaultWorkspace() {
 		super(new DefaultWorkspaceSelectionModel());
 
 		addCustomizeListener(this);
 	}
 
+	/**
+     * 
+     * @param e
+     */
     public void actionPerformed(ActionEvent e) {
 		PageState state = e.getPageState();
 

ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalList.java

@@ -32,6 +32,10 @@ import com.arsdigita.util.UncheckedWrapperException;
 import com.arsdigita.xml.Element;
 import com.arsdigita.xml.XML;
 
+/**
+ * 
+ * 
+ */
 public abstract class PortalList extends SimpleContainer {
 
 	private WorkspaceSelectionModel m_workspace;
@@ -40,10 +44,20 @@ public abstract class PortalList extends SimpleContainer {
 
 	private Map m_actions = new HashMap();
 
+	/**
+     * Constructor.
+     * 
+     * @param portal
+     */
     public PortalList(PortalSelectionModel portal) {
 		this(null, portal);
 	}
 
+	/**
+     * Constructor
+     * @param workspace
+     * @param portal
+     */
     public PortalList(WorkspaceSelectionModel workspace,
                       PortalSelectionModel portal) {
 		super("portal:portalList", PortalConstants.PORTAL_XML_NS);
@@ -85,6 +99,12 @@ public abstract class PortalList extends SimpleContainer {
 		return m_workspace.getSelectedWorkspace(state);
 	}
 
+    /**
+     *
+     * @param state
+     * @param parent
+     */
+    @Override
 	public void generateXML(PageState state, Element parent) {
 		if (!isVisible(state)) {
 			return;
@@ -97,6 +117,11 @@ public abstract class PortalList extends SimpleContainer {
 		generatePortalListXML(state, content);
 	}
 
+	/**
+     * 
+     * @param state
+     * @param parent
+     */
     protected void generatePortalListXML(PageState state, Element parent) {
 		WorkspacePage current = m_portal.getSelectedPortal(state);
 

ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortletSelectionModel.java

@@ -20,6 +20,12 @@ import com.arsdigita.bebop.parameters.BigDecimalParameter;
 import com.arsdigita.kernel.ui.ACSObjectSelectionModel;
 import com.arsdigita.portal.Portlet;
 
+/**
+ * .
+ * 
+ * ACSObjectSelectionModel loads a subclass of an ACSObject from the database.
+ *
+ */
 public class PortletSelectionModel extends ACSObjectSelectionModel {
 
 	public PortletSelectionModel(BigDecimalParameter p) {

ccm-ldn-portal/web/WEB-INF/web.ccm-ldn-portal.xml

@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
+<web-app      xmlns="http://java.sun.com/xml/ns/j2ee"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
+                     http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+            version="2.4">
 
     <!-- module ccm-ldn-portal  -  servlet definitions BEGIN  -->
     <servlet>
-        <servlet-name>files</servlet-name>
-        <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
-        <init-param>
-            <param-name>template-path</param-name>
-            <param-value>/templates/ccm-ldn-portal</param-value>
-        </init-param>
-    </servlet>
-    <servlet>
+<!--        <servlet-name>files</servlet-name>        -->
         <servlet-name>portal-files</servlet-name>
         <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
         <init-param>
@@ -19,6 +15,7 @@
             <param-value>/templates/ccm-ldn-portal</param-value>
         </init-param>
     </servlet>
+
     <servlet>
         <servlet-name>portlet-type-xsl</servlet-name>
         <servlet-class>com.arsdigita.dispatcher.PortletTypeXSLServlet</servlet-class>
@@ -26,14 +23,11 @@
     <!-- module ccm-ldn-portal  -  servlet definitions END  -->
 
     <!-- module ccm-ldn-portal  -  servlet mappings BEGIN  -->
-    <servlet-mapping>
-        <servlet-name>files</servlet-name>
-        <url-pattern>/files/*</url-pattern>
-    </servlet-mapping>
     <servlet-mapping>
         <servlet-name>portal-files</servlet-name>
         <url-pattern>/ccm-ldn-portal/files/*</url-pattern>
     </servlet-mapping>
+
     <servlet-mapping>
         <servlet-name>portlet-type-xsl</servlet-name>
         <url-pattern>/__ccm__/servlet/portlet-type/*</url-pattern>

ccm-ldn-portal/web/templates/ccm-ldn-portal/index.jsp

@@ -14,17 +14,23 @@
       DispatcherHelper.cacheDisable(response);
   </jsp:scriptlet>
 
-    <define:page name="viewWorkspace" application="portal" title="Workspace" cache="true">
+  <define:page name="viewWorkspace" application="portal" 
+              title="Workspace"            cache="true">
     <jsp:scriptlet>
          if (Workspace.getConfig().getCheckWorkspaceReadPermissions()) {
-             viewWorkspace.addRequestListener(new ApplicationAuthenticationListener(PrivilegeDescriptor.READ));
+             viewWorkspace.addRequestListener(
+                 new ApplicationAuthenticationListener(PrivilegeDescriptor.READ));
          }
       </jsp:scriptlet>
-      <define:component name="view" classname="com.arsdigita.london.portal.ui.WorkspaceViewer" />
+
+      <define:component name="view"
+                   classname="com.arsdigita.london.portal.ui.WorkspaceViewer" />
       <jsp:scriptlet>
-      ((AbstractWorkspaceComponent) view).setWorkspaceModel(new DefaultWorkspaceSelectionModel());
+      ((AbstractWorkspaceComponent) view).setWorkspaceModel(
+                                          new DefaultWorkspaceSelectionModel());
       </jsp:scriptlet>
   </define:page>
 
   <show:all/>
+
 </jsp:root>

ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConfig.java

@@ -69,7 +69,6 @@ public class ThemeDirectorConfig extends AbstractConfig {
             new StringParameter
                 ("themedirector.default_theme_path",
                  Parameter.OPTIONAL, "/themes/master/");
-            //   Parameter.OPTIONAL, "/__ccm__/themes/default/");
 
     /** Servlet context path containing the theme.                           */
     private final Parameter m_defaultThemeContext =

ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConstants.java

@@ -30,7 +30,8 @@ public interface ThemeDirectorConstants {
     public final static String DEV_DIR_STUB = "devel-themedir";
     // TODO: it would be nice if this value in com.arsdigita.web.URL
     // was public
-    public final static String CCM_PREFIX = "__ccm__";
+    // public final static String CCM_PREFIX = "__ccm__";
+    public final static String CCM_PREFIX = "themes";
     public final static String WEB_APP_NAME = "ROOT";
 
     // The location of the sync jsp used to sync up the multiple servers.

ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeFilesList.java

@@ -63,10 +63,12 @@ class ThemeFilesList extends SimpleContainer implements ThemeDirectorConstants {
         add(heading);
     }
 
+    @Override
     public void register(Page page) {
         page.addRequestListener(new FileRemovalRequestListener());
     }
 
+    @Override
     public void generateChildrenXML(PageState state, Element root) {
         super.generateChildrenXML(state, root);
         File currentRoot = new File(Web.getServletContext().getRealPath("/"));

ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeValidationPanel.java

@@ -44,7 +44,6 @@ import com.arsdigita.templating.XSLTemplate;
 import com.arsdigita.templating.WrappedTransformerException;
 import javax.xml.transform.ErrorListener;
 
-import org.apache.log4j.Logger;
 import javax.xml.transform.TransformerException;
 
 import org.apache.log4j.Logger;
@@ -272,6 +271,7 @@ class ThemeValidationPanel extends GridPanel implements ThemeDirectorConstants {
                 (GlobalizationUtil.globalize("themes.validation_errors"));
         }
 
+        @Override
         public void generateXML(PageState state, Element p) {
             if ( isVisible(state) ) {
 

ccm-themedirector/src/com/arsdigita/themedirector/ui/listeners/ApproveThemeActionListener.java

@@ -102,7 +102,7 @@ public class ApproveThemeActionListener implements ThemeDirectorConstants, Actio
             // but before we do that, we copy is_deleted flag from
             // development to published files
             DataOperation op = SessionManager.getSession().retrieveDataOperation(
-                "com.arsdigita.london.theme.bulkFileUpdate");
+                "com.arsdigita.themedirector.bulkFileUpdate");
             op.setParameter("themeID", theme.getID());
             op.setParameter("timestamp", new Date());
             op.execute();

ccm-zes-aplaws/bundles/devel/cfg/integration.properties

@@ -114,7 +114,7 @@ com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.
 # ccm-ldn-themedirector application
 themedirector.default_theme_context=
 themedirector.default_theme_manifest=ccm-zes-aplaws.web.mf
-themedirector.default_theme_path=__ccm__/themes/aplaws-generic
+themedirector.default_theme_path=themes/static/aplaws-generic
 themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl
 
 

ccm-zes-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt

@@ -12,23 +12,27 @@ http://::host::/__ccm__/servlet/content-item/index.xsl?oid=::item_template_oid::
 
 # added by Quasimodo
 # Theme with single entry point (e.g Mandalay)
-http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/start.xsl
+http://::host::/resource/::webapp::/themes/::themedir::/::theme::/start.xsl
 
 # Theme, with optional locale & prefix
-http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/::application::-::url::-::prefix::-::locale::.xsl
-http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/::application::-::url::-::prefix::.xsl
+http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::-::locale::.xsl
+http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::.xsl
 
 # Theme, with optional locale
-http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/::application::-::url::-::locale::.xsl
-http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/::application::-::url::.xsl
+http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::locale::.xsl
+http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::.xsl
 
 # APLAWS generic default, with locale and prefix
 # XXX change ROOT -> ccm-ldn-aplaws
+http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::-::prefix::-::locale::.xsl
+http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::-::prefix::.xsl
 http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::prefix::-::locale::.xsl
 http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::prefix::.xsl
 
 # APLAWS generic default, with locale
 # XXX change ROOT -> ccm-ldn-aplaws
+http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::-::locale::.xsl
+http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::.xsl
 http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::locale::.xsl
 http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::.xsl
 
@@ -37,5 +41,7 @@ http://::host::/resource/::webapp::/__ccm__/apps/::application::/xsl/::url::-::l
 http://::host::/resource/::webapp::/__ccm__/apps/::application::/xsl/::url::.xsl
 
 # Global default, from application's own web app - relocated version >= 6.6.1
+http://::host::/resource/ROOT/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl
+http://::host::/resource/ROOT/themes/heirloom/apps/::application::/xsl/::url::.xsl
 http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl
 http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::.xsl

ccm-zes-aplaws/web/themes/static/aplaws-generic/admin-index.xsl

@@ -3,8 +3,10 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   version="1.0">
-
+<!--
   <xsl:import href="../../../../ROOT/__ccm__/apps/admin/xsl/index.xsl"/>
+  -->
+  <xsl:import href="../../heirloom/apps/admin/xsl/index.xsl"/>
   <xsl:import href="lib/page.xsl"/>
 
   <xsl:param name="theme-prefix"/>

ccm-zes-aplaws/web/themes/static/aplaws-generic/consultations-index.xsl

@@ -8,7 +8,10 @@
   xmlns:nav="http://ccm.redhat.com/london/navigation"
   version="1.0">
 
+<!--
   <xsl:import href="../../themes/aplaws-generic/navigation-index.xsl"/>
+  -->
+  <xsl:import href="navigation-index.xsl"/>
   
   <xsl:template name="pageContent">
     <a class="intLink" name="top" />

ccm-zes-aplaws/web/themes/static/aplaws-generic/theme-index.xsl

@@ -9,7 +9,7 @@
   -->
   <!-- path to xsl if installed in the main (common) web context   
   -->
-  <xsl:import href="../../../__ccm__/apps/theme/xsl/index.xsl"/>
+  <xsl:import href="../../heirloom/apps/themedirector/xsl/index.xsl"/>
 
   <xsl:import href="lib/page.xsl"/>