From helpdesk at onehippo.com Thu Jan 1 11:57:43 2009 From: helpdesk at onehippo.com (JIRA ((Berry) A.W. van Halderen)) Date: Thu Jan 1 11:56:57 2009 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-2084) repairations according to failed unit tests In-Reply-To: <26286958.1230711461796.JavaMail.root@hat01> Message-ID: <21564266.1230807463276.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-2084?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#action_45521 ] (Berry) A.W. van Halderen commented on HREPTWO-2084: ---------------------------------------------------- Current failing tests in repository-engine module: org.hippoecm.repository.CopyNodeTest. org.hippoecm.repository.FacetedAuthorizationTest org.hippoecm.repository.FacetedSelectVersioningTest org.hippoecm.repository.HREPTWO425Test org.hippoecm.repository.HREPTWO456Test org.hippoecm.repository.NodeNameCodecTest org.hippoecm.repository.OrderByNodeNameTest > repairations according to failed unit tests > ------------------------------------------- > > Key: HREPTWO-2084 > URL: http://issues.onehippo.org/browse/HREPTWO-2084 > Project: Hippo Repository 2 > Issue Type: Sub-task > Reporter: (Berry) A.W. van Halderen > Assignee: (Berry) A.W. van Halderen > Fix For: r2.03.xx (m10 - scalability) > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Jan 2 10:49:41 2009 From: helpdesk at onehippo.com (JIRA (Jeroen Tietema)) Date: Fri Jan 2 10:48:56 2009 Subject: [HippoRepos-dev] [JIRA] Closed: (HIPPLUG-1) Template plugin: YouTube editing template plugin In-Reply-To: <13768627.1220298240620.JavaMail.jira@hat01> Message-ID: <15643753.1230889781963.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HIPPLUG-1?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Jeroen Tietema closed HIPPLUG-1. -------------------------------- Resolution: Fixed see http://forge.hippo-ecm.org/projects/youtubetemplate/ > Template plugin: YouTube editing template plugin > ------------------------------------------------ > > Key: HIPPLUG-1 > URL: http://issues.onehippo.org/browse/HIPPLUG-1 > Project: Hippo Forge Plugins > Issue Type: New Feature > Reporter: Arje Cahn > Assignee: Jeroen Tietema > > Part 1: A YouTube editing template that asks the user for a YouTube ID, and shows the movie in the editor, and saves the ID as a property > Part 2: A JSP Module that renders the YouTube movie -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Jan 2 10:49:42 2009 From: helpdesk at onehippo.com (JIRA (Jeroen Tietema)) Date: Fri Jan 2 10:48:56 2009 Subject: [HippoRepos-dev] [JIRA] Closed: (HIPPLUG-3) Browsing plugin: Tagcloud In-Reply-To: <11564720.1220298600583.JavaMail.jira@hat01> Message-ID: <21066225.1230889782061.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HIPPLUG-3?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Jeroen Tietema closed HIPPLUG-3. -------------------------------- Resolution: Fixed see http://forge.hippo-ecm.org/projects/ecm-tagging/ > Browsing plugin: Tagcloud > ------------------------- > > Key: HIPPLUG-3 > URL: http://issues.onehippo.org/browse/HIPPLUG-3 > Project: Hippo Forge Plugins > Issue Type: New Feature > Reporter: Arje Cahn > Assignee: Jeroen Tietema > > Tagcloud plugin, both for dashboard and for browse perspective > The tagcloud shows a list of all documents by property "keywords" > The plugin should be configurable to also show: > - A tagcloud of all images by property "keywords" > - Tagcloud of all document by property "owner" -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Fri Jan 2 13:11:15 2009 From: svn-logs at hippocms.org (SVN (fvlankvelt)) Date: Fri Jan 2 13:10:24 2009 Subject: [HippoRepos-dev] [15715] hippo-ecm/trunk: HREPTWO-2052: extract tree configuration Message-ID: <20090102121115.2545DC58C@svnnew.onehippo.org> Revision: 15715 Author: fvlankvelt Date: 2009-01-02 13:11:14 +0100 (Fri, 02 Jan 2009) Log Message: ----------- HREPTWO-2052: extract tree configuration Put tree configurations (filters) in separate cluster config folder. Copying is evil! Bonus: more robust plugin manager, jcr config service doesn't fall back to default cluster if it fails to find the specified one. Let caller handle the error. Modified Paths: -------------- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/plugin/config/impl/JcrConfigService.java hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/plugin/impl/PluginContext.java hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/plugin/impl/PluginManager.java hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/plugin/loader/PluginClusterLoader.java hippo-ecm/trunk/package/config/src/main/resources/cms-pickers.xml hippo-ecm/trunk/package/config/src/main/resources/cms-static.xml hippo-ecm/trunk/package/config/src/main/resources/hippoecm-extension.xml Added Paths: ----------- hippo-ecm/trunk/package/config/src/main/resources/cms-tree-views.xml Modified: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/plugin/config/impl/JcrConfigService.java =================================================================== --- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/plugin/config/impl/JcrConfigService.java 2009-01-02 11:15:09 UTC (rev 15714) +++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/plugin/config/impl/JcrConfigService.java 2009-01-02 12:11:14 UTC (rev 15715) @@ -44,18 +44,15 @@ } public IClusterConfig getCluster(String key) { - IClusterConfig cluster; + IClusterConfig cluster = null; try { if (model.getNode().hasNode(key)) { Node clusterNode = model.getNode().getNode(key); JcrNodeModel clusterNodeModel = new JcrNodeModel(clusterNode); cluster = new JcrClusterConfig(clusterNodeModel); - } else { - cluster = getDefaultCluster(); } } catch (RepositoryException ex) { log.error(ex.getMessage()); - cluster = getDefaultCluster(); } return cluster; } Modified: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/plugin/impl/PluginContext.java =================================================================== --- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/plugin/impl/PluginContext.java 2009-01-02 11:15:09 UTC (rev 15714) +++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/plugin/impl/PluginContext.java 2009-01-02 12:11:14 UTC (rev 15715) @@ -162,8 +162,9 @@ list.remove(service); manager.unregisterService(service, controlId); manager.unregisterService(service, name); - } else if (running) { - log.warn("unregistering service that wasn't registered."); + if (list.size() == 0) { + services.remove(list); + } } } @@ -189,8 +190,6 @@ if (!initializing) { manager.unregisterTracker(listener, name); } - } else if (running) { - log.warn("unregistering tracker that wasn't registered."); } } @@ -207,20 +206,17 @@ } else { log.warn("context was already initialized"); } - running = true; } void stop() { - running = false; - if (!initializing) { for (Map.Entry> entry : listeners.entrySet()) { for (IServiceTracker service : entry.getValue()) { manager.unregisterTracker(service, entry.getKey()); } } - listeners = new HashMap>(); } + listeners = new HashMap>(); for (Map.Entry> entry : services.entrySet()) { for (IClusterable service : entry.getValue()) { Modified: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/plugin/impl/PluginManager.java =================================================================== --- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/plugin/impl/PluginManager.java 2009-01-02 11:15:09 UTC (rev 15714) +++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/plugin/impl/PluginManager.java 2009-01-02 12:11:14 UTC (rev 15715) @@ -124,12 +124,7 @@ } public void registerService(IClusterable service, String name) { - if (name == null) { - log.error("service name is null"); - return; - } else { - log.debug("registering " + service + " as " + name); - } + log.debug("registering " + service + " as " + name); Map.Entry entry = internalGetReference(service); if (entry == null) { @@ -142,36 +137,36 @@ entry.getValue().addRef(); } - internalRegisterService(service, name); + if (name != null) { + internalRegisterService(service, name); + } } public void unregisterService(IClusterable service, String name) { - if (name == null) { - log.error("service name is null"); - return; - } else { - log.debug("unregistering " + service + " from " + name); + log.debug("unregistering " + service + " from " + name); + if (name != null) { + List list = services.get(name); + if (list != null) { + internalUnregisterService(service, name); + + } else { + log.error("Unknown service name {}.", name); + } } - List list = services.get(name); - if (list != null) { - internalUnregisterService(service, name); - - Map.Entry entry = internalGetReference(service); + Map.Entry entry = internalGetReference(service); + if (entry != null) { RefCount ref = entry.getValue(); - if(ref != null) { - if (ref.release()) { - Integer id = entry.getKey(); - String serviceId = SERVICES + id; - internalUnregisterService(service, serviceId); - referenced.remove(id); - } - } else { - log.error("unregistering a service that wasn't registered."); + if (ref.release()) { + Integer id = entry.getKey(); + String serviceId = SERVICES + id; + internalUnregisterService(service, serviceId); + referenced.remove(id); } } else { log.error("unregistering a service that wasn't registered."); } + } public void registerTracker(IServiceTracker listener, String name) { @@ -222,7 +217,7 @@ T getService(ServiceReference ref) { List list = services.get(ref.getServiceId()); - if(list.size() > 0) { + if (list.size() > 0) { return (T) list.get(0); } return null; Modified: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/plugin/loader/PluginClusterLoader.java =================================================================== --- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/plugin/loader/PluginClusterLoader.java 2009-01-02 11:15:09 UTC (rev 15714) +++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/plugin/loader/PluginClusterLoader.java 2009-01-02 12:11:14 UTC (rev 15715) @@ -15,6 +15,8 @@ */ package org.hippoecm.frontend.plugin.loader; +import java.util.List; + import org.hippoecm.frontend.plugin.IPlugin; import org.hippoecm.frontend.plugin.IPluginContext; import org.hippoecm.frontend.plugin.config.IClusterConfig; @@ -35,13 +37,14 @@ private static final Logger log = LoggerFactory.getLogger(PluginClusterLoader.class); - public static final String PLUGIN_CLUSTER = "cluster.name"; + public static final String CLUSTER_NAME = "cluster.name"; + public static final String CLUSTER_PARAMETERS = "cluster.config"; public PluginClusterLoader(IPluginContext context, IPluginConfig config) { IPluginConfigService pluginConfigService = context.getService(IPluginConfigService.class.getName(), IPluginConfigService.class); - String clusterName = config.getString(PLUGIN_CLUSTER); + String clusterName = config.getString(CLUSTER_NAME); if (clusterName == null) { log.warn("cluster.name not found. Check your configuration in the console."); } else { @@ -49,6 +52,15 @@ if (cluster == null) { log.warn("Unable to find cluster '" + clusterName + "'. Does it exist in repository?"); } else { + IPluginConfig parameters = config.getPluginConfig(CLUSTER_PARAMETERS); + List overrides = cluster.getOverrides(); + if (parameters != null && overrides != null) { + for (String key : overrides) { + if (parameters.get(key) != null) { + cluster.put(key, parameters.get(key)); + } + } + } context.start(cluster); } } Modified: hippo-ecm/trunk/package/config/src/main/resources/cms-pickers.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/cms-pickers.xml 2009-01-02 11:15:09 UTC (rev 15714) +++ hippo-ecm/trunk/package/config/src/main/resources/cms-pickers.xml 2009-01-02 12:11:14 UTC (rev 15715) @@ -14,30 +14,26 @@ See the License for the specific language governing permissions and limitations under the License. --> - + frontend:clusterfolder - + frontend:plugincluster - - + + service.dialog.id - + ${cluster.id}.model - - + + frontend:plugin @@ -88,7 +84,7 @@ - + frontend:plugin @@ -112,7 +108,7 @@ service.dialog.tree.images - + frontend:plugin @@ -137,204 +133,45 @@ - + frontend:plugin - org.hippoecm.frontend.plugins.cms.browse.tree.FolderTreePlugin + org.hippoecm.frontend.plugin.loader.PluginClusterLoader - - service.dialog.tree.images + + cms-tree-views/images - - ${cluster.id}.model.folder - - - /content/gallery - - - true - - + frontend:pluginconfig - - - frontend:pluginconfig - - - - - - - - - - - - hippostd:gallery - - - - - - true - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - nt:unstructured - - - - - - false - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - hippo:handle - - - - - - false - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - hippo:facetsearch - - - - - - false - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - hippostd:folder - - - - - - false - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - hippostd:directory - - - - - - false - - - - - + + service.dialog.tree.images + + + ${cluster.id}.model.folder + - + frontend:plugincluster - - + + service.dialog.id - + ${cluster.id}.model - - + + frontend:plugin @@ -376,16 +213,16 @@ service.dialog.breadcrumb - - - frontend:plugin - - - 10 - - + + + frontend:plugin + + + 10 + + - + frontend:plugin @@ -422,7 +259,7 @@ service.dialog.tree.files - + frontend:plugin @@ -447,550 +284,74 @@ - + frontend:plugin - org.hippoecm.frontend.plugins.cms.browse.tree.FolderTreePlugin + org.hippoecm.frontend.plugin.loader.PluginClusterLoader - - service.dialog.tree.content + + cms-tree-views/documents - - ${cluster.id}.model.folder - - - /content - - - true - - + frontend:pluginconfig - - - frontend:pluginconfig - - - - - - - - - - - - hippostd:gallery - - - - - - false - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - hippostd:folder - - - - - - true - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - hippostd:directory - - - - - - true - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - nt:unstructured - - - - - - false - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - hippo:handle - - - - - - false - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - hippo:facetsearch - - - - - - false - - - - - + + service.dialog.tree.content + + + ${cluster.id}.model.folder + - + + frontend:plugin - org.hippoecm.frontend.plugins.cms.browse.tree.FolderTreePlugin + org.hippoecm.frontend.plugin.loader.PluginClusterLoader - - service.dialog.tree.images + + cms-tree-views/images - - ${cluster.id}.model.folder - - - /content/gallery - - - true - - + frontend:pluginconfig - - - frontend:pluginconfig - - - - - - - - - - - - hippostd:gallery - - - - - - true - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - nt:unstructured - - - - - - false - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - hippo:handle - - - - - - false - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - hippo:facetsearch - - - - - - false - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - hippostd:folder - - - - - - false - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - hippostd:directory - - - - - - false - - - - - + + service.dialog.tree.images + + + ${cluster.id}.model.folder + - - - frontend:plugin - - - org.hippoecm.frontend.plugins.cms.browse.tree.FolderTreePlugin - - - service.dialog.tree.files - - - ${cluster.id}.model.folder - - - /content/assets - - - true - - + + - frontend:pluginconfig + frontend:plugin - + + org.hippoecm.frontend.plugin.loader.PluginClusterLoader + + + cms-tree-views/assets + + frontend:pluginconfig - - + + service.dialog.tree.files - - + + ${cluster.id}.model.folder - - - - - hippostd:gallery - - - - - - true - - - - - - - frontend:pluginconfig - - - - - - - - - - - - nt:unstructured - - - - - - false - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - hippo:handle - - - - - - false - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - hippo:facetsearch - - - - - - false - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - hippostd:folder - - - - - - false - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - hippostd:directory - - - - - - false - - - - - + - - - Modified: hippo-ecm/trunk/package/config/src/main/resources/cms-static.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/cms-static.xml 2009-01-02 11:15:09 UTC (rev 15714) +++ hippo-ecm/trunk/package/config/src/main/resources/cms-static.xml 2009-01-02 12:11:14 UTC (rev 15715) @@ -21,7 +21,7 @@ - + frontend:plugin @@ -1006,835 +1006,99 @@ service.browse.tree.configuration - + + frontend:plugin - org.hippoecm.frontend.plugins.cms.browse.tree.FolderTreePlugin + org.hippoecm.frontend.plugin.loader.PluginClusterLoader - - service.browse.tree.content + + cms-tree-views/documents - - model.browse.folder - - - /content - - - true - - + frontend:pluginconfig - - - frontend:pluginconfig - - - - - - - - - - - - hippostd:gallery - - - - - - false - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - hippostd:folder - - - - - - true - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - hippostd:directory - - - - - - true - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - nt:unstructured - - - - - - false - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - hippo:handle - - - - - - false - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - hippo:facetsearch - - - - - - false - - - - - + + service.browse.tree.content + + + model.browse.folder + - + + frontend:plugin - org.hippoecm.frontend.plugins.cms.browse.tree.FolderTreePlugin + org.hippoecm.frontend.plugin.loader.PluginClusterLoader - - service.browse.tree.images + + cms-tree-views/images - - model.browse.folder - - - /content/gallery - - - true - - + frontend:pluginconfig - - - frontend:pluginconfig - - - - - - - - - - - - hippostd:gallery - - - - - - true - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - nt:unstructured - - - - - - false - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - hippo:handle - - - - - - false - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - hippo:facetsearch - - - - - - false - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - hippostd:folder - - - - - - false - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - hippostd:directory - - - - - - false - - - - - + + service.browse.tree.images + + + model.browse.folder + - + + frontend:plugin - org.hippoecm.frontend.plugins.cms.browse.tree.FolderTreePlugin + org.hippoecm.frontend.plugin.loader.PluginClusterLoader - - service.browse.tree.files + + cms-tree-views/assets - - model.browse.folder - - - /content/assets - - - true - - + frontend:pluginconfig - - - frontend:pluginconfig - - - - - - - - - - - - hippostd:gallery - - - - - - true - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - nt:unstructured - - - - - - false - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - hippo:handle - - - - - - false - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - hippo:facetsearch - - - - - - false - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - hippostd:folder - - - - - - false - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - hippostd:directory - - - - - - false - - - - - + + service.browse.tree.files + + + model.browse.folder + - + + frontend:plugin - org.hippoecm.frontend.plugins.cms.browse.tree.FolderTreePlugin + org.hippoecm.frontend.plugin.loader.PluginClusterLoader - - service.browse.tree.configuration + + cms-tree-views/configuration - - model.browse.folder - - - /hippo:namespaces - - - false - - + frontend:pluginconfig - - - frontend:pluginconfig - - - - - - /hippo:namespaces - - - - - - - - - - - - true - - - document types - - - - - frontend:pluginconfig - - - - - - - - - hippo:namespace - - - - - - - - - false - - - - - - - - frontend:pluginconfig - - - - - - /hippo:namespaces/hippo - - - - - - - - - - - - false - - - - - - - - frontend:pluginconfig - - - - - - /hippo:namespaces/hippogallery - - - - - - - - - - - - false - - - - - - - - frontend:pluginconfig - - - - - - /hippo:namespaces/hippostd - - - - - - - - - - - - false - - - - - - - - frontend:pluginconfig - - - - - - /hippo:namespaces/system - - - - - - - - - - - - false - - - - - - - - frontend:pluginconfig - - - - - - /hippo:namespaces/frontend - - - - - - - - - - - - false - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - hippo:namespace - - - - - - true - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - hippostd:folder - - - - - - false - - - - - - - - frontend:pluginconfig - - - - - - - - - - - - hippo:handle - - - - - - false - - - - - + + service.browse.tree.configuration + + + model.browse.folder + - + frontend:plugin Copied: hippo-ecm/trunk/package/config/src/main/resources/cms-tree-views.xml (from rev 15636, hippo-ecm/trunk/package/config/src/main/resources/cms-pickers.xml) =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/cms-tree-views.xml (rev 0) +++ hippo-ecm/trunk/package/config/src/main/resources/cms-tree-views.xml 2009-01-02 12:11:14 UTC (rev 15715) @@ -0,0 +1,900 @@ + + + + + frontend:clusterfolder + + + + + frontend:plugincluster + + + + wicket.id + wicket.model + + + + + frontend:plugin + + + org.hippoecm.frontend.plugins.cms.browse.tree.FolderTreePlugin + + + ${wicket.id} + + + ${wicket.model} + + + /content + + + true + + + + frontend:pluginconfig + + + + frontend:pluginconfig + + + + + + + + + + + + hippostd:gallery + + + + + + false + + + + + + + + frontend:pluginconfig + + + + + + + + + + + + hippostd:folder + + + + + + true + + + + + + + + frontend:pluginconfig + + + + + + + + + + + + hippostd:directory + + + + + + true + + + + + + + + frontend:pluginconfig + + + + + + + + + + + + nt:unstructured + + + + + + false + + + + + + + + frontend:pluginconfig + + + + + + + + + + + + hippo:handle + + + + + + false + + + + + + + + frontend:pluginconfig + + + + + + + + + + + + hippo:facetsearch + + + + + + false + + + + + + + + + + + + frontend:plugincluster + + + + wicket.id + wicket.model + + + + + frontend:plugin + + + org.hippoecm.frontend.plugins.cms.browse.tree.FolderTreePlugin + + + ${wicket.id} + + + ${wicket.model} + + + /content/gallery + + + true + + + + frontend:pluginconfig + + + + frontend:pluginconfig + + + + + + + + + + + + hippostd:gallery + + + + + + true + + + + + + + + frontend:pluginconfig + + + + + + + + + + + + nt:unstructured + + + + + + false + + + + + + + + frontend:pluginconfig + + + + + + + + + + + + hippo:handle + + + + + + false + + + + + + + + frontend:pluginconfig + + + + + + + + + + + + hippo:facetsearch + + + + + + false + + + + + + + + frontend:pluginconfig + + + + + + + + + + + + hippostd:folder + + + + + + false + + + + + + + + frontend:pluginconfig + + + + + + + + + + + + hippostd:directory + + + + + + false + + + + + + + + + + + + frontend:plugincluster + + + + wicket.id + wicket.model + + + + + frontend:plugin + + + org.hippoecm.frontend.plugins.cms.browse.tree.FolderTreePlugin + + + ${wicket.id} + + + ${wicket.model} + + + /content/assets + + + true + + + + frontend:pluginconfig + + + + frontend:pluginconfig + + + + + + + + + + + + hippostd:gallery + + + + + + true + + + + + + + + frontend:pluginconfig + + + + + + + + + + + + nt:unstructured + + + + + + false + + + + + + + + frontend:pluginconfig + + + + + + + + + + + + hippo:handle + + + + + + false + + + + + + + + frontend:pluginconfig + + + + + + + + + + + + hippo:facetsearch + + + + + + false + + + + + + + + frontend:pluginconfig + + + + + + + + + + + + hippostd:folder + + + + + + false + + + + + + + + frontend:pluginconfig + + + + + + + + + + + + hippostd:directory + + + + + + false + + + + + + + + + + + + frontend:plugincluster + + + + wicket.id + wicket.model + + + + + frontend:plugin + + + org.hippoecm.frontend.plugins.cms.browse.tree.FolderTreePlugin + + + ${wicket.id} + + + ${wicket.model} + + + /hippo:namespaces + + + false + + + + frontend:pluginconfig + + + + frontend:pluginconfig + + + + + + /hippo:namespaces + + + + + + + + + + + + true + + + document types + + + + + frontend:pluginconfig + + + + + + + + + hippo:namespace + + + + + + + + + false + + + + + + + + frontend:pluginconfig + + + + + + /hippo:namespaces/hippo + + + + + + + + + + + + false + + + + + + + + frontend:pluginconfig + + + + + + /hippo:namespaces/hippogallery + + + + + + + + + + + + false + + + + + + + + frontend:pluginconfig + + + + + + /hippo:namespaces/hippostd + + + + + + + + + + + + false + + + + + + + + frontend:pluginconfig + + + + + + /hippo:namespaces/system + + + + + + + + + + + + false + + + + + + + + frontend:pluginconfig + + + + + + /hippo:namespaces/frontend + + + + + + + + + + + + false + + + + + + + + frontend:pluginconfig + + + + + + + + + + + + hippo:namespace + + + + + + true + + + + + + + + frontend:pluginconfig + + + + + + + + + + + + hippostd:folder + + + + + + false + + + + + + + + frontend:pluginconfig + + + + + + + + + + + + hippo:handle + + + + + + false + + + + + + + + + + + + Modified: hippo-ecm/trunk/package/config/src/main/resources/hippoecm-extension.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/hippoecm-extension.xml 2009-01-02 11:15:09 UTC (rev 15714) +++ hippo-ecm/trunk/package/config/src/main/resources/hippoecm-extension.xml 2009-01-02 12:11:14 UTC (rev 15715) @@ -14,174 +14,186 @@ See the License for the specific language governing permissions and limitations under the License. --> - + + + hippo:initializefolder + + + + - hippo:initializefolder + hippo:initializeitem - - - - - hippo:initializeitem - - - 900 - - - cms.xml - - - /hippo:configuration/hippo:frontend - - - - - - - hippo:initializeitem - - - 900.5 - - - cms-static.xml - - - /hippo:configuration/hippo:frontend/cms - - - - - - - hippo:initializeitem - - - 900.6 - - - cms-editor.xml - - - /hippo:configuration/hippo:frontend/cms - - - - - - - hippo:initializeitem - - - 900.7 - - - cms-preview.xml - - - /hippo:configuration/hippo:frontend/cms - - - - - - - hippo:initializeitem - - - 901 - - - cms-headshortcuts.xml - - - /hippo:configuration/hippo:frontend/cms - - + + 900 + + + cms.xml + + + /hippo:configuration/hippo:frontend + + - - - - hippo:initializeitem - - - 901 - - - cms-dashshortcuts.xml - - - /hippo:configuration/hippo:frontend/cms - - + + + + hippo:initializeitem + + + 900.5 + + + cms-static.xml + + + /hippo:configuration/hippo:frontend/cms + + - - - - hippo:initializeitem - - - 902 - - - cms-dashboard.xml - - - /hippo:configuration/hippo:frontend/cms - - + + + + hippo:initializeitem + + + 900.6 + + + cms-editor.xml + + + /hippo:configuration/hippo:frontend/cms + + - - - - hippo:initializeitem - - - 902 - - - cms-reports.xml - - - /hippo:configuration/hippo:frontend/cms - - + + + + hippo:initializeitem + + + 900.7 + + + cms-preview.xml + + + /hippo:configuration/hippo:frontend/cms + + - - - - hippo:initializeitem - - - 904 - - - cms-folder-views.xml - - - /hippo:configuration/hippo:frontend/cms - - + + + + hippo:initializeitem + + + 901 + + + cms-headshortcuts.xml + + + /hippo:configuration/hippo:frontend/cms + + - - - - hippo:initializeitem - - - 905 - - - cms-pickers.xml - - - /hippo:configuration/hippo:frontend/cms - - + + + + hippo:initializeitem + + + 901 + + + cms-dashshortcuts.xml + + + /hippo:configuration/hippo:frontend/cms + + + + + + + hippo:initializeitem + + + 902 + + + cms-dashboard.xml + + + /hippo:configuration/hippo:frontend/cms + + + + + + + hippo:initializeitem + + + 902 + + + cms-reports.xml + + + /hippo:configuration/hippo:frontend/cms + + + + + + + hippo:initializeitem + + + 904 + + + cms-folder-views.xml + + + /hippo:configuration/hippo:frontend/cms + + + + + + + hippo:initializeitem + + + 905 + + + cms-tree-views.xml + + + /hippo:configuration/hippo:frontend/cms + + + + + + + hippo:initializeitem + + + 906 + + + cms-pickers.xml + + + /hippo:configuration/hippo:frontend/cms + + + From svn-logs at hippocms.org Fri Jan 2 13:12:50 2009 From: svn-logs at hippocms.org (SVN (fvlankvelt)) Date: Fri Jan 2 13:12:05 2009 Subject: [HippoRepos-dev] [15716] hippo-ecm/trunk: HREPTWO-2052: use plugins in link picker dialog Message-ID: <20090102121250.65ED5C535@svnnew.onehippo.org> Revision: 15716 Author: fvlankvelt Date: 2009-01-02 13:12:48 +0100 (Fri, 02 Jan 2009) Log Message: ----------- HREPTWO-2052: use plugins in link picker dialog The same clusters that have been defined for the xinha pickers are reused. The LookupDialog has been moved to the frontend-plugins project as it hasn't turned out to be sufficiently generic to be in the engine. The plugins in the picker clusters were moved to the addon-standards project. The HTML cleaner has been moved into a separate service, eliminating duplication of configuration. This makes the Xinha configuration a lot smaller, so it's now reasonable to customize the Xinha plugin by copying the basic configuration as used in the system and hippostd templates. Variable expansion (e.g. use of ${cluster.id} in templates) has been implemented for nested configs. (necessary to be able to give the correct model to the loaded cluster) Modified Paths: -------------- hippo-ecm/trunk/addon/editor/pom.xml hippo-ecm/trunk/addon/editor/src/main/java/org/hippoecm/frontend/editor/impl/TemplateEngine.java hippo-ecm/trunk/addon/editor/src/main/java/org/hippoecm/frontend/editor/plugins/linkpicker/LinkPickerDialog.html hippo-ecm/trunk/addon/editor/src/main/java/org/hippoecm/frontend/editor/plugins/linkpicker/LinkPickerDialog.java hippo-ecm/trunk/addon/editor/src/main/java/org/hippoecm/frontend/editor/plugins/linkpicker/LinkPickerPlugin.java hippo-ecm/trunk/addon/editor/src/main/resources/namespace-system.xml hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/DocumentListFilter.java hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/browse/AbstractBrowseView.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/AbstractXinhaPlugin.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/XinhaDialogBehavior.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/images/ImageBrowserDialog.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/images/ImageBrowserDialog.properties hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/images/ImagePickerBehavior.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/links/DocumentBrowserDialog.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/links/DocumentBrowserDialog.properties hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/links/ExternalLinkBehavior.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/links/ExternalLinkDialog.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/links/ExternalLinkDialog.properties hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/links/InternalLinkBehavior.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/htmlcleaner/JCRHtmlCleanerTemplateBuilder.java hippo-ecm/trunk/addon/xinha-frontend/src/main/resources/hippoecm-extension.xml hippo-ecm/trunk/addon/xinha-frontend/src/main/resources/hippostd-html-template.xml hippo-ecm/trunk/addon/xinha-frontend/src/main/resources/system-html-template.xml hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/YuiPluginHelper.java hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/AbstractDialog.java hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/model/tree/JcrTreeNode.java hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/plugin/config/impl/ClusterConfigDecorator.java hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/plugin/config/impl/JcrClusterConfig.java hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/plugin/config/impl/JcrPluginConfig.java hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/copy/CopyDialog.java hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/move/MoveDialog.java hippo-ecm/trunk/package/config/src/main/resources/cms-folder-views.xml hippo-ecm/trunk/package/config/src/main/resources/cms-pickers.xml Added Paths: ----------- hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/browse/BreadcrumbPlugin.html hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/browse/BreadcrumbPlugin.java hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/browse/BreadcrumbPlugin.properties hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/browse/BrowserPlugin.html hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/browse/BrowserPlugin.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/IHtmlCleanerService.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/AbstractBrowserDialog.html hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/AbstractBrowserDialog.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/htmlcleaner/HtmlCleanerPlugin.java hippo-ecm/trunk/addon/xinha-frontend/src/main/resources/html-cleaner-service.xml hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/model/map/ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/model/map/AbstractValueMap.java hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/model/map/IHippoMap.java hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/model/map/JcrList.java hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/model/map/JcrMap.java hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/dialog/ hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/dialog/LookupDialog.html hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/dialog/LookupDialog.java hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/dialog/LookupTargetTreeView.java Removed Paths: ------------- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/browse/AbstractBrowserDialog.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/browse/BreadcrumbPlugin.html hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/browse/BreadcrumbPlugin.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/browse/BreadcrumbPlugin.properties hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/browse/BrowserPlugin.html hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/browse/BrowserPlugin.java hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/lookup/LookupDialog.html hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/lookup/LookupDialog.java hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/lookup/LookupTargetTreeView.java Modified: hippo-ecm/trunk/addon/editor/pom.xml =================================================================== --- hippo-ecm/trunk/addon/editor/pom.xml 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/addon/editor/pom.xml 2009-01-02 12:12:48 UTC (rev 15716) @@ -42,11 +42,6 @@ org.hippoecm - hippo-ecm-frontend-plugins - 2.03.00-SNAPSHOT - - - org.hippoecm hippo-ecm-addon-builtin-common 2.03.00-SNAPSHOT Modified: hippo-ecm/trunk/addon/editor/src/main/java/org/hippoecm/frontend/editor/impl/TemplateEngine.java =================================================================== --- hippo-ecm/trunk/addon/editor/src/main/java/org/hippoecm/frontend/editor/impl/TemplateEngine.java 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/addon/editor/src/main/java/org/hippoecm/frontend/editor/impl/TemplateEngine.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -96,7 +96,9 @@ public IClusterConfig getTemplate(ITypeDescriptor type, String mode) { IClusterConfig cluster = templateStore.getCluster(type.getName() + "/" + mode); if (cluster != null) { - cluster.put(ITemplateEngine.ENGINE, serviceId); + if (cluster.getOverrides().contains(ITemplateEngine.ENGINE)) { + cluster.put(ITemplateEngine.ENGINE, serviceId); + } } return cluster; } Modified: hippo-ecm/trunk/addon/editor/src/main/java/org/hippoecm/frontend/editor/plugins/linkpicker/LinkPickerDialog.html =================================================================== --- hippo-ecm/trunk/addon/editor/src/main/java/org/hippoecm/frontend/editor/plugins/linkpicker/LinkPickerDialog.html 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/addon/editor/src/main/java/org/hippoecm/frontend/editor/plugins/linkpicker/LinkPickerDialog.html 2009-01-02 12:12:48 UTC (rev 15716) @@ -14,7 +14,24 @@ * limitations under the License. --> - - [ path here ] - + + + + +
+
+
+
[ plugins here ]
+
+ + + +
+ +
+ Modified: hippo-ecm/trunk/addon/editor/src/main/java/org/hippoecm/frontend/editor/plugins/linkpicker/LinkPickerDialog.java =================================================================== --- hippo-ecm/trunk/addon/editor/src/main/java/org/hippoecm/frontend/editor/plugins/linkpicker/LinkPickerDialog.java 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/addon/editor/src/main/java/org/hippoecm/frontend/editor/plugins/linkpicker/LinkPickerDialog.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -20,22 +20,26 @@ import javax.jcr.Node; import javax.jcr.RepositoryException; -import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.Component; +import org.apache.wicket.Session; import org.apache.wicket.model.IModel; -import org.apache.wicket.model.Model; import org.apache.wicket.model.StringResourceModel; -import org.hippoecm.frontend.dialog.lookup.LookupDialog; +import org.hippoecm.frontend.dialog.AbstractDialog; import org.hippoecm.frontend.model.JcrNodeModel; -import org.hippoecm.frontend.model.properties.JcrPropertyValueModel; -import org.hippoecm.frontend.model.tree.AbstractTreeNode; +import org.hippoecm.frontend.model.ModelService; import org.hippoecm.frontend.plugin.IPluginContext; -import org.hippoecm.frontend.service.IJcrService; +import org.hippoecm.frontend.plugin.IPluginControl; +import org.hippoecm.frontend.plugin.config.IClusterConfig; +import org.hippoecm.frontend.plugin.config.IPluginConfig; +import org.hippoecm.frontend.plugin.config.IPluginConfigService; +import org.hippoecm.frontend.service.IRenderService; +import org.hippoecm.frontend.service.PluginRequestTarget; +import org.hippoecm.frontend.session.UserSession; import org.hippoecm.repository.api.HippoNodeType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class LinkPickerDialog extends LookupDialog { +public class LinkPickerDialog extends AbstractDialog { @SuppressWarnings("unused") private final static String SVN_ID = "$Id: LinkPickerDialog.java 12039 2008-06-13 09:27:05Z bvanhalderen $"; @@ -43,72 +47,68 @@ static final Logger log = LoggerFactory.getLogger(LinkPickerDialog.class); - protected IPluginContext context; - protected JcrPropertyValueModel valueModel; private List nodetypes; - private Label label; - public LinkPickerDialog(IPluginContext context, JcrPropertyValueModel valueModel, List nodetypes, - AbstractTreeNode rootNode) { - super(rootNode); + protected final IPluginContext context; + protected final IPluginConfig config; + protected IRenderService dialogRenderer; + private ModelService modelService; + private IPluginControl control; + private IModel selectedNode; + + public LinkPickerDialog(IPluginContext context, IPluginConfig config, IModel model, List nodetypes) { + super(model); + this.context = context; + this.config = config; this.nodetypes = nodetypes; - this.valueModel = valueModel; - setOutputMarkupId(true); - - String path = "no path selected"; + ok.setEnabled(false); try { - if (getSelectedNode() != null) { - path = getSelectedNode().getNodeModel().getNode().getPath(); + String uuid = (String) model.getObject(); + if (uuid != null && !"".equals(uuid)) { + selectedNode = new JcrNodeModel(((UserSession) Session.get()).getJcrSession().getNodeByUUID(uuid)); + ok.setEnabled(true); } - } catch (RepositoryException ex) { + } catch(RepositoryException ex) { log.error(ex.getMessage()); } - add(label = new Label("info", new Model(path))); - label.setOutputMarkupId(true); - ok.setEnabled(false); + + setOutputMarkupId(true); + + add(createContentPanel("content")); } public IModel getTitle() { return new StringResourceModel("link-picker", this, null); } - @Override - public void onSelect(JcrNodeModel model) { + protected boolean isValidSelection(IModel targetModel) { + boolean isLinkable; + boolean validType = false; + + if (targetModel == null || targetModel.getObject() == null) { + return false; + } + try { - label.setModelObject(model.getNode().getPath()); - AjaxRequestTarget target = AjaxRequestTarget.get(); - if (target != null) { - target.addComponent(label); - target.addComponent(ok); + Node targetNode = (Node) targetModel.getObject(); + + Node testNode = targetNode; + if (targetNode.isNodeType(HippoNodeType.NT_HANDLE) && targetNode.hasNode(targetNode.getName())) { + testNode = targetNode.getNode(targetNode.getName()); } - } catch (RepositoryException ex) { - log.error(ex.getMessage()); - } - } - @Override - protected boolean isValidSelection(AbstractTreeNode targetModel) { - Node targetNode = targetModel.getNodeModel().getNode(); - - boolean validType = false; - if (nodetypes.size() == 0) { - validType = true; - } - for (int i = 0; i < nodetypes.size(); i++) { - try { - if (targetNode.isNodeType(nodetypes.get(i))) { + if (nodetypes.size() == 0) { + validType = true; + } + for (int i = 0; i < nodetypes.size(); i++) { + if (testNode.isNodeType(nodetypes.get(i))) { validType = true; break; } - } catch (RepositoryException e) { - log.error(e.getMessage()); } - } - boolean isLinkable; - try { // do not enable linking to not referenceable nodes isLinkable = targetNode.isNodeType("mix:referenceable"); // do not enable linking to hippo documents below hippo handle @@ -117,27 +117,76 @@ HippoNodeType.NT_HANDLE)); } catch (RepositoryException e) { log.error(e.getMessage()); + error("Failed to determine validity of selection"); isLinkable = false; } return validType && isLinkable; } + protected Component createContentPanel(String contentId) { + //Get PluginConfigService + IPluginConfigService pluginConfigService = context.getService(IPluginConfigService.class.getName(), + IPluginConfigService.class); + + //Lookup clusterConfig from IPluginContext + IClusterConfig clusterConfig = pluginConfigService.getCluster(config.getString("cluster.name")); + IPluginConfig parameters = config.getPluginConfig("cluster.options"); + for (String key : clusterConfig.getOverrides()) { + Object value = parameters.get(key); + if (value != null) { + clusterConfig.put(key, parameters.get(key)); + } + } + + //save modelServiceId and dialogServiceId in cluster config + String modelServiceId = clusterConfig.getString("model.id"); + modelService = new ModelService(modelServiceId, selectedNode) { + private static final long serialVersionUID = 1L; + + @Override + public void setModel(IModel model) { + if (isValidSelection(model)) { + selectedNode = model; + ok.setEnabled(true); + } else { + ok.setEnabled(false); + } + super.setModel(model); + } + }; + modelService.init(context); + + control = context.start(clusterConfig); + + dialogRenderer = context.getService(clusterConfig.getString("wicket.id"), IRenderService.class); + dialogRenderer.bind(null, contentId); + return dialogRenderer.getComponent(); + } + + public final void onClose() { + dialogRenderer.unbind(); + dialogRenderer = null; + control.stopPlugin(); + modelService.destroy(); + } + @Override + public void render(PluginRequestTarget target) { + if (dialogRenderer != null) { + dialogRenderer.render(target); + } + super.render(target); + } + + @Override public void onOk() { + if (selectedNode == null) { + error("No node selected"); + return; + } try { - JcrNodeModel sourceNodeModel = new JcrNodeModel(valueModel.getJcrPropertymodel().getItemModel() - .getParentModel()); - if (sourceNodeModel.getParentModel() != null) { - JcrNodeModel targetNodeModel = getSelectedNode().getNodeModel(); - String targetUUID = targetNodeModel.getNode().getUUID(); - valueModel.setObject(targetUUID); - - IJcrService jcrService = context.getService(IJcrService.class.getName(), IJcrService.class); - if (jcrService != null) { - jcrService.flush(sourceNodeModel); - } - } + getModel().setObject(((Node) selectedNode.getObject()).getUUID()); } catch (RepositoryException ex) { error(ex.getMessage()); } Modified: hippo-ecm/trunk/addon/editor/src/main/java/org/hippoecm/frontend/editor/plugins/linkpicker/LinkPickerPlugin.java =================================================================== --- hippo-ecm/trunk/addon/editor/src/main/java/org/hippoecm/frontend/editor/plugins/linkpicker/LinkPickerPlugin.java 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/addon/editor/src/main/java/org/hippoecm/frontend/editor/plugins/linkpicker/LinkPickerPlugin.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -25,27 +25,23 @@ import org.apache.wicket.Session; import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.model.IChainingModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.hippoecm.frontend.dialog.AbstractDialog; import org.hippoecm.frontend.dialog.DialogLink; import org.hippoecm.frontend.dialog.IDialogFactory; import org.hippoecm.frontend.dialog.IDialogService; -import org.hippoecm.frontend.model.IJcrNodeModelListener; -import org.hippoecm.frontend.model.JcrNodeModel; import org.hippoecm.frontend.model.properties.JcrPropertyValueModel; -import org.hippoecm.frontend.model.tree.AbstractTreeNode; import org.hippoecm.frontend.plugin.IPluginContext; import org.hippoecm.frontend.plugin.config.IPluginConfig; -import org.hippoecm.frontend.plugins.standards.DocumentListFilter; -import org.hippoecm.frontend.plugins.standards.FolderTreeNode; import org.hippoecm.frontend.service.IJcrService; import org.hippoecm.frontend.service.render.RenderPlugin; import org.hippoecm.frontend.session.UserSession; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class LinkPickerPlugin extends RenderPlugin implements IJcrNodeModelListener { +public class LinkPickerPlugin extends RenderPlugin { @SuppressWarnings("unused") private final static String SVN_ID = "$Id: LinkPickerPlugin.java 12039 2008-06-13 09:27:05Z bvanhalderen $"; @@ -94,19 +90,40 @@ if (nodetypes.size() == 0) { log.debug("No configuration specified for filtering on nodetypes. No filtering will take place."); } - - DocumentListFilter filter = new DocumentListFilter(config); - final AbstractTreeNode rootNode = new FolderTreeNode(new JcrNodeModel(config.getString("path", "/")), filter); - + IDialogFactory dialogFactory = new IDialogFactory() { private static final long serialVersionUID = 1L; - + public AbstractDialog createDialog() { - return new LinkPickerDialog(context, valueModel, nodetypes, rootNode); + return new LinkPickerDialog(context, getPluginConfig(), new IChainingModel() { + private static final long serialVersionUID = 1L; + + public Object getObject() { + return valueModel.getObject(); + } + + public void setObject(Object object) { + valueModel.setObject(object); + redraw(); + } + + public IModel getChainedModel() { + return valueModel; + } + + public void setChainedModel(IModel model) { + throw new UnsupportedOperationException("Value model cannot be changed"); + } + + public void detach() { + valueModel.detach(); + } + + }, nodetypes); } }; add(new DialogLink("value", displayModel, dialogFactory, dialogService)); - + context.registerService(this, IJcrService.class.getName()); } else { add(new Label("value", valueModel)); @@ -119,10 +136,4 @@ redraw(); } - public void onFlush(JcrNodeModel nodeModel) { - if (valueModel.getJcrPropertymodel().getItemModel().hasAncestor(nodeModel.getItemModel())) { - valueModel.detach(); - modelChanged(); - } - } } Modified: hippo-ecm/trunk/addon/editor/src/main/resources/namespace-system.xml =================================================================== --- hippo-ecm/trunk/addon/editor/src/main/resources/namespace-system.xml 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/addon/editor/src/main/resources/namespace-system.xml 2009-01-02 12:12:48 UTC (rev 15716) @@ -609,6 +609,9 @@ ${mode} + + cms-pickers/documents + @@ -660,8 +663,6 @@ wicket.id mode - filters - path nodetypes @@ -692,12 +693,9 @@ ${nodetypes} - - ${filters} + + cms-pickers/documents - - ${path} - Modified: hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/DocumentListFilter.java =================================================================== --- hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/DocumentListFilter.java 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/DocumentListFilter.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -83,14 +83,17 @@ public DocumentListFilter(IPluginConfig config) { filters = new Vector(); - for (IPluginConfig filter : config.getPluginConfig("filters").getPluginConfigSet()) { - filters.add(new FilterDefinition(filter.getString("state", ""), - filter.getString("path", ""), - filter.getString("parent", ""), - filter.getString("child", ""), - filter.getString("target", ""), - filter.containsKey("display") ? filter.getBoolean("display") : true, - filter.getString("name", ""))); + IPluginConfig filterConfig = config.getPluginConfig("filters"); + if (filterConfig != null) { + for (IPluginConfig filter : filterConfig.getPluginConfigSet()) { + filters.add(new FilterDefinition(filter.getString("state", ""), + filter.getString("path", ""), + filter.getString("parent", ""), + filter.getString("child", ""), + filter.getString("target", ""), + filter.containsKey("display") ? filter.getBoolean("display") : true, + filter.getString("name", ""))); + } } if(log.isDebugEnabled()) { Modified: hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/browse/AbstractBrowseView.java =================================================================== --- hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/browse/AbstractBrowseView.java 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/browse/AbstractBrowseView.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -68,16 +68,19 @@ viewerName = null; } - IPluginConfig parameters = config.getPluginConfig("browser.options"); IPluginConfigService pluginConfig = context.getService(IPluginConfigService.class.getName(), IPluginConfigService.class); IClusterConfig cluster = pluginConfig.getCluster(config.getString(VIEWERS) + "/" + type); cluster.put("wicket.id", getExtensionPoint()); cluster.put("model.folder", config.getString("model.folder")); cluster.put("model.document", config.getString("model.document")); - for (String override : cluster.getOverrides()) { - if (parameters.containsKey(override)) { - cluster.put(override, parameters.get(override)); + + IPluginConfig parameters = config.getPluginConfig("browser.options"); + if (parameters != null) { + for (String override : cluster.getOverrides()) { + if (parameters.containsKey(override)) { + cluster.put(override, parameters.get(override)); + } } } viewer = context.start(cluster); Copied: hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/browse/BreadcrumbPlugin.html (from rev 15715, hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/browse/BreadcrumbPlugin.html) =================================================================== --- hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/browse/BreadcrumbPlugin.html (rev 0) +++ hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/browse/BreadcrumbPlugin.html 2009-01-02 12:12:48 UTC (rev 15716) @@ -0,0 +1,26 @@ + + +
+ +
+ + + Copied: hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/browse/BreadcrumbPlugin.java (from rev 15715, hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/browse/BreadcrumbPlugin.java) =================================================================== --- hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/browse/BreadcrumbPlugin.java (rev 0) +++ hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/browse/BreadcrumbPlugin.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -0,0 +1,195 @@ +/* + * Copyright 2008 Hippo. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.hippoecm.frontend.plugins.standards.browse; + +import java.util.Collections; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; + +import javax.jcr.RepositoryException; + +import org.apache.wicket.IClusterable; +import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.ajax.markup.html.AjaxLink; +import org.apache.wicket.ajax.markup.html.form.AjaxButton; +import org.apache.wicket.behavior.AttributeAppender; +import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.markup.html.form.Form; +import org.apache.wicket.markup.html.list.ListItem; +import org.apache.wicket.markup.html.list.ListView; +import org.apache.wicket.model.IModel; +import org.apache.wicket.model.Model; +import org.apache.wicket.model.StringResourceModel; +import org.hippoecm.frontend.model.IModelListener; +import org.hippoecm.frontend.model.JcrNodeModel; +import org.hippoecm.frontend.plugin.IPluginContext; +import org.hippoecm.frontend.plugin.config.IPluginConfig; +import org.hippoecm.frontend.service.render.RenderPlugin; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class BreadcrumbPlugin extends RenderPlugin { + private static final long serialVersionUID = 1L; + + @SuppressWarnings("unused") + private final static String SVN_ID = "$Id$"; + + static final Logger log = LoggerFactory.getLogger(BreadcrumbPlugin.class); + + private final Set roots; + private final AjaxButton up; + + public BreadcrumbPlugin(IPluginContext context, IPluginConfig config) { + super(context, config); + + roots = new HashSet(); + String[] paths = config.getStringArray("root.paths"); + if (paths != null) { + for (String path : paths) { + roots.add(path); + } + } else { + roots.add("/"); + } + JcrNodeModel nodeModel = (JcrNodeModel) getModel(); + add(getListView(nodeModel)); + + if (config.getString("model.folder") != null) { + context.registerService(new IModelListener() { + private static final long serialVersionUID = 1L; + + public void updateModel(IModel model) { + update((JcrNodeModel) model); + } + + }, config.getString("model.folder")); + } + up = new AjaxButton("up") { + private static final long serialVersionUID = 1L; + + @Override + protected void onSubmit(AjaxRequestTarget target, Form form) { + JcrNodeModel model = (JcrNodeModel) BreadcrumbPlugin.this.getModel(); + model = model.getParentModel(); + if (model != null) { + BreadcrumbPlugin.this.setModel(model); + } + } + }; + up.setModel(new StringResourceModel("dialog-breadcrumb-up", this, null)); + if (nodeModel == null || roots.contains(nodeModel.getItemModel().getPath())) { + up.setEnabled(false); + } + add(up); + } + + protected void update(JcrNodeModel model) { + replace(getListView(model)); + + JcrNodeModel parentModel = model.getParentModel(); + if (parentModel == null || roots.contains(model.getItemModel().getPath())) { + up.setEnabled(false); + } else { + up.setEnabled(true); + } + AjaxRequestTarget.get().addComponent(this); + } + + private ListView getListView(JcrNodeModel model) { + final List list = new LinkedList(); + if (model != null) { + //add current folder as disabled + list.add(new NodeItem(model, false)); + if (!roots.contains(model.getItemModel().getPath())) { + model = model.getParentModel(); + while (model != null) { + list.add(new NodeItem(model, true)); + if (roots.contains(model.getItemModel().getPath())) { + model = null; + } else { + model = model.getParentModel(); + } + } + } + } + Collections.reverse(list); + ListView listview = new ListView("crumbs", list) { + private static final long serialVersionUID = 1L; + + @Override + protected void populateItem(final ListItem item) { + final NodeItem nodeItem = (NodeItem) item.getModelObject(); + AjaxLink link = new AjaxLink("link") { + private static final long serialVersionUID = 1L; + + @Override + public void onClick(AjaxRequestTarget target) { + BreadcrumbPlugin.this.setModel(nodeItem.model); + } + + }; + link.add(new Label("name", new Model(nodeItem.name))); + link.setEnabled(nodeItem.enabled); + item.add(link); + + IModel css = new Model() { + private static final long serialVersionUID = 1L; + + @Override + public String getObject() { + String css = nodeItem.enabled ? "enabled" : "disabled"; + + if (list.size() == 1) { + css += " firstlast"; + } else if (item.getIndex() == 0) { + css += " first"; + } else if (item.getIndex() == (list.size() - 1)) { + css += " last"; + } + return css; + } + }; + item.add(new AttributeAppender("class", css, " ")); + } + }; + return listview; + } + + private class NodeItem implements IClusterable { + private static final long serialVersionUID = 1L; + + boolean enabled; + JcrNodeModel model; + String name; + + public NodeItem(JcrNodeModel model, boolean enabled) { + try { + this.name = model.getNode().getName(); + } catch (RepositoryException e) { + String path = model.getItemModel().getPath(); + this.name = path.substring(path.lastIndexOf('/')); + + log.warn("Error retrieving name from node[" + path + "]"); + } + this.model = model; + this.enabled = enabled; + } + } + +} \ No newline at end of file Copied: hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/browse/BreadcrumbPlugin.properties (from rev 15715, hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/browse/BreadcrumbPlugin.properties) =================================================================== --- hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/browse/BreadcrumbPlugin.properties (rev 0) +++ hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/browse/BreadcrumbPlugin.properties 2009-01-02 12:12:48 UTC (rev 15716) @@ -0,0 +1 @@ +dialog-breadcrumb-up: Up \ No newline at end of file Copied: hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/browse/BrowserPlugin.html (from rev 15715, hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/browse/BrowserPlugin.html) =================================================================== --- hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/browse/BrowserPlugin.html (rev 0) +++ hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/browse/BrowserPlugin.html 2009-01-02 12:12:48 UTC (rev 15716) @@ -0,0 +1,23 @@ + + +
+
[ Doclisting ]
+
[ Breadcrumb ]
+
[ Doclisting ]
+
+ + Copied: hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/browse/BrowserPlugin.java (from rev 15715, hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/browse/BrowserPlugin.java) =================================================================== --- hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/browse/BrowserPlugin.java (rev 0) +++ hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/browse/BrowserPlugin.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -0,0 +1,68 @@ +/* + * Copyright 2008 Hippo. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.hippoecm.frontend.plugins.standards.browse; + +import org.apache.wicket.model.IModel; +import org.hippoecm.frontend.model.IModelListener; +import org.hippoecm.frontend.model.JcrNodeModel; +import org.hippoecm.frontend.plugin.IPluginContext; +import org.hippoecm.frontend.plugin.config.IPluginConfig; +import org.hippoecm.frontend.service.render.RenderPlugin; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class BrowserPlugin extends RenderPlugin { + private static final long serialVersionUID = 1L; + + @SuppressWarnings("unused") + private final static String SVN_ID = "$Id$"; + + static final Logger log = LoggerFactory.getLogger(BrowserPlugin.class); + + protected final BrowseView browseView; + + public BrowserPlugin(IPluginContext context, final IPluginConfig config) { + super(context, config); + + browseView = new BrowseView(context, config, (JcrNodeModel) getModel()) { + private static final long serialVersionUID = 1L; + + @Override + protected String getExtensionPoint() { + return config.getString("dialog.list"); + } + }; + } + + abstract public class BrowseView extends AbstractBrowseView { + private static final long serialVersionUID = 1L; + + protected BrowseView(IPluginContext context, IPluginConfig config, JcrNodeModel document) { + super(context, config, document); + + context.registerService(new IModelListener() { + private static final long serialVersionUID = 1L; + + public void updateModel(IModel model) { + BrowserPlugin.this.setModel(model); + } + + }, config.getString("model.document")); + } + } + +} Modified: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/AbstractXinhaPlugin.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/AbstractXinhaPlugin.java 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/AbstractXinhaPlugin.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -30,9 +30,6 @@ import javax.jcr.NodeIterator; import javax.jcr.RepositoryException; -import nl.hippo.htmlcleaner.HtmlCleaner; -import nl.hippo.htmlcleaner.HtmlCleanerTemplate; - import org.apache.wicket.Component; import org.apache.wicket.IClusterable; import org.apache.wicket.Page; @@ -60,7 +57,6 @@ import org.hippoecm.frontend.plugins.xinha.dialog.links.ExternalLinkBehavior; import org.hippoecm.frontend.plugins.xinha.dialog.links.InternalLinkBehavior; import org.hippoecm.frontend.plugins.xinha.dragdrop.XinhaDropBehavior; -import org.hippoecm.frontend.plugins.xinha.htmlcleaner.JCRHtmlCleanerTemplateBuilder; import org.hippoecm.frontend.plugins.xinha.services.images.XinhaImageService; import org.hippoecm.frontend.plugins.xinha.services.links.XinhaLinkService; import org.hippoecm.frontend.service.PluginRequestTarget; @@ -93,7 +89,6 @@ private final String mode; private TextArea editor; private Configuration configuration; - private HtmlCleanerTemplate htmlCleanerTemplate; private AbstractDefaultAjaxBehavior postBehavior; private InternalLinkBehavior linkPickerBehavior; @@ -111,14 +106,6 @@ if ("edit".equals(mode)) { fragment.add(createEditor(config)); - IPluginConfig htmlCleanerConfig = config.getPluginConfig("cleaner.config"); - if (htmlCleanerConfig != null) { - try { - htmlCleanerTemplate = new JCRHtmlCleanerTemplateBuilder().buildTemplate(htmlCleanerConfig); - } catch (Exception ex) { - log.error("Exception whole creating HTMLCleaner template:", ex); - } - } configuration = new Configuration(config); context.registerService(configuration, Configuration.class.getName()); @@ -139,7 +126,8 @@ } }; - fragment.add(imagePickerBehavior = new ImagePickerBehavior(context, config, imageService)); + fragment.add(imagePickerBehavior = new ImagePickerBehavior(context, config + .getPluginConfig("Xinha.plugins.InsertImage"), imageService)); linkService = new XinhaLinkService(nodeModel) { private static final long serialVersionUID = 1L; @@ -150,7 +138,8 @@ } }; - fragment.add(linkPickerBehavior = new InternalLinkBehavior(context, config, linkService)); + fragment.add(linkPickerBehavior = new InternalLinkBehavior(context, config + .getPluginConfig("Xinha.plugins.CreateLink"), linkService)); fragment.add(externalLinkBehavior = new ExternalLinkBehavior(context, config)); @@ -290,8 +279,10 @@ } protected String clean(final String value) throws Exception { - if (htmlCleanerTemplate != null) { - return new HtmlCleaner(htmlCleanerTemplate).cleanToString(value); + IHtmlCleanerService cleaner = getPluginContext().getService(IHtmlCleanerService.class.getName(), + IHtmlCleanerService.class); + if (cleaner != null) { + return cleaner.clean(value); } else { return value; } @@ -325,18 +316,12 @@ @Override protected void onComponentTag(final ComponentTag tag) { StringBuilder sb = new StringBuilder(); - String width = config.getString("width"); - if (width == null) { - width = "500px"; - } + String width = config.getString("width", "500px"); sb.append("width: "); sb.append(width); sb.append(";"); - String height = config.getString("height"); - if (height == null) { - height = "200px"; - } + String height = config.getString("height", "200px"); sb.append("height: "); sb.append(height); sb.append(";"); @@ -430,8 +415,6 @@ class Configuration extends BaseConfiguration { private static final long serialVersionUID = 1L; - // private static final String XINHA_PREFIX = "Xinha."; - // private static final String XINHA_CONFIG_PREFIX = "Xinha.config."; private static final String XINHA_PLUGINS = "Xinha.plugins"; private static final String XINHA_TOOLBAR = "Xinha.config.toolbar"; private static final String XINHA_CSS = "Xinha.config.css"; @@ -475,28 +458,6 @@ } } - /* - * FIXME: there is no way to obtain the keys from the IPluginConfig - * - for (String paramKey : config.keySet()) { - if (paramKey.startsWith(XINHA_PREFIX)) { - List paramValues = parameters.get(paramKey).getStrings(); - for (String propertyValue : paramValues) { - int equalsIndex = propertyValue.indexOf("="); - if (equalsIndex > -1) { - addProperty(propertyValue.substring(0, equalsIndex), propertyValue - .substring(equalsIndex + 1)); - } else { - String propertyKey = paramKey.substring(XINHA_CONFIG_PREFIX.length()); - if (getProperties().containsKey(propertyKey)) { - addProperty(propertyKey, getProperty(propertyKey) + "," + propertyValue); - } else { - addProperty(propertyKey, propertyValue); - } - } - } - } - } */ } public List getToolbarItems() { @@ -511,12 +472,6 @@ return skin; } - public void setPluginConfigurations(Set plugins) { - for (PluginConfiguration conf : plugins) { - addPluginConfiguration(conf); - } - } - public void addPluginConfiguration(PluginConfiguration config) { if (!pluginConfigurations.containsKey(config.getName())) { pluginConfigurations.put(config.getName(), config); Added: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/IHtmlCleanerService.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/IHtmlCleanerService.java (rev 0) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/IHtmlCleanerService.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -0,0 +1,23 @@ +/* + * Copyright 2008 Hippo. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.hippoecm.frontend.plugins.xinha; + +import org.apache.wicket.IClusterable; + +public interface IHtmlCleanerService extends IClusterable { + + String clean(String value) throws Exception; +} \ No newline at end of file Added: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/AbstractBrowserDialog.html =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/AbstractBrowserDialog.html (rev 0) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/AbstractBrowserDialog.html 2009-01-02 12:12:48 UTC (rev 15716) @@ -0,0 +1,37 @@ + + + + + + +
+
+
+ +
+ + + +
+ +
+ + Copied: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/AbstractBrowserDialog.java (from rev 15715, hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/browse/AbstractBrowserDialog.java) =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/AbstractBrowserDialog.java (rev 0) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/AbstractBrowserDialog.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -0,0 +1,188 @@ +/* + * Copyright 2008 Hippo. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.hippoecm.frontend.plugins.xinha.dialog; + +import org.apache.wicket.Component; +import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.ajax.markup.html.form.AjaxButton; +import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.markup.html.form.Button; +import org.apache.wicket.markup.html.form.Form; +import org.apache.wicket.model.IModel; +import org.apache.wicket.model.StringResourceModel; +import org.apache.wicket.util.value.IValueMap; +import org.apache.wicket.util.value.ValueMap; +import org.hippoecm.frontend.dialog.AbstractDialog; +import org.hippoecm.frontend.model.JcrNodeModel; +import org.hippoecm.frontend.model.ModelService; +import org.hippoecm.frontend.plugin.IPluginContext; +import org.hippoecm.frontend.plugin.IPluginControl; +import org.hippoecm.frontend.plugin.config.IClusterConfig; +import org.hippoecm.frontend.plugin.config.IPluginConfig; +import org.hippoecm.frontend.plugin.config.IPluginConfigService; +import org.hippoecm.frontend.plugins.xinha.XinhaPlugin; +import org.hippoecm.frontend.plugins.xinha.dialog.DocumentLink; +import org.hippoecm.frontend.plugins.xinha.dialog.IPersistedMap; +import org.hippoecm.frontend.service.IRenderService; +import org.hippoecm.frontend.service.PluginRequestTarget; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public abstract class AbstractBrowserDialog extends AbstractDialog { + private static final long serialVersionUID = 1L; + + @SuppressWarnings("unused") + private final static String SVN_ID = "$Id$"; + + static final Logger log = LoggerFactory.getLogger(AbstractBrowserDialog.class); + + protected final IPluginContext context; + protected final IPluginConfig config; + private ModelService modelService; + private IPluginControl control; + protected IRenderService dialogRenderer; + + public AbstractBrowserDialog(IPluginContext context, IPluginConfig config, IModel model) { + super(model); + + this.context = context; + this.config = config; + + final Button remove = new AjaxButton("button") { + private static final long serialVersionUID = 1L; + + @Override + protected void onSubmit(AjaxRequestTarget target, Form form) { + onRemove(); + if (!hasError()) { + closeDialog(); + } + } + + @Override + public boolean isVisible() { + return hasRemoveButton(); + } + }; + remove.add(new Label("label", "Remove")); + addButton(remove); + + add(createContentPanel("content")); + } + + protected Component createContentPanel(String contentId) { + //Get PluginConfigService + IPluginConfigService pluginConfigService = context.getService(IPluginConfigService.class.getName(), + IPluginConfigService.class); + + //Lookup clusterConfig from IPluginContext + IClusterConfig clusterConfig = pluginConfigService.getCluster(config.getString("cluster.name")); + + //save modelServiceId and dialogServiceId in cluster config + String modelServiceId = clusterConfig.getString("model.id"); + IModel model = ((DocumentLink) getModelObject()).getNodeModel(); + modelService = new ModelService(modelServiceId, model) { + private static final long serialVersionUID = 1L; + + @Override + public void setModel(IModel model) { + JcrNodeModel newModel = findNewModel(model); + if (newModel != null) { + DocumentLink link = (DocumentLink) getModelObject(); + JcrNodeModel currentModel = link.getNodeModel(); + if (!newModel.equals(currentModel)) { + link.setNodeModel(newModel); + } + } + + super.setModel(newModel); + } + }; + modelService.init(context); + + control = context.start(clusterConfig); + + dialogRenderer = context.getService(clusterConfig.getString("wicket.id"), IRenderService.class); + dialogRenderer.bind((IRenderService) getComponent().findParent(XinhaPlugin.class), contentId); + return dialogRenderer.getComponent(); + } + + public final void onClose() { + dialogRenderer.unbind(); + dialogRenderer = null; + control.stopPlugin(); + modelService.destroy(); + + AjaxRequestTarget target = AjaxRequestTarget.get(); + if (target != null) { + String script; + if (cancelled) { + script = getCancelScript(); + } else { + script = getCloseScript(); + } + target.getHeaderResponse().renderOnDomReadyJavascript(script); + } + onCloseDialog(); + } + + public void render(PluginRequestTarget target) { + if (dialogRenderer != null) { + dialogRenderer.render(target); + } + } + + public IModel getTitle() { + return new StringResourceModel("dialog-title", this, null); + } + + @Override + public IValueMap getProperties() { + return new ValueMap("width=850,height=455"); + } + + protected abstract JcrNodeModel findNewModel(IModel model); + + protected void checkState() { + IPersistedMap link = (IPersistedMap) getModelObject(); + enableOk(link.isValid() && link.hasChanged()); + } + + protected boolean hasRemoveButton() { + return ((IPersistedMap) getModelObject()).isExisting(); + } + + protected void onRemove() { + } + + protected String getCancelScript() { + return "if(openModalDialog != null){ openModalDialog.cancel(); }"; + } + + protected String getCloseScript() { + String returnValue = ((IPersistedMap) getModelObject()).toJsString(); + return "if(openModalDialog != null){ openModalDialog.close(" + returnValue + "); }"; + } + + protected void onCloseDialog() { + } + + protected void enableOk(boolean state) { + ok.setEnabled(state); + } + +} Modified: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/XinhaDialogBehavior.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/XinhaDialogBehavior.java 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/XinhaDialogBehavior.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -8,20 +8,17 @@ import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior; import org.hippoecm.frontend.dialog.IDialogService; import org.hippoecm.frontend.plugin.IPluginContext; -import org.hippoecm.frontend.plugin.config.IPluginConfig; import org.hippoecm.frontend.plugins.xinha.AbstractXinhaPlugin; public abstract class XinhaDialogBehavior extends AbstractDefaultAjaxBehavior { private static final long serialVersionUID = 1L; - + protected final IPluginContext context; - protected final IPluginConfig config; - public XinhaDialogBehavior(IPluginContext context, IPluginConfig config) { + public XinhaDialogBehavior(IPluginContext context) { this.context = context; - this.config = config; } - + protected IDialogService getDialogService() { return context.getService(IDialogService.class.getName(), IDialogService.class); } Deleted: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/browse/AbstractBrowserDialog.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/browse/AbstractBrowserDialog.java 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/browse/AbstractBrowserDialog.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -1,191 +0,0 @@ -/* - * Copyright 2008 Hippo. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.hippoecm.frontend.plugins.xinha.dialog.browse; - -import org.apache.wicket.Component; -import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.ajax.markup.html.form.AjaxButton; -import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.markup.html.form.Button; -import org.apache.wicket.markup.html.form.Form; -import org.apache.wicket.model.IModel; -import org.apache.wicket.model.StringResourceModel; -import org.apache.wicket.util.value.IValueMap; -import org.apache.wicket.util.value.ValueMap; -import org.hippoecm.frontend.dialog.AbstractDialog; -import org.hippoecm.frontend.model.JcrNodeModel; -import org.hippoecm.frontend.model.ModelService; -import org.hippoecm.frontend.plugin.IPluginContext; -import org.hippoecm.frontend.plugin.IPluginControl; -import org.hippoecm.frontend.plugin.config.IClusterConfig; -import org.hippoecm.frontend.plugin.config.IPluginConfig; -import org.hippoecm.frontend.plugin.config.IPluginConfigService; -import org.hippoecm.frontend.plugins.xinha.XinhaPlugin; -import org.hippoecm.frontend.plugins.xinha.dialog.DocumentLink; -import org.hippoecm.frontend.plugins.xinha.dialog.IPersistedMap; -import org.hippoecm.frontend.service.IRenderService; -import org.hippoecm.frontend.service.PluginRequestTarget; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public abstract class AbstractBrowserDialog extends AbstractDialog { - private static final long serialVersionUID = 1L; - - @SuppressWarnings("unused") - private final static String SVN_ID = "$Id$"; - - static final Logger log = LoggerFactory.getLogger(AbstractBrowserDialog.class); - - private static final String CONTENT_PANEL_SERVICE_ID = "service.modal.content"; - - protected final IPluginContext context; - protected final IPluginConfig config; - private ModelService modelService; - private IPluginControl control; - protected IRenderService dialogRenderer; - - public AbstractBrowserDialog(IPluginContext context, IPluginConfig config, IModel model) { - this.context = context; - this.config = config; - setModel(model); - - final Button remove = new AjaxButton("button") { - private static final long serialVersionUID = 1L; - - @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { - onRemove(); - if (!hasError()) { - closeDialog(); - } - } - - @Override - public boolean isVisible() { - return hasRemoveButton(); - } - }; - remove.add(new Label("label", "Remove")); - addButton(remove); - - add(createContentPanel("content")); - } - - protected Component createContentPanel(String contentId) { - //Get PluginConfigService - IPluginConfigService pluginConfigService = context.getService(IPluginConfigService.class.getName(), - IPluginConfigService.class); - - //Lookup clusterConfig from IPluginContext - IClusterConfig config = pluginConfigService.getCluster("cms-pickers/" + getName()); - - //save modelServiceId and dialogServiceId in cluster config - String modelServiceId = config.getString("model.id"); - IModel model = ((DocumentLink) getModelObject()).getNodeModel(); - modelService = new ModelService(modelServiceId, model) { - private static final long serialVersionUID = 1L; - - @Override - public void setModel(IModel model) { - JcrNodeModel newModel = findNewModel(model); - if (newModel != null) { - DocumentLink link = (DocumentLink) getModelObject(); - JcrNodeModel currentModel = link.getNodeModel(); - if (!newModel.equals(currentModel)) { - link.setNodeModel(newModel); - } - } - - super.setModel(newModel); - } - }; - modelService.init(context); - - control = context.start(config); - - dialogRenderer = context.getService(CONTENT_PANEL_SERVICE_ID, IRenderService.class); - dialogRenderer.bind((IRenderService) getComponent().findParent(XinhaPlugin.class), contentId); - return dialogRenderer.getComponent(); - } - - public final void onClose() { - dialogRenderer.unbind(); - dialogRenderer = null; - control.stopPlugin(); - modelService.destroy(); - - AjaxRequestTarget target = AjaxRequestTarget.get(); - if (target != null) { - String script; - if (cancelled) { - script = getCancelScript(); - } else { - script = getCloseScript(); - } - target.getHeaderResponse().renderOnDomReadyJavascript(script); - } - onCloseDialog(); - } - - public void render(PluginRequestTarget target) { - if (dialogRenderer != null) { - dialogRenderer.render(target); - } - } - - public IModel getTitle() { - return new StringResourceModel(getName() + "-dialog-title", this, null); - } - - @Override - public IValueMap getProperties() { - return new ValueMap("width=850,height=455"); - } - - protected abstract String getName(); - - protected abstract JcrNodeModel findNewModel(IModel model); - - protected void checkState() { - IPersistedMap link = (IPersistedMap) getModelObject(); - enableOk(link.isValid() && link.hasChanged()); - } - - protected boolean hasRemoveButton() { - return ((IPersistedMap) getModelObject()).isExisting(); - } - - protected void onRemove() { - } - - protected String getCancelScript() { - return "if(openModalDialog != null){ openModalDialog.cancel(); }"; - } - - protected String getCloseScript() { - String returnValue = ((IPersistedMap) getModelObject()).toJsString(); - return "if(openModalDialog != null){ openModalDialog.close(" + returnValue + "); }"; - } - - protected void onCloseDialog() { - } - - protected void enableOk(boolean state) { - AjaxRequestTarget.get().addComponent(ok.setEnabled(state)); - } - -} Deleted: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/browse/BreadcrumbPlugin.html =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/browse/BreadcrumbPlugin.html 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/browse/BreadcrumbPlugin.html 2009-01-02 12:12:48 UTC (rev 15716) @@ -1,26 +0,0 @@ - - -
- -
- - - Deleted: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/browse/BreadcrumbPlugin.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/browse/BreadcrumbPlugin.java 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/browse/BreadcrumbPlugin.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -1,185 +0,0 @@ -/* - * Copyright 2008 Hippo. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.hippoecm.frontend.plugins.xinha.dialog.browse; - -import java.util.Collections; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; - -import javax.jcr.RepositoryException; - -import org.apache.wicket.IClusterable; -import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.ajax.markup.html.AjaxLink; -import org.apache.wicket.ajax.markup.html.form.AjaxButton; -import org.apache.wicket.behavior.AttributeAppender; -import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.markup.html.form.Form; -import org.apache.wicket.markup.html.list.ListItem; -import org.apache.wicket.markup.html.list.ListView; -import org.apache.wicket.model.IModel; -import org.apache.wicket.model.Model; -import org.apache.wicket.model.StringResourceModel; -import org.hippoecm.frontend.model.IModelListener; -import org.hippoecm.frontend.model.JcrNodeModel; -import org.hippoecm.frontend.plugin.IPluginContext; -import org.hippoecm.frontend.plugin.config.IPluginConfig; -import org.hippoecm.frontend.service.render.RenderPlugin; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class BreadcrumbPlugin extends RenderPlugin { - private static final long serialVersionUID = 1L; - - @SuppressWarnings("unused") - private final static String SVN_ID = "$Id$"; - - static final Logger log = LoggerFactory.getLogger(BreadcrumbPlugin.class); - - private final Set roots; - private final AjaxButton up; - - public BreadcrumbPlugin(IPluginContext context, IPluginConfig config) { - super(context, config); - - roots = new HashSet(); - String[] paths = config.getStringArray("root.paths"); - if (paths != null) { - for (String path : paths) { - roots.add(path); - } - } else { - roots.add("/"); - } - JcrNodeModel nodeModel = (JcrNodeModel) getModel(); - add(getListView(nodeModel)); - - if (config.getString("model.folder") != null) { - context.registerService(new IModelListener() { - private static final long serialVersionUID = 1L; - - public void updateModel(IModel model) { - update((JcrNodeModel) model); - } - - }, config.getString("model.folder")); - } - up = new AjaxButton("up") { - private static final long serialVersionUID = 1L; - - @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { - JcrNodeModel model = (JcrNodeModel) BreadcrumbPlugin.this.getModel(); - model = model.getParentModel(); - if (model != null) { - BreadcrumbPlugin.this.setModel(model); - } - } - }; - up.setModel(new StringResourceModel("dialog-breadcrumb-up", this, null)); - if (roots.contains(nodeModel.getItemModel().getPath())) { - up.setEnabled(false); - } - add(up); - } - - protected void update(JcrNodeModel model) { - replace(getListView(model)); - - JcrNodeModel parentModel = model.getParentModel(); - if (parentModel == null || roots.contains(model.getItemModel().getPath())) { - up.setEnabled(false); - } else { - up.setEnabled(true); - } - AjaxRequestTarget.get().addComponent(this); - } - - private ListView getListView(JcrNodeModel model) { - final List list = new LinkedList(); - //add current folder as disabled - list.add(new NodeItem(model, false)); - if (!roots.contains(model.getItemModel().getPath())) { - model = model.getParentModel(); - while (model != null) { - list.add(new NodeItem(model, true)); - if (roots.contains(model.getItemModel().getPath())) { - model = null; - } else { - model = model.getParentModel(); - } - } - } - Collections.reverse(list); - ListView listview = new ListView("crumbs", list) { - private static final long serialVersionUID = 1L; - - @Override - protected void populateItem(ListItem item) { - final NodeItem nodeItem = (NodeItem) item.getModelObject(); - AjaxLink link = new AjaxLink("link") { - private static final long serialVersionUID = 1L; - - @Override - public void onClick(AjaxRequestTarget target) { - BreadcrumbPlugin.this.setModel(nodeItem.model); - } - - }; - link.add(new Label("name", new Model(nodeItem.name))); - link.setEnabled(nodeItem.enabled); - item.add(link); - - String css = nodeItem.enabled ? "enabled" : "disabled"; - - if (list.size() == 1) { - css += " firstlast"; - } else if (item.getIndex() == 0) { - css += " first"; - } else if (item.getIndex() == (list.size() - 1)) { - css += " last"; - } - item.add(new AttributeAppender("class", new Model(css), " ")); - } - }; - return listview; - } - - private class NodeItem implements IClusterable { - private static final long serialVersionUID = 1L; - - boolean enabled; - JcrNodeModel model; - String name; - - public NodeItem(JcrNodeModel model, boolean enabled) { - try { - this.name = model.getNode().getName(); - } catch (RepositoryException e) { - String path = model.getItemModel().getPath(); - this.name = path.substring(path.lastIndexOf('/')); - - log.warn("Error retrieving name from node[" + path + "]"); - } - this.model = model; - this.enabled = enabled; - } - } - -} \ No newline at end of file Deleted: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/browse/BreadcrumbPlugin.properties =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/browse/BreadcrumbPlugin.properties 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/browse/BreadcrumbPlugin.properties 2009-01-02 12:12:48 UTC (rev 15716) @@ -1 +0,0 @@ -dialog-breadcrumb-up: Up \ No newline at end of file Deleted: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/browse/BrowserPlugin.html =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/browse/BrowserPlugin.html 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/browse/BrowserPlugin.html 2009-01-02 12:12:48 UTC (rev 15716) @@ -1,23 +0,0 @@ - - -
-
[ Doclisting ]
-
[ Breadcrumb ]
-
[ Doclisting ]
-
- - Deleted: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/browse/BrowserPlugin.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/browse/BrowserPlugin.java 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/browse/BrowserPlugin.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -1,69 +0,0 @@ -/* - * Copyright 2008 Hippo. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.hippoecm.frontend.plugins.xinha.dialog.browse; - -import org.apache.wicket.model.IModel; -import org.hippoecm.frontend.model.IModelListener; -import org.hippoecm.frontend.model.JcrNodeModel; -import org.hippoecm.frontend.plugin.IPluginContext; -import org.hippoecm.frontend.plugin.config.IPluginConfig; -import org.hippoecm.frontend.plugins.standards.browse.AbstractBrowseView; -import org.hippoecm.frontend.service.render.RenderPlugin; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class BrowserPlugin extends RenderPlugin { - private static final long serialVersionUID = 1L; - - @SuppressWarnings("unused") - private final static String SVN_ID = "$Id$"; - - static final Logger log = LoggerFactory.getLogger(BrowserPlugin.class); - - protected final BrowseView browseView; - - public BrowserPlugin(IPluginContext context, final IPluginConfig config) { - super(context, config); - - browseView = new BrowseView(context, config, (JcrNodeModel) getModel()) { - private static final long serialVersionUID = 1L; - - @Override - protected String getExtensionPoint() { - return config.getString("dialog.list"); - } - }; - } - - abstract public class BrowseView extends AbstractBrowseView { - private static final long serialVersionUID = 1L; - - protected BrowseView(IPluginContext context, IPluginConfig config, JcrNodeModel document) { - super(context, config, document); - - context.registerService(new IModelListener() { - private static final long serialVersionUID = 1L; - - public void updateModel(IModel model) { - BrowserPlugin.this.setModel(model); - } - - }, config.getString("model.document")); - } - } - -} Modified: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/images/ImageBrowserDialog.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/images/ImageBrowserDialog.java 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/images/ImageBrowserDialog.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -24,8 +24,7 @@ import org.hippoecm.frontend.model.JcrNodeModel; import org.hippoecm.frontend.plugin.IPluginContext; import org.hippoecm.frontend.plugin.config.IPluginConfig; -import org.hippoecm.frontend.plugins.xinha.dialog.IPersistedMap; -import org.hippoecm.frontend.plugins.xinha.dialog.browse.AbstractBrowserDialog; +import org.hippoecm.frontend.plugins.xinha.dialog.AbstractBrowserDialog; import org.hippoecm.frontend.plugins.xinha.services.images.XinhaImage; import org.hippoecm.frontend.widgets.TextFieldWidget; import org.hippoecm.repository.api.HippoNode; @@ -48,12 +47,13 @@ @Override protected void onUpdate(AjaxRequestTarget target) { - IPersistedMap link = (IPersistedMap) model.getObject(); - enableOk(link.isValid() && link.hasChanged()); + checkState(); } }); + + checkState(); } - + protected JcrNodeModel findNewModel(IModel model) { JcrNodeModel nodeModel = (JcrNodeModel) model; HippoNode node = nodeModel.getNode(); @@ -74,7 +74,11 @@ @Override protected void onOk() { XinhaImage xi = (XinhaImage) getModelObject(); - xi.save(); + if (xi.isValid()) { + xi.save(); + } else { + error("Please select an image"); + } } @Override @@ -83,9 +87,4 @@ img.delete(); } - @Override - protected String getName() { - return "imagepicker"; - } - } Modified: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/images/ImageBrowserDialog.properties =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/images/ImageBrowserDialog.properties 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/images/ImageBrowserDialog.properties 2009-01-02 12:12:48 UTC (rev 15716) @@ -1 +1 @@ -imagepicker-dialog-title: Imagepicker +dialog-title: Imagepicker Modified: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/images/ImagePickerBehavior.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/images/ImagePickerBehavior.java 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/images/ImagePickerBehavior.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -27,17 +27,20 @@ private final static String SVN_ID = "$Id$"; private static final long serialVersionUID = 1L; - + + private final IPluginConfig config; private XinhaImageService imageService; public ImagePickerBehavior(IPluginContext context, IPluginConfig config, XinhaImageService service) { - super(context, config); + super(context); + this.config = config; imageService = service; } @Override protected void respond(AjaxRequestTarget target) { - getDialogService().show(new ImageBrowserDialog(context, config, new Model(imageService.createXinhaImage(getParameters())))); + getDialogService().show( + new ImageBrowserDialog(context, config, new Model(imageService.createXinhaImage(getParameters())))); } } Modified: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/links/DocumentBrowserDialog.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/links/DocumentBrowserDialog.java 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/links/DocumentBrowserDialog.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -26,7 +26,7 @@ import org.hippoecm.frontend.model.JcrNodeModel; import org.hippoecm.frontend.plugin.IPluginContext; import org.hippoecm.frontend.plugin.config.IPluginConfig; -import org.hippoecm.frontend.plugins.xinha.dialog.browse.AbstractBrowserDialog; +import org.hippoecm.frontend.plugins.xinha.dialog.AbstractBrowserDialog; import org.hippoecm.frontend.plugins.xinha.services.links.InternalXinhaLink; import org.hippoecm.frontend.plugins.xinha.services.links.XinhaLink; import org.hippoecm.frontend.widgets.BooleanFieldWidget; @@ -65,6 +65,8 @@ checkState(); } }); + + checkState(); } @Override @@ -90,7 +92,11 @@ protected void onOk() { InternalXinhaLink link = (InternalXinhaLink) getModelObject(); - link.save(); + if (link.isValid()) { + link.save(); + } else { + error("Please select a document"); + } } protected void onRemove() { @@ -98,9 +104,4 @@ link.delete(); } - @Override - protected String getName() { - return "internallinks"; - } - } Modified: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/links/DocumentBrowserDialog.properties =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/links/DocumentBrowserDialog.properties 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/links/DocumentBrowserDialog.properties 2009-01-02 12:12:48 UTC (rev 15716) @@ -1 +1 @@ -internallinks-dialog-title: Documentpicker +dialog-title: Documentpicker Modified: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/links/ExternalLinkBehavior.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/links/ExternalLinkBehavior.java 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/links/ExternalLinkBehavior.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -29,20 +29,14 @@ @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; + private final IPluginConfig config; + public ExternalLinkBehavior(IPluginContext context, IPluginConfig config) { - super(context, config); + super(context); + this.config = config; } - /* @Override - protected void configureModal(final ModalWindow modal) { - super.configureModal(modal); - modal.setInitialHeight(200); - modal.setInitialWidth(400); - } - */ - - @Override protected void respond(AjaxRequestTarget target) { getDialogService().show( new ExternalLinkDialog(context, config, new Model(new ExternalXinhaLink(getParameters())))); Modified: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/links/ExternalLinkDialog.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/links/ExternalLinkDialog.java 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/links/ExternalLinkDialog.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -24,6 +24,8 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.model.StringResourceModel; +import org.apache.wicket.util.value.IValueMap; +import org.apache.wicket.util.value.ValueMap; import org.hippoecm.frontend.dialog.AbstractDialog; import org.hippoecm.frontend.plugin.IPluginContext; import org.hippoecm.frontend.plugin.config.IPluginConfig; @@ -40,6 +42,8 @@ private final static String SVN_ID = "$Id$"; public ExternalLinkDialog(IPluginContext context, IPluginConfig config, IModel model) { + super(model); + add(new TextFieldWidget("href", new PropertyModel(getLink(), XinhaLink.HREF)) { private static final long serialVersionUID = 1L; @@ -67,7 +71,7 @@ } }); - final Button remove = new AjaxButton("button") { + final Button remove = new AjaxButton("button") { private static final long serialVersionUID = 1L; @Override @@ -88,10 +92,19 @@ protected boolean hasRemoveButton() { return getLink().isExisting(); } - + protected void onRemove() { } + public IModel getTitle() { + return new StringResourceModel("dialog-title", this, null); + } + + @Override + public IValueMap getProperties() { + return new ValueMap("width=400,height=200"); + } + private void update(AjaxRequestTarget target) { IPersistedMap link = (IPersistedMap) getModelObject(); ok.setEnabled(link.isValid() && link.hasChanged()); @@ -104,8 +117,4 @@ return (ExternalXinhaLink) getModel(); } - public IModel getTitle() { - return new StringResourceModel("externallinks-dialog-title", this, null); - } - } Modified: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/links/ExternalLinkDialog.properties =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/links/ExternalLinkDialog.properties 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/links/ExternalLinkDialog.properties 2009-01-02 12:12:48 UTC (rev 15716) @@ -1 +1 @@ -externallinks-dialog-title: Externallink \ No newline at end of file +dialog-title: Externallink \ No newline at end of file Modified: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/links/InternalLinkBehavior.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/links/InternalLinkBehavior.java 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/links/InternalLinkBehavior.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -29,10 +29,12 @@ private static final long serialVersionUID = 1L; + private IPluginConfig config; private XinhaLinkService linkService; public InternalLinkBehavior(IPluginContext context, IPluginConfig config, XinhaLinkService service) { - super(context, config); + super(context); + this.config = config; this.linkService = service; } Added: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/htmlcleaner/HtmlCleanerPlugin.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/htmlcleaner/HtmlCleanerPlugin.java (rev 0) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/htmlcleaner/HtmlCleanerPlugin.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -0,0 +1,58 @@ +/* + * Copyright 2008 Hippo. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.hippoecm.frontend.plugins.xinha.htmlcleaner; + +import nl.hippo.htmlcleaner.HtmlCleaner; +import nl.hippo.htmlcleaner.HtmlCleanerTemplate; + +import org.hippoecm.frontend.plugin.IPlugin; +import org.hippoecm.frontend.plugin.IPluginContext; +import org.hippoecm.frontend.plugin.config.IPluginConfig; +import org.hippoecm.frontend.plugins.xinha.IHtmlCleanerService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class HtmlCleanerPlugin implements IPlugin, IHtmlCleanerService { + @SuppressWarnings("unused") + private final static String SVN_ID = "$Id$"; + + private static final long serialVersionUID = 1L; + + static final Logger log = LoggerFactory.getLogger(HtmlCleanerPlugin.class); + + private HtmlCleanerTemplate htmlCleanerTemplate; + + public HtmlCleanerPlugin(IPluginContext context, final IPluginConfig config) { + IPluginConfig htmlCleanerConfig = config.getPluginConfig("cleaner.config"); + if (htmlCleanerConfig != null) { + try { + htmlCleanerTemplate = new JCRHtmlCleanerTemplateBuilder().buildTemplate(htmlCleanerConfig); + context.registerService(this, IHtmlCleanerService.class.getName()); + } catch (Exception ex) { + log.error("Exception whole creating HTMLCleaner template:", ex); + } + } + } + + public String clean(final String value) throws Exception { + if (htmlCleanerTemplate != null) { + return new HtmlCleaner(htmlCleanerTemplate).cleanToString(value); + } else { + return value; + } + } + +} Modified: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/htmlcleaner/JCRHtmlCleanerTemplateBuilder.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/htmlcleaner/JCRHtmlCleanerTemplateBuilder.java 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/htmlcleaner/JCRHtmlCleanerTemplateBuilder.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -15,6 +15,7 @@ */ package org.hippoecm.frontend.plugins.xinha.htmlcleaner; +import java.util.List; import java.util.Map; import nl.hippo.htmlcleaner.HtmlCleanerTemplate; @@ -135,7 +136,7 @@ } } - protected void handleAllowedElements(HtmlCleanerTemplate template, Map[] elements) throws Exception { + protected void handleAllowedElements(HtmlCleanerTemplate template, List elements) throws Exception { if (elements != null){ for (Map elMap : elements) { String name = getRequiredStringValue("allowed element ("+CLEANUP_ELEMENT+")",elMap, NAME); @@ -165,14 +166,14 @@ // Process alternate source attribute voor IMG elements handleImgAlternateSrcAttr(template, (String) c.get(IMG_ALTERNATE_SRC_ATTR)); // Process allowed HTML elements - handleAllowedElements(template,(Map[]) c.get(CLEANUP_ELEMENT)); + handleAllowedElements(template, (List) c.get(CLEANUP_ELEMENT)); } protected void handleLineWidth(HtmlCleanerTemplate template, int lineWidth){ template.setMaxLineWidth(lineWidth); } - protected void handleSerializationElements(HtmlCleanerTemplate template, Map[] elements) throws Exception { + protected void handleSerializationElements(HtmlCleanerTemplate template, List elements) throws Exception { if (elements != null){ for (Map m : elements) { String name = getRequiredStringValue("allowed element ("+CLEANUP_ELEMENT+")",m, NAME); @@ -204,7 +205,7 @@ handleLineWidth(template,c.getInt(LINEWIDTH)); // Process serialization elements - handleSerializationElements(template,(Map[])c.get(SERIALIZATION_ELEMENT)); + handleSerializationElements(template, (List) c.get(SERIALIZATION_ELEMENT)); } } Modified: hippo-ecm/trunk/addon/xinha-frontend/src/main/resources/hippoecm-extension.xml =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/resources/hippoecm-extension.xml 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/resources/hippoecm-extension.xml 2009-01-02 12:12:48 UTC (rev 15716) @@ -71,4 +71,21 @@ /hippo:namespaces/system + + + + + hippo:initializeitem + + + 1903 + + + html-cleaner-service.xml + + + /hippo:configuration/hippo:frontend/cms/cms-static + + + Modified: hippo-ecm/trunk/addon/xinha-frontend/src/main/resources/hippostd-html-template.xml =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/resources/hippostd-html-template.xml 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/resources/hippostd-html-template.xml 2009-01-02 12:12:48 UTC (rev 15716) @@ -14,12 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + hippo:templatetype @@ -186,679 +181,30 @@ timeoutLength=1500 - + frontend:pluginconfig - - drop-on-xinha + + cms-pickers/images - + - hippohtmlcleaner:config + frontend:pluginconfig - - - hippohtmlcleaner:cleanup - - - - transitional - - - - nl - de - fr - en - es - - - - - - note - warn - fixme - - - - query - include - query-and-include - - - - - hippohtmlcleaner:cleanupElement - - - html - - - - - hippohtmlcleaner:cleanupElement - - - body - - - - - hippohtmlcleaner:cleanupElement - - - div - - - class - id - - - - - hippohtmlcleaner:cleanupElement - - - span - - - class - id - - - - - hippohtmlcleaner:cleanupElement - - - p - - - align - class - - - - - hippohtmlcleaner:cleanupElement - - - br - - - - - hippohtmlcleaner:cleanupElement - - - pre - - - class - - - - - hippohtmlcleaner:cleanupElement - - - blockquote - - - class - id - - - - - - - hippohtmlcleaner:cleanupElement - - - h1 - - - - - hippohtmlcleaner:cleanupElement - - - h2 - - - - - hippohtmlcleaner:cleanupElement - - - h3 - - - - - hippohtmlcleaner:cleanupElement - - - h4 - - - - - hippohtmlcleaner:cleanupElement - - - h5 - - - - - - - hippohtmlcleaner:cleanupElement - - - blockquote - - - href - target - title - name - - - - - - - hippohtmlcleaner:cleanupElement - - - strong - - - - - hippohtmlcleaner:cleanupElement - - - b - - - - - hippohtmlcleaner:cleanupElement - - - em - - - - - hippohtmlcleaner:cleanupElement - - - sup - - - - - hippohtmlcleaner:cleanupElement - - - sub - - - - - hippohtmlcleaner:cleanupElement - - - u - - - - - - - hippohtmlcleaner:cleanupElement - - - ul - - - - - hippohtmlcleaner:cleanupElement - - - ol - - - - - hippohtmlcleaner:cleanupElement - - - li - - - - - - - hippohtmlcleaner:cleanupElement - - - img - - - src - alt - border - align - hspace - vspace - width - height - title - - - - - - - hippohtmlcleaner:cleanupElement - - - table - - - class - border - cellspacing - cellpadding - width - align - style - - - - - hippohtmlcleaner:cleanupElement - - - tbody - - - - - hippohtmlcleaner:cleanupElement - - - tr - - - - - hippohtmlcleaner:cleanupElement - - - table - - - class - border - cellspacing - cellpadding - width - align - style - - - - - hippohtmlcleaner:cleanupElement - - - td - - - width - colspan - rowspan - valign - - - - - hippohtmlcleaner:cleanupElement - - - th - - - width - colspan - rowspan - valign - - - - - hippohtmlcleaner:cleanupElement - - - hr - - - - - - - hippohtmlcleaner:cleanupElement - - - object - - - align - class - data - height - id - width - title - type - - - - - hippohtmlcleaner:cleanupElement - - - param - - - id - name - value - - - - - - - hippohtmlcleaner:cleanupElement - - - iframe - - - src - align - class - frameborder - height - name - scrolling - width - - - - - - hippohtmlcleaner:serialization - - - 80 - - - - - hippohtmlcleaner:serializationElement - - - html - - - 1 - - - 1 - - - - - hippohtmlcleaner:serializationElement - - - body - - - 1 - - - 1 - - - - - hippohtmlcleaner:serializationElement - - - p - - - 1 - - - 1 - - - - - hippohtmlcleaner:serializationElement - - - pre - - - 1 - - - 1 - - - - - hippohtmlcleaner:serializationElement - - - div - - - 1 - - - 1 - - - - - hippohtmlcleaner:serializationElement - - - blockquote - - - 1 - - - 1 - - - - - hippohtmlcleaner:serializationElement - - - ul - - - 1 - - - 1 - - - 1 - - - - - hippohtmlcleaner:serializationElement - - - ol - - - 1 - - - 1 - - - 1 - - - - - hippohtmlcleaner:serializationElement - - - li - - - 1 - - - - - hippohtmlcleaner:serializationElement - - - table - - - 1 - - - 1 - - - 1 - - - - - hippohtmlcleaner:serializationElement - - - tbody - - - 1 - - - 1 - - - - - hippohtmlcleaner:serializationElement - - - tr - - - 1 - - - 1 - - - - - hippohtmlcleaner:serializationElement - - - td - - - 1 - - - - - hippohtmlcleaner:serializationElement - - - th - - - 1 - - - - - hippohtmlcleaner:serializationElement - - - br - - - 1 - - - - - hippohtmlcleaner:serializationElement - - - object - - - 1 - - - 1 - - - - - hippohtmlcleaner:serializationElement - - - iframe - - - 1 - - - 1 - - - + + cms-pickers/documents + + + + frontend:pluginconfig + + + drop-on-xinha + + Added: hippo-ecm/trunk/addon/xinha-frontend/src/main/resources/html-cleaner-service.xml =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/resources/html-cleaner-service.xml (rev 0) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/resources/html-cleaner-service.xml 2009-01-02 12:12:48 UTC (rev 15716) @@ -0,0 +1,689 @@ + + + + + frontend:plugin + + + org.hippoecm.frontend.plugins.xinha.htmlcleaner.HtmlCleanerPlugin + + + + hippohtmlcleaner:config + + + + hippohtmlcleaner:cleanup + + + + transitional + + + + nl + de + fr + en + es + + + + + + note + warn + fixme + + + + query + include + query-and-include + + + + + hippohtmlcleaner:cleanupElement + + + html + + + + + hippohtmlcleaner:cleanupElement + + + body + + + + + hippohtmlcleaner:cleanupElement + + + div + + + class + id + + + + + hippohtmlcleaner:cleanupElement + + + span + + + class + id + + + + + hippohtmlcleaner:cleanupElement + + + p + + + align + class + + + + + hippohtmlcleaner:cleanupElement + + + br + + + + + hippohtmlcleaner:cleanupElement + + + pre + + + class + + + + + hippohtmlcleaner:cleanupElement + + + blockquote + + + class + id + + + + + + + hippohtmlcleaner:cleanupElement + + + h1 + + + + + hippohtmlcleaner:cleanupElement + + + h2 + + + + + hippohtmlcleaner:cleanupElement + + + h3 + + + + + hippohtmlcleaner:cleanupElement + + + h4 + + + + + hippohtmlcleaner:cleanupElement + + + h5 + + + + + + + hippohtmlcleaner:cleanupElement + + + blockquote + + + href + target + title + name + + + + + + + hippohtmlcleaner:cleanupElement + + + strong + + + + + hippohtmlcleaner:cleanupElement + + + b + + + + + hippohtmlcleaner:cleanupElement + + + em + + + + + hippohtmlcleaner:cleanupElement + + + sup + + + + + hippohtmlcleaner:cleanupElement + + + sub + + + + + hippohtmlcleaner:cleanupElement + + + u + + + + + + + hippohtmlcleaner:cleanupElement + + + ul + + + + + hippohtmlcleaner:cleanupElement + + + ol + + + + + hippohtmlcleaner:cleanupElement + + + li + + + + + + + hippohtmlcleaner:cleanupElement + + + img + + + src + alt + border + align + hspace + vspace + width + height + title + + + + + + + hippohtmlcleaner:cleanupElement + + + table + + + class + border + cellspacing + cellpadding + width + align + style + + + + + hippohtmlcleaner:cleanupElement + + + tbody + + + + + hippohtmlcleaner:cleanupElement + + + tr + + + + + hippohtmlcleaner:cleanupElement + + + table + + + class + border + cellspacing + cellpadding + width + align + style + + + + + hippohtmlcleaner:cleanupElement + + + td + + + width + colspan + rowspan + valign + + + + + hippohtmlcleaner:cleanupElement + + + th + + + width + colspan + rowspan + valign + + + + + hippohtmlcleaner:cleanupElement + + + hr + + + + + + + hippohtmlcleaner:cleanupElement + + + object + + + align + class + data + height + id + width + title + type + + + + + hippohtmlcleaner:cleanupElement + + + param + + + id + name + value + + + + + + + hippohtmlcleaner:cleanupElement + + + iframe + + + src + align + class + frameborder + height + name + scrolling + width + + + + + + hippohtmlcleaner:serialization + + + 80 + + + + + hippohtmlcleaner:serializationElement + + + html + + + 1 + + + 1 + + + + + hippohtmlcleaner:serializationElement + + + body + + + 1 + + + 1 + + + + + hippohtmlcleaner:serializationElement + + + p + + + 1 + + + 1 + + + + + hippohtmlcleaner:serializationElement + + + pre + + + 1 + + + 1 + + + + + hippohtmlcleaner:serializationElement + + + div + + + 1 + + + 1 + + + + + hippohtmlcleaner:serializationElement + + + blockquote + + + 1 + + + 1 + + + + + hippohtmlcleaner:serializationElement + + + ul + + + 1 + + + 1 + + + 1 + + + + + hippohtmlcleaner:serializationElement + + + ol + + + 1 + + + 1 + + + 1 + + + + + hippohtmlcleaner:serializationElement + + + li + + + 1 + + + + + hippohtmlcleaner:serializationElement + + + table + + + 1 + + + 1 + + + 1 + + + + + hippohtmlcleaner:serializationElement + + + tbody + + + 1 + + + 1 + + + + + hippohtmlcleaner:serializationElement + + + tr + + + 1 + + + 1 + + + + + hippohtmlcleaner:serializationElement + + + td + + + 1 + + + + + hippohtmlcleaner:serializationElement + + + th + + + 1 + + + + + hippohtmlcleaner:serializationElement + + + br + + + 1 + + + + + hippohtmlcleaner:serializationElement + + + object + + + 1 + + + 1 + + + + + hippohtmlcleaner:serializationElement + + + iframe + + + 1 + + + 1 + + + + + Modified: hippo-ecm/trunk/addon/xinha-frontend/src/main/resources/system-html-template.xml =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/resources/system-html-template.xml 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/resources/system-html-template.xml 2009-01-02 12:12:48 UTC (rev 15716) @@ -14,830 +14,127 @@ See the License for the specific language governing permissions and limitations under the License. --> - + + + hippo:templatetype + + + hippo:translated + + + - hippo:templatetype + hippo:translation - - hippo:translated + + nl + + Geformatteerde tekst + + + + + hippo:translation + + + en + + + Formatted text + + - + + + hippo:handle + + + + hippo:nodetype + + + hippo:remodel + + + internal + + + false + + + String + + + + + + + hippo:handle + + + + + frontend:plugincluster + + + + ${cluster.id}.model + + + + wicket.id + mode + engine + width + height + + + - hippo:translation + frontend:plugin - - nl + + org.hippoecm.frontend.plugins.xinha.XinhaPlugin - - Geformatteerde tekst + + ${wicket.id} - - - - hippo:translation + + ${cluster.id}.model - - en + + ${mode} - - Formatted text + + ${engine} - - - - - hippo:handle + + ${width} - - - hippo:nodetype - - - hippo:remodel - - - internal - - - false - - - String - - - - - - - hippo:handle + + ${height} - - - - frontend:plugincluster - - - - ${cluster.id}.model - - - - wicket.id - mode - engine - width - height - - - - - frontend:plugin - - - org.hippoecm.frontend.plugins.xinha.XinhaPlugin - - - ${wicket.id} - - - ${cluster.id}.model - - - ${mode} - - - ${engine} - - - ${width} - - - ${height} - - - formatblock - bold - italic - underline - - - hippo-lite - - - ../../skin/xinhaInternal.css - - - AutoSave - - - timeoutLength=1500 - - - - hippohtmlcleaner:config - - - - hippohtmlcleaner:cleanup - - - - transitional - - - - nl - de - fr - en - es - - - - - - note - warn - fixme - - - - query - include - query-and-include - - - - - hippohtmlcleaner:cleanupElement - - - html - - - - - hippohtmlcleaner:cleanupElement - - - body - - - - - hippohtmlcleaner:cleanupElement - - - div - - - class - id - - - - - hippohtmlcleaner:cleanupElement - - - span - - - class - id - - - - - hippohtmlcleaner:cleanupElement - - - p - - - align - class - - - - - hippohtmlcleaner:cleanupElement - - - br - - - - - hippohtmlcleaner:cleanupElement - - - pre - - - class - - - - - hippohtmlcleaner:cleanupElement - - - blockquote - - - class - id - - - - - - - hippohtmlcleaner:cleanupElement - - - h1 - - - - - hippohtmlcleaner:cleanupElement - - - h2 - - - - - hippohtmlcleaner:cleanupElement - - - h3 - - - - - hippohtmlcleaner:cleanupElement - - - h4 - - - - - hippohtmlcleaner:cleanupElement - - - h5 - - - - - - - hippohtmlcleaner:cleanupElement - - - blockquote - - - href - target - title - name - - - - - - - hippohtmlcleaner:cleanupElement - - - strong - - - - - hippohtmlcleaner:cleanupElement - - - b - - - - - hippohtmlcleaner:cleanupElement - - - em - - - - - hippohtmlcleaner:cleanupElement - - - sup - - - - - hippohtmlcleaner:cleanupElement - - - sub - - - - - hippohtmlcleaner:cleanupElement - - - u - - - - - - - hippohtmlcleaner:cleanupElement - - - ul - - - - - hippohtmlcleaner:cleanupElement - - - ol - - - - - hippohtmlcleaner:cleanupElement - - - li - - - - - - - hippohtmlcleaner:cleanupElement - - - img - - - src - alt - border - align - hspace - vspace - width - height - title - - - - - - - hippohtmlcleaner:cleanupElement - - - table - - - class - border - cellspacing - cellpadding - width - align - style - - - - - hippohtmlcleaner:cleanupElement - - - tbody - - - - - hippohtmlcleaner:cleanupElement - - - tr - - - - - hippohtmlcleaner:cleanupElement - - - table - - - class - border - cellspacing - cellpadding - width - align - style - - - - - hippohtmlcleaner:cleanupElement - - - td - - - width - colspan - rowspan - valign - - - - - hippohtmlcleaner:cleanupElement - - - th - - - width - colspan - rowspan - valign - - - - - hippohtmlcleaner:cleanupElement - - - hr - - - - - - - hippohtmlcleaner:cleanupElement - - - object - - - align - class - data - height - id - width - title - type - - - - - hippohtmlcleaner:cleanupElement - - - param - - - id - name - value - - - - - - - hippohtmlcleaner:cleanupElement - - - iframe - - - src - align - class - frameborder - height - name - scrolling - width - - - - - - hippohtmlcleaner:serialization - - - 80 - - - - - hippohtmlcleaner:serializationElement - - - html - - - 1 - - - 1 - - - - - hippohtmlcleaner:serializationElement - - - body - - - 1 - - - 1 - - - - - hippohtmlcleaner:serializationElement - - - p - - - 1 - - - 1 - - - - - hippohtmlcleaner:serializationElement - - - pre - - - 1 - - - 1 - - - - - hippohtmlcleaner:serializationElement - - - div - - - 1 - - - 1 - - - - - hippohtmlcleaner:serializationElement - - - blockquote - - - 1 - - - 1 - - - - - hippohtmlcleaner:serializationElement - - - ul - - - 1 - - - 1 - - - 1 - - - - - hippohtmlcleaner:serializationElement - - - ol - - - 1 - - - 1 - - - 1 - - - - - hippohtmlcleaner:serializationElement - - - li - - - 1 - - - - - hippohtmlcleaner:serializationElement - - - table - - - 1 - - - 1 - - - 1 - - - - - hippohtmlcleaner:serializationElement - - - tbody - - - 1 - - - 1 - - - - - hippohtmlcleaner:serializationElement - - - tr - - - 1 - - - 1 - - - - - hippohtmlcleaner:serializationElement - - - td - - - 1 - - - - - hippohtmlcleaner:serializationElement - - - th - - - 1 - - - - - hippohtmlcleaner:serializationElement - - - br - - - 1 - - - - - hippohtmlcleaner:serializationElement - - - object - - - 1 - - - 1 - - - - - hippohtmlcleaner:serializationElement - - - iframe - - - 1 - - - 1 - - - - - - - + + formatblock + bold + italic + underline + + + hippo-lite + + + ../../skin/xinhaInternal.css + + + AutoSave + + + timeoutLength=1500 + + + Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/YuiPluginHelper.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/YuiPluginHelper.java 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/YuiPluginHelper.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -17,7 +17,7 @@ import org.hippoecm.frontend.plugin.IPluginContext; import org.hippoecm.frontend.plugin.config.IPluginConfig; -import org.hippoecm.frontend.plugins.yui.javascript.Settings; +import org.hippoecm.frontend.plugin.config.impl.JavaPluginConfig; import org.hippoecm.frontend.plugins.yui.webapp.IYuiManager; public class YuiPluginHelper { @@ -33,6 +33,10 @@ } public static IPluginConfig getConfig(IPluginConfig config) { - return config.getPluginConfig(CONFIG_ID); + IPluginConfig subConfig = config.getPluginConfig(CONFIG_ID); + if (subConfig == null) { + return new JavaPluginConfig(); + } + return subConfig; } } Modified: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/AbstractDialog.java =================================================================== --- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/AbstractDialog.java 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/AbstractDialog.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -39,6 +39,7 @@ import org.apache.wicket.markup.html.list.ListView; import org.apache.wicket.markup.html.panel.FeedbackPanel; import org.apache.wicket.markup.html.panel.Panel; +import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.ResourceModel; import org.apache.wicket.util.resource.IResourceStream; @@ -93,7 +94,7 @@ exceptionMessage("Markup of type '" + getMarkupType() + "' for component '" - + getClass().getName() + + AbstractDialog.this.getClass().getName() + "' not found." + " Enable debug messages for org.apache.wicket.util.resource to get a list of all filenames tried"), ex); @@ -111,7 +112,10 @@ protected boolean cancelled = false; public AbstractDialog() { - super("form"); + this(null); + } + public AbstractDialog(IModel model) { + super("form", model); setOutputMarkupId(true); @@ -248,6 +252,7 @@ public void render(PluginRequestTarget target) { target.addComponent(feedback); + target.addComponent(ok); } public void onClose() { Deleted: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/lookup/LookupDialog.html =================================================================== --- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/lookup/LookupDialog.html 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/lookup/LookupDialog.html 2009-01-02 12:12:48 UTC (rev 15716) @@ -1,21 +0,0 @@ - - - - Tree goes here - - - Deleted: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/lookup/LookupDialog.java =================================================================== --- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/lookup/LookupDialog.java 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/lookup/LookupDialog.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -1,58 +0,0 @@ -/* - * Copyright 2008 Hippo. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.hippoecm.frontend.dialog.lookup; - -import org.hippoecm.frontend.dialog.AbstractDialog; -import org.hippoecm.frontend.model.JcrNodeModel; -import org.hippoecm.frontend.model.tree.AbstractTreeNode; -import org.hippoecm.frontend.model.tree.JcrTreeModel; - -public abstract class LookupDialog extends AbstractDialog { - @SuppressWarnings("unused") - private final static String SVN_ID = "$Id$"; - - private static final long serialVersionUID = 1L; - - private LookupTargetTreeView tree; - private JcrTreeModel treeModel; - - protected LookupDialog(AbstractTreeNode rootNode) { - treeModel = new JcrTreeModel(rootNode); - this.tree = new LookupTargetTreeView("tree", treeModel, this); - tree.getTreeState().expandNode(rootNode); - add(tree); - } - - @Override - public final void onModelChanged() { - ok.setEnabled(isValidSelection(getSelectedNode())); - onSelect(getSelectedNode().getNodeModel()); - } - - // The selected node - public AbstractTreeNode getSelectedNode() { - return (AbstractTreeNode) tree.getSelectedNode(); - } - - public void setSelectedNode(JcrNodeModel selectedNode) { - tree.setSelectedNode(selectedNode, treeModel); - } - - protected void onSelect(JcrNodeModel nodeModel) { - } - - protected abstract boolean isValidSelection(AbstractTreeNode targetModel); -} Deleted: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/lookup/LookupTargetTreeView.java =================================================================== --- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/lookup/LookupTargetTreeView.java 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/lookup/LookupTargetTreeView.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -1,76 +0,0 @@ -/* - * Copyright 2008 Hippo. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.hippoecm.frontend.dialog.lookup; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import javax.swing.tree.TreeNode; - -import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.markup.html.tree.ITreeState; -import org.hippoecm.frontend.model.JcrNodeModel; -import org.hippoecm.frontend.model.tree.AbstractTreeNode; -import org.hippoecm.frontend.model.tree.JcrTreeModel; -import org.hippoecm.frontend.widgets.JcrTree; - -class LookupTargetTreeView extends JcrTree { - @SuppressWarnings("unused") - private final static String SVN_ID = "$Id$"; - - private static final long serialVersionUID = 1L; - - private TreeNode selectedNode; - private LookupDialog dialog; - - LookupTargetTreeView(String id, JcrTreeModel treeModel, LookupDialog dialog) { - super(id, treeModel); - this.dialog = dialog; - } - - @Override - protected void onNodeLinkClicked(AjaxRequestTarget target, TreeNode treeNode) { - this.selectedNode = treeNode; - AbstractTreeNode treeNodeModel = (AbstractTreeNode) treeNode; - dialog.setModel(treeNodeModel.getNodeModel()); - } - - TreeNode getSelectedNode() { - return selectedNode; - } - - void setSelectedNode(JcrNodeModel selectedNode, JcrTreeModel treeModel) { - List parents = new ArrayList(); - JcrNodeModel parent = selectedNode.getParentModel(); - if (parent != null) { - while (parent != null) { - parents.add(parent); - parent = parent.getParentModel(); - } - - Collections.reverse(parents); - ITreeState treeState = getTreeState(); - for (JcrNodeModel ancestor : parents) { - treeState.expandNode(treeModel.lookup(ancestor)); - } - - AbstractTreeNode treeNode= treeModel.lookup(selectedNode.getParentModel()); - treeState.selectNode(treeNode, true); - this.selectedNode = treeNode; - } - } -} Added: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/model/map/AbstractValueMap.java =================================================================== --- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/model/map/AbstractValueMap.java (rev 0) +++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/model/map/AbstractValueMap.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -0,0 +1,306 @@ +/* + * Copyright 2008 Hippo. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.hippoecm.frontend.model.map; + +import java.lang.reflect.Array; +import java.util.AbstractMap; +import java.util.Arrays; +import java.util.Iterator; +import java.util.Map; + +import org.apache.wicket.util.string.StringValue; +import org.apache.wicket.util.string.StringValueConversionException; +import org.apache.wicket.util.time.Duration; +import org.apache.wicket.util.time.Time; +import org.apache.wicket.util.value.IValueMap; + +public abstract class AbstractValueMap extends AbstractMap implements IValueMap { + @SuppressWarnings("unused") + private final static String SVN_ID = "$Id$"; + + private static final long serialVersionUID = 1L; + + private boolean immutable = false; + + public boolean isImmutable() { + return immutable; + } + + public IValueMap makeImmutable() { + return null; + } + + public final void clear() { + checkMutability(); + super.clear(); + } + + /** + * @see IValueMap#getBoolean(String) + */ + public final boolean getBoolean(final String key) throws StringValueConversionException { + return getStringValue(key).toBoolean(); + } + + /** + * @see IValueMap#getDouble(String) + */ + public final double getDouble(final String key) throws StringValueConversionException { + return getStringValue(key).toDouble(); + } + + /** + * @see IValueMap#getDouble(String, double) + */ + public final double getDouble(final String key, final double defaultValue) + throws StringValueConversionException { + return getStringValue(key).toDouble(defaultValue); + } + + /** + * @see IValueMap#getDuration(String) + */ + public final Duration getDuration(final String key) throws StringValueConversionException { + return getStringValue(key).toDuration(); + } + + /** + * @see IValueMap#getInt(String) + */ + public final int getInt(final String key) throws StringValueConversionException { + return getStringValue(key).toInt(); + } + + /** + * @see IValueMap#getInt(String, int) + */ + public final int getInt(final String key, final int defaultValue) + throws StringValueConversionException { + return getStringValue(key).toInt(defaultValue); + } + + /** + * @see IValueMap#getLong(String) + */ + public final long getLong(final String key) throws StringValueConversionException { + return getStringValue(key).toLong(); + } + + /** + * @see IValueMap#getLong(String, long) + */ + public final long getLong(final String key, final long defaultValue) + throws StringValueConversionException { + return getStringValue(key).toLong(defaultValue); + } + + /** + * @see IValueMap#getString(String, String) + */ + public final String getString(final String key, final String defaultValue) { + final String value = getString(key); + return value != null ? value : defaultValue; + } + + /** + * @see IValueMap#getString(String) + */ + public final String getString(final String key) { + final Object o = get(key); + if (o == null) { + return null; + } else if (o.getClass().isArray() && Array.getLength(o) > 0) { + // if it is an array just get the first value + final Object arrayValue = Array.get(o, 0); + if (arrayValue == null) { + return null; + } else { + return arrayValue.toString(); + } + + } else { + return o.toString(); + } + } + + /** + * @see IValueMap#getCharSequence(String) + */ + public final CharSequence getCharSequence(final String key) { + final Object o = get(key); + if (o == null) { + return null; + } else if (o.getClass().isArray() && Array.getLength(o) > 0) { + // if it is an array just get the first value + final Object arrayValue = Array.get(o, 0); + if (arrayValue == null) { + return null; + } else { + if (arrayValue instanceof CharSequence) { + return (CharSequence) arrayValue; + } + return arrayValue.toString(); + } + + } else { + if (o instanceof CharSequence) { + return (CharSequence) o; + } + return o.toString(); + } + } + + /** + * @see IValueMap#getStringArray(String) + */ + public String[] getStringArray(final String key) { + final Object o = get(key); + if (o == null) { + return null; + } else if (o instanceof String[]) { + return (String[]) o; + } else if (o.getClass().isArray()) { + int length = Array.getLength(o); + String[] array = new String[length]; + for (int i = 0; i < length; i++) { + final Object arrayValue = Array.get(o, i); + if (arrayValue != null) { + array[i] = arrayValue.toString(); + } + } + return array; + } + return new String[]{o.toString()}; + } + + /** + * @see IValueMap#getStringValue(String) + */ + public StringValue getStringValue(final String key) { + return StringValue.valueOf(getString(key)); + } + + /** + * @see IValueMap#getTime(String) + */ + public final Time getTime(final String key) throws StringValueConversionException { + return getStringValue(key).toTime(); + } + + /** + * Adds the value to this ValueMap with the given key. If the key already is in + * the ValueMap it will combine the values into a String array, + * else it will just store the value itself. + * + * @param key + * the key to store the value under + * @param value + * the value that must be added/merged to the ValueMap + * @return the value itself if there was no previous value, or a String array + * with the combined values + */ + public final Object add(final String key, final String value) { + checkMutability(); + final Object o = get(key); + if (o == null) { + return put(key, value); + } else if (o.getClass().isArray()) { + int length = Array.getLength(o); + String destArray[] = new String[length + 1]; + for (int i = 0; i < length; i++) { + final Object arrayValue = Array.get(o, i); + if (arrayValue != null) { + destArray[i] = arrayValue.toString(); + } + } + destArray[length] = value; + + return put(key, destArray); + } else { + return put(key, new String[]{o.toString(), value}); + } + } + + /** + * @see java.util.Map#putAll(java.util.Map) + */ + public void putAll(final Map map) { + checkMutability(); + super.putAll(map); + } + + /** + * @see java.util.Map#remove(java.lang.Object) + */ + public Object remove(final Object key) { + checkMutability(); + return super.remove(key); + } + + public String getKey(final String key) { + Iterator iter = keySet().iterator(); + while (iter.hasNext()) { + Object keyValue = iter.next(); + if (keyValue instanceof String) { + String keyString = (String) keyValue; + if (key.equalsIgnoreCase(keyString)) { + return keyString; + } + } + } + return null; + } + + /** + * Generates a String representation of this object. + * + * @return String representation of this ValueMap consistent with + * the tag-attribute style of markup elements. For example: + * a="x" b="y" c="z". + */ + public String toString() { + final StringBuffer buffer = new StringBuffer(); + for (final Iterator iterator = entrySet().iterator(); iterator.hasNext();) { + final Map.Entry entry = (Map.Entry) iterator.next(); + buffer.append(entry.getKey()); + buffer.append(" = \""); + final Object value = entry.getValue(); + if (value == null) { + buffer.append("null"); + } else if (value.getClass().isArray()) { + buffer.append(Arrays.asList((Object[]) value)); + } else { + buffer.append(value); + } + + buffer.append("\""); + if (iterator.hasNext()) { + buffer.append(' '); + } + } + return buffer.toString(); + } + + /** + * Throws an exception if ValueMap is immutable. + */ + private final void checkMutability() { + if (immutable) { + throw new UnsupportedOperationException("Map is immutable"); + } + } + +} Added: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/model/map/IHippoMap.java =================================================================== --- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/model/map/IHippoMap.java (rev 0) +++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/model/map/IHippoMap.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -0,0 +1,29 @@ +/* + * Copyright 2008 Hippo. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.hippoecm.frontend.model.map; + +import java.util.Map; + +public interface IHippoMap extends Map { + + String getPrimaryType(); + + String[] getMixinTypes(); + + void reset(); + + void save(); +} \ No newline at end of file Added: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/model/map/JcrList.java =================================================================== --- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/model/map/JcrList.java (rev 0) +++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/model/map/JcrList.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -0,0 +1,92 @@ +/* + * Copyright 2008 Hippo. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.hippoecm.frontend.model.map; + +import java.util.AbstractList; + +import javax.jcr.Node; +import javax.jcr.RepositoryException; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class JcrList extends AbstractList { + @SuppressWarnings("unused") + private final static String SVN_ID = "$Id$"; + + private static final long serialVersionUID = 1L; + + private static final Logger log = LoggerFactory.getLogger(JcrList.class); + + private Node item; + private String name; + + public JcrList(Node node, String name) { + this.item = node; + this.name = name; + } + + @Override + public IHippoMap get(int index) { + try { + return new JcrMap(item.getNode(name + "[" + (index + 1) + "]")); + } catch (RepositoryException ex) { + log.error(ex.getMessage()); + } + return null; + } + + @Override + public int size() { + try { + return (int) item.getNodes(name).getSize(); + } catch (RepositoryException ex) { + log.error(ex.getMessage()); + } + return 0; + } + + @Override + public void add(int index, IHippoMap element) { + try { + Node child = item.addNode(name, element.getPrimaryType()); + for (String mixin : element.getMixinTypes()) { + child.addMixin(mixin); + } + JcrMap map = new JcrMap(child); + map.putAll(element); + + if (item.getPrimaryNodeType().hasOrderableChildNodes() && (index < (size() - 1))) { + Node predecessor = item.getNode(name + "[" + (index + 1) + "]"); + item.orderBefore(name + "[" + child.getIndex() + "]", name + "[" + predecessor.getIndex() + "]"); + } + } catch (RepositoryException ex) { + log.error(ex.getMessage()); + } + } + + public IHippoMap remove(int index) { + // FIXME: make deep copy of node, before it's removed + IHippoMap current = get(index); + try { + item.getNode(name + "[" + (index + 1) + "]").remove(); + } catch (RepositoryException ex) { + log.error(ex.getMessage()); + } + return current; + } + +} Added: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/model/map/JcrMap.java =================================================================== --- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/model/map/JcrMap.java (rev 0) +++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/model/map/JcrMap.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -0,0 +1,397 @@ +/* + * Copyright 2008 Hippo. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.hippoecm.frontend.model.map; + +import java.util.AbstractMap; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.jcr.Node; +import javax.jcr.NodeIterator; +import javax.jcr.Property; +import javax.jcr.PropertyIterator; +import javax.jcr.PropertyType; +import javax.jcr.RepositoryException; +import javax.jcr.Value; +import javax.jcr.nodetype.NodeDefinition; +import javax.jcr.nodetype.NodeType; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class JcrMap extends AbstractMap implements IHippoMap { + @SuppressWarnings("unused") + private final static String SVN_ID = "$Id$"; + + private static final long serialVersionUID = 1L; + + private static final Logger log = LoggerFactory.getLogger(JcrMap.class); + + private Node item; + + public JcrMap(Node node) { + this.item = node; + } + + public Node getNode() { + return item; + } + + public String getPrimaryType() { + try { + return item.getPrimaryNodeType().getName(); + } catch (RepositoryException ex) { + log.error(ex.getMessage()); + } + return null; + } + + public String[] getMixinTypes() { + try { + NodeType[] types = item.getMixinNodeTypes(); + String[] result = new String[types.length]; + for (int i = 0; i < types.length; i++) { + result[i] = types[i].getName(); + } + } catch (RepositoryException ex) { + log.error(ex.getMessage()); + } + return null; + } + + @Override + public Set> entrySet() { + LinkedHashSet> entries = new LinkedHashSet>(); + for (final String key : (Set) keySet()) { + if ("jcr:primaryType".equals(key)) { + continue; + } + entries.add(new Map.Entry() { + public String getKey() { + return key; + } + + public Object getValue() { + return get(key); + } + + public Object setValue(Object value) { + return put(key, value); + } + }); + } + return entries; + } + + @Override + public void clear() { + try { + if (item != null) { + NodeIterator children = item.getNodes(); + while (children.hasNext()) { + Node child = children.nextNode(); + if (!child.getDefinition().isProtected()) { + child.remove(); + } + } + + PropertyIterator properties = item.getProperties(); + while (properties.hasNext()) { + Property property = properties.nextProperty(); + if (!property.getDefinition().isProtected()) { + property.remove(); + } + } + } else { + log.warn("Node model is not valid"); + } + } catch (RepositoryException ex) { + log.error(ex.getMessage()); + } + } + + @Override + public Object put(String key, Object value) { + String strKey = (String) key; + Object current = get(strKey); + try { + if (value instanceof List) { + if (current != null && (current instanceof List)) { + List list = (List) current; + for (IHippoMap entry : (List) value) { + if (!list.contains(entry)) { + list.add(entry); + } + } + Iterator iter = list.iterator(); + while (iter.hasNext()) { + Object entry = iter.next(); + if (!((List) value).contains(entry)) { + iter.remove(); + } + } + } + } else { + if (value instanceof Boolean) { + item.setProperty(strKey, (Boolean) value); + } else if (value instanceof String) { + item.setProperty(strKey, (String) value); + } else if (value instanceof String[]) { + item.setProperty(strKey, (String[]) value); + } else if (value instanceof Double) { + item.setProperty(strKey, (Double) value); + } else { + log.warn("Unknown type of value for key " + key); + } + } + } catch (RepositoryException ex) { + log.error(ex.getMessage()); + } + return current; + } + + @Override + public Object remove(Object key) { + String strKey = (String) key; + try { + Object result = get(key); + if (item != null) { + if (item.hasProperty(strKey)) { + item.getProperty(strKey).remove(); + } else if (item.getNodes(strKey).getSize() > 0) { + NodeIterator nodes = item.getNodes(strKey); + while (nodes.hasNext()) { + Node child = nodes.nextNode(); + child.remove(); + } + } + } else { + log.warn("Node model is invalid"); + } + return result; + } catch (RepositoryException ex) { + log.error(ex.getMessage()); + } + return null; + } + + @Override + public boolean containsKey(Object key) { + String strKey = (String) key; + if ("jcr:primaryType".equals(key)) { + return false; + } + try { + if (item != null) { + if (item.hasProperty(strKey)) { + return true; + } else if (item.getNodes(strKey).hasNext()) { + return true; + } + } else { + log.error("Node model is invalid"); + } + return false; + } catch (RepositoryException ex) { + log.error(ex.getMessage()); + } + return false; + } + + public boolean containsValue(Object value) { + for (Map.Entry entry : entrySet()) { + if (entry.getValue().equals(value)) { + return true; + } + } + return false; + } + + @Override + public Object get(Object key) { + String strKey = (String) key; + try { + if (item.hasProperty(strKey)) { + Property property = item.getProperty(strKey); + int type = property.getDefinition().getRequiredType(); + + Object[] result = null; + if (property.getDefinition().isMultiple()) { + Value[] values = property.getValues(); + switch (type) { + case PropertyType.BOOLEAN: + result = new Boolean[values.length]; + break; + case PropertyType.LONG: + result = new Long[values.length]; + break; + case PropertyType.STRING: + default: + result = new String[values.length]; + break; + } + + int i = 0; + for (Value current : values) { + result[i++] = getValue(current); + } + + return result; + } else { + return getValue(property.getValue()); + } + } else if (item.hasNode(strKey)) { + NodeDefinition def = item.getNode(strKey).getDefinition(); + if (def.allowsSameNameSiblings()) { + return new JcrList(item, strKey); + } else { + return new JcrMap(item.getNode(strKey)); + } + } + } catch (RepositoryException ex) { + log.error(ex.getMessage()); + } + return null; + } + + @Override + public boolean isEmpty() { + return size() == 0; + } + + @Override + public Set keySet() { + LinkedHashSet result = new LinkedHashSet(); + try { + if (item != null) { + PropertyIterator properties = item.getProperties(); + while (properties.hasNext()) { + Property property = properties.nextProperty(); + if (!"jcr:primaryType".equals(property.getName())) { + result.add(property.getName()); + } + } + + NodeIterator nodes = item.getNodes(); + while (nodes.hasNext()) { + Node child = nodes.nextNode(); + result.add(child.getName()); + } + } + } catch (RepositoryException ex) { + log.error(ex.getMessage()); + } + return result; + } + + @Override + public int size() { + try { + if (item != null) { + LinkedHashSet names = new LinkedHashSet(); + NodeIterator nodes = item.getNodes(); + while (nodes.hasNext()) { + Node child = nodes.nextNode(); + names.add(child.getName()); + } + return names.size() + (int) item.getProperties().getSize() - 1; + } + } catch (RepositoryException ex) { + log.error(ex.getMessage()); + } + return 0; + } + + @Override + public Collection values() { + LinkedHashSet result = new LinkedHashSet(); + try { + if (item != null) { + PropertyIterator properties = item.getProperties(); + while (properties.hasNext()) { + Property property = properties.nextProperty(); + if ("jcr:primaryType".equals(property.getName())) { + continue; + } + if (property.getDefinition().isMultiple()) { + Value[] values = property.getValues(); + Object[] entry = new Object[values.length]; + int i = 0; + for (Value value : values) { + entry[i++] = getValue(value); + } + result.add(entry); + } else { + result.add(getValue(property.getValue())); + } + } + + HashMap map = new HashMap(); + NodeIterator nodes = item.getNodes(); + while (nodes.hasNext()) { + Node child = nodes.nextNode(); + if (child.getDefinition().allowsSameNameSiblings()) { + List list = (List) map.get(child.getName()); + if (list == null) { + map.put(child.getName(), new JcrList(item, child.getName())); + } else { + continue; + } + } else { + map.put(child.getName(), new JcrMap(child)); + } + } + } + } catch (RepositoryException ex) { + log.error(ex.getMessage()); + } + return result; + } + + public void reset() { + try { + item.refresh(false); + } catch (RepositoryException ex) { + log.error(ex.getMessage()); + } + } + + public void save() { + try { + item.save(); + } catch (RepositoryException ex) { + log.error(ex.getMessage()); + } + } + + private Object getValue(Value value) throws RepositoryException { + switch (value.getType()) { + case PropertyType.BOOLEAN: + return new Boolean(value.getBoolean()); + case PropertyType.LONG: + return new Long(value.getLong()); + case PropertyType.STRING: + default: + return value.getString(); + } + } + +} Modified: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/model/tree/JcrTreeNode.java =================================================================== --- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/model/tree/JcrTreeNode.java 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/model/tree/JcrTreeNode.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -114,10 +114,11 @@ @Override public String renderNode() { - String result = (String) new NodeTranslator(getNodeModel()).getNodeName().getObject(); + String result = "unknown"; HippoNode node = getNodeModel().getNode(); if (node != null) { try { + result = node.getDisplayName(); if (node.hasProperty(HippoNodeType.HIPPO_COUNT)) { result += " [" + node.getProperty(HippoNodeType.HIPPO_COUNT).getLong() + "]"; } Modified: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/plugin/config/impl/ClusterConfigDecorator.java =================================================================== --- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/plugin/config/impl/ClusterConfigDecorator.java 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/plugin/config/impl/ClusterConfigDecorator.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -15,12 +15,16 @@ */ package org.hippoecm.frontend.plugin.config.impl; +import java.lang.reflect.Array; +import java.util.AbstractList; import java.util.AbstractSet; import java.util.Iterator; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; +import org.hippoecm.frontend.model.map.AbstractValueMap; import org.hippoecm.frontend.plugin.config.IClusterConfig; import org.hippoecm.frontend.plugin.config.IPluginConfig; @@ -30,72 +34,139 @@ private static final long serialVersionUID = 1L; - private IClusterConfig upstream; - private List overrides; - private String clusterId; + private class PluginConfigDecorator extends AbstractValueMap implements IPluginConfig { + private static final long serialVersionUID = 1L; - public ClusterConfigDecorator(IClusterConfig upstream, final String clusterId) { - this.upstream = upstream; - this.overrides = upstream.getOverrides(); - this.clusterId = clusterId; + private IPluginConfig conf; - List configs = upstream.getPlugins(); - for (final IPluginConfig conf : configs) { - addPlugin(new JavaPluginConfig() { - private static final long serialVersionUID = 1L; + PluginConfigDecorator(IPluginConfig conf) { + this.conf = conf; + } + public IPluginConfig getPluginConfig(Object key) { + return (IPluginConfig) filter(conf.getPluginConfig(key)); + } + + public Set getPluginConfigSet() { + Set result = new LinkedHashSet(); + for (IPluginConfig config : conf.getPluginConfigSet()) { + result.add((IPluginConfig) filter(config)); + } + return result; + } + + public void detach() { + ClusterConfigDecorator.this.detach(); + conf.detach(); + } + + @Override + public boolean equals(Object other) { + if (other instanceof PluginConfigDecorator) { + PluginConfigDecorator that = (PluginConfigDecorator) other; + return this.conf.equals(that.conf); + } + return false; + } + + @Override + public int hashCode() { + return 31 * conf.hashCode(); + } + + @Override + public Set entrySet() { + final Set orig = conf.entrySet(); + return new AbstractSet() { + @Override - public Object get(Object key) { - Object obj = conf.get(key); - if (obj != null) { - if (obj instanceof String) { - return filter((String) obj); - } else if (obj.getClass().isArray()) { - Object[] list = (Object[]) obj; - Object[] result = new Object[list.length]; - int i = 0; - for (Object item : list) { - if (item != null && item instanceof String) { - result[i++] = filter((String) item); - } else { - result[i++] = item; - } + public Iterator iterator() { + final Iterator origIter = orig.iterator(); + return new Iterator() { + + public boolean hasNext() { + return origIter.hasNext(); + } + + public Object next() { + final Entry entry = (Map.Entry) origIter.next(); + if (entry != null) { + return new Map.Entry() { + + public Object getKey() { + return entry.getKey(); + } + + public Object getValue() { + Object obj = entry.getValue(); + Object result; + if (obj.getClass().isArray()) { + int size = Array.getLength(obj); + Class componentType = obj.getClass().getComponentType(); + result = Array.newInstance(componentType, size); + for (int i = 0; i < size; i++) { + Array.set(result, i, filter(Array.get(obj, i))); + } + } else { + result = filter(obj); + } + return result; + } + + public Object setValue(Object value) { + return conf.put(entry.getKey(), value); + } + + }; } - return result; + return null; } - } - return obj; - } - @Override - public Object put(Object key, Object value) { - return conf.put(key, value); + public void remove() { + origIter.remove(); + } + + }; } @Override - public void detach() { - ClusterConfigDecorator.this.detach(); - conf.detach(); - super.detach(); + public int size() { + return orig.size(); } - }); + + }; } + } + private IClusterConfig upstream; + private List overrides; + private String clusterId; + + public ClusterConfigDecorator(IClusterConfig upstream, final String clusterId) { + this.upstream = upstream; + this.overrides = upstream.getOverrides(); + this.clusterId = clusterId; + + List configs = upstream.getPlugins(); + for (IPluginConfig conf : configs) { + addPlugin(new PluginConfigDecorator(conf)); + } + } + @Override public Object get(Object key) { Object obj = super.get(key); - if (obj != null) { - return obj; + if (obj == null) { + obj = upstream.get(key); } - obj = upstream.get(key); - if ((obj != null) && (obj instanceof String)) { + if (obj != null) { // Intercept values of the form "${" + variable + "}" + ... // These values are rewritten using the variables - return filter((String) obj); + return filter(obj); } - return obj; + return null; } @Override @@ -120,23 +191,44 @@ super.detach(); } - private Object filter(String value) { - if (value.length() > 2 && value.charAt(0) == '$' && value.charAt(1) == '{') { - String variable = value.substring(2, value.lastIndexOf('}')); - String remainder = value.substring(value.lastIndexOf('}') + 1); - if ("cluster.id".equals(variable)) { - return clusterId + remainder; - } else { - Object result = ClusterConfigDecorator.this.get(variable); - if (result instanceof String) { - return ((String) result) + remainder; + private Object filter(Object object) { + if (object instanceof String) { + String value = (String) object; + if (value.length() > 2 && value.charAt(0) == '$' && value.charAt(1) == '{') { + String variable = value.substring(2, value.lastIndexOf('}')); + String remainder = value.substring(value.lastIndexOf('}') + 1); + if ("cluster.id".equals(variable)) { + return clusterId + remainder; } else { - return result; + Object result = ClusterConfigDecorator.this.get(variable); + if (result instanceof String) { + return ((String) result) + remainder; + } else { + return result; + } } + // unreachable } - // unreachable + return value; + } else if (object instanceof IPluginConfig) { + return new PluginConfigDecorator((IPluginConfig) object); + } else if (object instanceof List) { + final List list = (List) object; + return new AbstractList() { + + @Override + public Object get(int index) { + return filter(list.get(index)); + } + + @Override + public int size() { + return list.size(); + } + + }; } - return value; + return object; } } Modified: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/plugin/config/impl/JcrClusterConfig.java =================================================================== --- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/plugin/config/impl/JcrClusterConfig.java 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/plugin/config/impl/JcrClusterConfig.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -76,7 +76,7 @@ public List getOverrides() { List result = new LinkedList(); try { - Node node = getNodeModel().getNode(); + Node node = nodeModel.getNode(); if (node.hasProperty("frontend:overrides")) { for (Value value : node.getProperty("frontend:overrides").getValues()) { result.add(value.getString()); Modified: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/plugin/config/impl/JcrPluginConfig.java =================================================================== --- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/plugin/config/impl/JcrPluginConfig.java 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/plugin/config/impl/JcrPluginConfig.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -15,22 +15,17 @@ */ package org.hippoecm.frontend.plugin.config.impl; -import java.util.Collection; -import java.util.HashMap; +import java.lang.reflect.Array; +import java.util.AbstractList; +import java.util.AbstractMap; import java.util.LinkedHashSet; -import java.util.Iterator; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.TreeSet; -import java.util.Vector; import javax.jcr.Node; import javax.jcr.NodeIterator; import javax.jcr.Property; -import javax.jcr.PropertyIterator; -import javax.jcr.PropertyType; import javax.jcr.RepositoryException; import javax.jcr.Value; @@ -40,12 +35,12 @@ import org.apache.wicket.util.time.Time; import org.apache.wicket.util.value.IValueMap; import org.hippoecm.frontend.model.JcrNodeModel; -import org.hippoecm.frontend.model.NodeModelWrapper; +import org.hippoecm.frontend.model.map.JcrMap; import org.hippoecm.frontend.plugin.config.IPluginConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class JcrPluginConfig extends NodeModelWrapper implements IPluginConfig { +public class JcrPluginConfig extends AbstractMap implements IPluginConfig { @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; @@ -53,6 +48,8 @@ private static final Logger log = LoggerFactory.getLogger(JcrPluginConfig.class); + protected final JcrNodeModel nodeModel; + private transient Set> entries; private IPluginConfig overrides; public JcrPluginConfig(JcrNodeModel nodeModel) { @@ -60,37 +57,14 @@ } public JcrPluginConfig(JcrNodeModel nodeModel, boolean mutable) { - super(nodeModel); + this.nodeModel = nodeModel; if (!mutable) { this.overrides = new JavaPluginConfig(); } } - - public void clear() { - try { - Node node = getNodeModel().getNode(); - if (node != null) { - NodeIterator children = node.getNodes(); - while (children.hasNext()) { - Node child = children.nextNode(); - if (!child.getDefinition().isProtected()) { - child.remove(); - } - } - - PropertyIterator properties = node.getProperties(); - while (properties.hasNext()) { - Property property = properties.nextProperty(); - if (!property.getDefinition().isProtected()) { - property.remove(); - } - } - } else { - log.warn("Node model is not valid"); - } - } catch (RepositoryException ex) { - log.error(ex.getMessage()); - } + + public JcrNodeModel getNodeModel() { + return nodeModel; } public boolean getBoolean(String key) throws StringValueConversionException { @@ -191,6 +165,7 @@ return StringValue.valueOf(getString(key)); } + @Override public Object put(Object key, Object value) { if (overrides != null) { Object obj; @@ -202,145 +177,9 @@ } return obj; } - Object result = get(key); - if (key instanceof String) { - String strKey = (String) key; - try { - Node node = getNodeModel().getNode(); - if (value instanceof IPluginConfig[]) { - JcrPluginConfig[] current = (JcrPluginConfig[]) result; - HashMap paths = new HashMap(); - for (JcrPluginConfig config : current) { - paths.put(config.getNodeModel().getItemModel().getPath(), config.getNodeModel().getNode()); - } - for (IPluginConfig config : (IPluginConfig[]) value) { - if (config instanceof JcrPluginConfig) { - paths.remove(((JcrPluginConfig) config).getNodeModel().getItemModel().getPath()); - } - } - for (Map.Entry entry : paths.entrySet()) { - entry.getValue().remove(); - } - for (IPluginConfig config : (IPluginConfig[]) value) { - if (!(config instanceof JcrPluginConfig)) { - Node child = node.addNode(strKey); - JcrPluginConfig model = new JcrPluginConfig(new JcrNodeModel(child)); - for (Map.Entry entry : (Set>) config.entrySet()) { - model.put(entry.getKey(), entry.getValue()); - } - } - } - for (JcrPluginConfig config : (JcrPluginConfig[]) get(key)) { - config.detach(); - } - } else { - if (value instanceof Boolean) { - node.setProperty(strKey, (Boolean) value); - } else if (value instanceof String) { - node.setProperty(strKey, (String) value); - } else if (value instanceof String[]) { - node.setProperty(strKey, (String[]) value); - } else if (value instanceof Double) { - node.setProperty(strKey, (Double) value); - } - } - } catch (RepositoryException ex) { - log.error(ex.getMessage()); - } - } else { - log.warn("Key " + key + " is not a String"); - } - return result; + return super.put(key, value); } - public void putAll(Map map) { - Iterator iter = map.entrySet().iterator(); - while (iter.hasNext()) { - Map.Entry entry = iter.next(); - put(entry.getKey(), entry.getValue()); - } - } - - public Object remove(Object key) { - if (key instanceof String) { - String strKey = (String) key; - try { - Object result = get(key); - Node node = getNodeModel().getNode(); - if (node != null) { - if (node.hasProperty(strKey)) { - node.getProperty(strKey).remove(); - } else if (node.getNodes(strKey).getSize() > 0) { - NodeIterator nodes = node.getNodes(strKey); - while (nodes.hasNext()) { - Node child = nodes.nextNode(); - child.remove(); - } - } - } else { - log.warn("Node model is invalid"); - } - return result; - } catch (RepositoryException ex) { - log.error(ex.getMessage()); - } - } else { - log.error("Key " + key + " is not a String"); - } - return null; - } - - public boolean containsKey(Object key) { - if (key instanceof String) { - String strKey = (String) key; - try { - Node node = getNodeModel().getNode(); - if (node != null) { - if (node.hasProperty(strKey)) { - return true; - } else if (node.getNodes(strKey).getSize() > 0) { - return true; - } - } else { - log.error("Node model is invalid"); - } - return false; - } catch (RepositoryException ex) { - log.error(ex.getMessage()); - } - } else { - log.error("Key " + key + " is not a String"); - } - return false; - } - - public boolean containsValue(Object value) { - for (Map.Entry entry : (Set) entrySet()) { - if (entry.getValue().equals(value)) { - return true; - } - } - return false; - } - - public Set entrySet() { - LinkedHashSet> entries = new LinkedHashSet>(); - for (final String key : (Set) keySet()) { - entries.add(new Map.Entry() { - public String getKey() { - return key; - } - public Object getValue() { - return get(key); - } - public Object setValue(Object value) { - return put(key, value); - } - }); - } - return entries; - } - public IPluginConfig getPluginConfig(Object key) { if (overrides != null && overrides.containsKey(key)) { return overrides.getPluginConfig(key); @@ -348,7 +187,7 @@ if (key instanceof String) { String strKey = (String) key; try { - Node node = getNodeModel().getNode(); + Node node = nodeModel.getNode(); if (node.hasNode(strKey)) { Node child = node.getNode(strKey); return new JcrPluginConfig(new JcrNodeModel(child), overrides == null); @@ -365,8 +204,8 @@ public Set getPluginConfigSet() { Set configs = new LinkedHashSet(); try { - NodeIterator children = getNodeModel().getNode().getNodes(); - for (int i=0; children.hasNext(); i++) { + NodeIterator children = nodeModel.getNode().getNodes(); + for (int i = 0; children.hasNext(); i++) { Node child = children.nextNode(); if (child != null) { configs.add(new JcrPluginConfig(new JcrNodeModel(child), overrides == null)); @@ -374,160 +213,17 @@ } } catch (RepositoryException ex) { log.error(ex.getMessage()); - } - return configs; - } + } + return configs; + } public Object get(Object key) { if (overrides != null && overrides.containsKey(key)) { return overrides.get(key); } - if (key instanceof String) { - String strKey = (String) key; - try { - Node node = getNodeModel().getNode(); - if (node.hasProperty(strKey)) { - Property property = node.getProperty(strKey); - int type = property.getDefinition().getRequiredType(); - - Object[] result = null; - if (property.getDefinition().isMultiple()) { - Value[] values = property.getValues(); - switch (type) { - case PropertyType.BOOLEAN: - result = new Boolean[values.length]; - break; - case PropertyType.LONG: - result = new Long[values.length]; - break; - case PropertyType.STRING: - default: - result = new String[values.length]; - break; - } - - int i = 0; - for (Value current : values) { - result[i++] = getValue(current); - } - - return result; - } else { - return getValue(property.getValue()); - } - } else if (node.hasNode(strKey)) { - NodeIterator children = node.getNodes(strKey); - Vector result = new Vector(); - while (children.hasNext()) { - Node child = children.nextNode(); - if (child != null) { - result.add(new JcrPluginConfig(new JcrNodeModel(child))); - } - } - return result.toArray(new JcrPluginConfig[result.size()]); - } - } catch (RepositoryException ex) { - log.error(ex.getMessage()); - } - } else { - log.warn("Key " + key + " is not a String"); - } - return null; + return super.get(key); } - public boolean isEmpty() { - return size() == 0; - } - - public Set keySet() { - LinkedHashSet result = new LinkedHashSet(); - try { - Node node = getNodeModel().getNode(); - if (node != null) { - PropertyIterator properties = node.getProperties(); - while (properties.hasNext()) { - Property property = properties.nextProperty(); - result.add(property.getName()); - } - - NodeIterator nodes = node.getNodes(); - while (nodes.hasNext()) { - Node child = nodes.nextNode(); - result.add(child.getName()); - } - } - } catch (RepositoryException ex) { - log.error(ex.getMessage()); - } - return result; - } - - public int size() { - try { - Node node = getNodeModel().getNode(); - if (node != null) { - LinkedHashSet names = new LinkedHashSet(); - NodeIterator nodes = node.getNodes(); - while (nodes.hasNext()) { - Node child = nodes.nextNode(); - names.add(child.getName()); - } - return names.size() + (int) node.getProperties().getSize(); - } - } catch (RepositoryException ex) { - log.error(ex.getMessage()); - } - return 0; - } - - public Collection values() { - LinkedHashSet result = new LinkedHashSet(); - try { - Node node = getNodeModel().getNode(); - if (node != null) { - PropertyIterator properties = node.getProperties(); - while (properties.hasNext()) { - Property property = properties.nextProperty(); - if (property.getDefinition().isMultiple()) { - Value[] values = property.getValues(); - Object[] entry = new Object[values.length]; - int i = 0; - for (Value value : values) { - entry[i++] = getValue(value); - } - result.add(entry); - } else { - result.add(getValue(property.getValue())); - } - } - - HashMap> map = new HashMap>(); - NodeIterator nodes = node.getNodes(); - while (nodes.hasNext()) { - Node child = nodes.nextNode(); - List list = map.get(child.getName()); - if (list == null) { - list = new LinkedList(); - map.put(child.getName(), list); - } - list.add(new JcrPluginConfig(new JcrNodeModel(child), overrides == null)); - } - - for (Map.Entry> entry : map.entrySet()) { - JcrPluginConfig[] array = new JcrPluginConfig[entry.getValue().size()]; - int i = 0; - for (JcrPluginConfig config : entry.getValue()) { - array[i++] = config; - } - result.add(array); - } - } - } catch (RepositoryException ex) { - log.error(ex.getMessage()); - } - return result; - } - public CharSequence getCharSequence(String key) { // TODO implement me throw new UnsupportedOperationException("not implemented yet"); @@ -562,8 +258,63 @@ throw new UnsupportedOperationException("not implemented yet"); } + public void detach() { + nodeModel.detach(); + entries = null; + } + + @Override + public Set> entrySet() { + if (entries == null) { + final JcrMap jcrMap = new JcrMap(nodeModel.getNode()); + final Set> orig = jcrMap.entrySet(); + entries = new LinkedHashSet>(); + for (final Map.Entry entry : orig) { + entries.add(new Map.Entry() { + + public String getKey() { + return entry.getKey(); + } + + public Object getValue() { + Object obj = entry.getValue(); + Object result; + if (obj.getClass().isArray()) { + int size = Array.getLength(obj); + Class componentType = obj.getClass().getComponentType(); + result = Array.newInstance(componentType, size); + for (int i = 0; i < size; i++) { + Array.set(result, i, filter(Array.get(obj, i))); + } + } else { + result = filter(obj); + } + return result; + } + + public Object setValue(Object value) { + return jcrMap.put(entry.getKey(), value); + } + }); + } + } + return entries; + } + + @Override + public boolean equals(Object other) { + if (other instanceof JcrPluginConfig) { + return ((JcrPluginConfig) other).nodeModel.equals(nodeModel); + } + return false; + } + + public int hashCode() { + return 521 * nodeModel.hashCode(); + } + private Property getProperty(String key) throws RepositoryException { - Node node = getNodeModel().getNode(); + Node node = nodeModel.getNode(); if (node != null) { if (node.hasProperty(key)) { return node.getProperty(key); @@ -574,15 +325,32 @@ return null; } - private Object getValue(Value value) throws RepositoryException { - switch (value.getType()) { - case PropertyType.BOOLEAN: - return new Boolean(value.getBoolean()); - case PropertyType.LONG: - return new Long(value.getLong()); - case PropertyType.STRING: - default: - return value.getString(); + private Object filter(Object value) { + if (value instanceof JcrMap) { + JcrMap map = (JcrMap) value; + try { + Node node = map.getNode(); + if (node.isNodeType("frontend:pluginconfig")) { + return new JcrPluginConfig(new JcrNodeModel(map.getNode())); + } + } catch (RepositoryException ex) { + log.error(ex.getMessage()); + } + } else if (value instanceof List) { + final List list = (List) value; + return new AbstractList() { + + @Override + public Object get(int index) { + return filter(list.get(index)); + } + + @Override + public int size() { + return list.size(); + } + }; } + return value; } } Copied: hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/dialog/LookupDialog.html (from rev 15715, hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/lookup/LookupDialog.html) =================================================================== --- hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/dialog/LookupDialog.html (rev 0) +++ hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/dialog/LookupDialog.html 2009-01-02 12:12:48 UTC (rev 15716) @@ -0,0 +1,21 @@ + + + + Tree goes here + + + Copied: hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/dialog/LookupDialog.java (from rev 15715, hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/lookup/LookupDialog.java) =================================================================== --- hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/dialog/LookupDialog.java (rev 0) +++ hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/dialog/LookupDialog.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -0,0 +1,58 @@ +/* + * Copyright 2008 Hippo. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.hippoecm.frontend.plugins.console.dialog; + +import org.hippoecm.frontend.dialog.AbstractDialog; +import org.hippoecm.frontend.model.JcrNodeModel; +import org.hippoecm.frontend.model.tree.AbstractTreeNode; +import org.hippoecm.frontend.model.tree.JcrTreeModel; + +public abstract class LookupDialog extends AbstractDialog { + @SuppressWarnings("unused") + private final static String SVN_ID = "$Id$"; + + private static final long serialVersionUID = 1L; + + private LookupTargetTreeView tree; + private JcrTreeModel treeModel; + + protected LookupDialog(AbstractTreeNode rootNode) { + treeModel = new JcrTreeModel(rootNode); + this.tree = new LookupTargetTreeView("tree", treeModel, this); + tree.getTreeState().expandNode(rootNode); + add(tree); + } + + @Override + public final void onModelChanged() { + ok.setEnabled(isValidSelection(getSelectedNode())); + onSelect(getSelectedNode().getNodeModel()); + } + + // The selected node + public AbstractTreeNode getSelectedNode() { + return (AbstractTreeNode) tree.getSelectedNode(); + } + + public void setSelectedNode(JcrNodeModel selectedNode) { + tree.setSelectedNode(selectedNode, treeModel); + } + + protected void onSelect(JcrNodeModel nodeModel) { + } + + protected abstract boolean isValidSelection(AbstractTreeNode targetModel); +} Copied: hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/dialog/LookupTargetTreeView.java (from rev 15715, hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/lookup/LookupTargetTreeView.java) =================================================================== --- hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/dialog/LookupTargetTreeView.java (rev 0) +++ hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/dialog/LookupTargetTreeView.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -0,0 +1,76 @@ +/* + * Copyright 2008 Hippo. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.hippoecm.frontend.plugins.console.dialog; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import javax.swing.tree.TreeNode; + +import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.markup.html.tree.ITreeState; +import org.hippoecm.frontend.model.JcrNodeModel; +import org.hippoecm.frontend.model.tree.AbstractTreeNode; +import org.hippoecm.frontend.model.tree.JcrTreeModel; +import org.hippoecm.frontend.widgets.JcrTree; + +class LookupTargetTreeView extends JcrTree { + @SuppressWarnings("unused") + private final static String SVN_ID = "$Id$"; + + private static final long serialVersionUID = 1L; + + private TreeNode selectedNode; + private LookupDialog dialog; + + LookupTargetTreeView(String id, JcrTreeModel treeModel, LookupDialog dialog) { + super(id, treeModel); + this.dialog = dialog; + } + + @Override + protected void onNodeLinkClicked(AjaxRequestTarget target, TreeNode treeNode) { + this.selectedNode = treeNode; + AbstractTreeNode treeNodeModel = (AbstractTreeNode) treeNode; + dialog.setModel(treeNodeModel.getNodeModel()); + } + + TreeNode getSelectedNode() { + return selectedNode; + } + + void setSelectedNode(JcrNodeModel selectedNode, JcrTreeModel treeModel) { + List parents = new ArrayList(); + JcrNodeModel parent = selectedNode.getParentModel(); + if (parent != null) { + while (parent != null) { + parents.add(parent); + parent = parent.getParentModel(); + } + + Collections.reverse(parents); + ITreeState treeState = getTreeState(); + for (JcrNodeModel ancestor : parents) { + treeState.expandNode(treeModel.lookup(ancestor)); + } + + AbstractTreeNode treeNode= treeModel.lookup(selectedNode.getParentModel()); + treeState.selectNode(treeNode, true); + this.selectedNode = treeNode; + } + } +} Modified: hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/copy/CopyDialog.java =================================================================== --- hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/copy/CopyDialog.java 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/copy/CopyDialog.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -25,10 +25,10 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; -import org.hippoecm.frontend.dialog.lookup.LookupDialog; import org.hippoecm.frontend.model.JcrNodeModel; import org.hippoecm.frontend.model.tree.AbstractTreeNode; import org.hippoecm.frontend.model.tree.JcrTreeNode; +import org.hippoecm.frontend.plugins.console.dialog.LookupDialog; import org.hippoecm.frontend.plugins.console.menu.MenuPlugin; import org.hippoecm.frontend.session.UserSession; import org.hippoecm.frontend.widgets.TextFieldWidget; Modified: hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/move/MoveDialog.java =================================================================== --- hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/move/MoveDialog.java 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/move/MoveDialog.java 2009-01-02 12:12:48 UTC (rev 15716) @@ -25,10 +25,10 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; -import org.hippoecm.frontend.dialog.lookup.LookupDialog; import org.hippoecm.frontend.model.JcrNodeModel; import org.hippoecm.frontend.model.tree.AbstractTreeNode; import org.hippoecm.frontend.model.tree.JcrTreeNode; +import org.hippoecm.frontend.plugins.console.dialog.LookupDialog; import org.hippoecm.frontend.plugins.console.menu.MenuPlugin; import org.hippoecm.frontend.session.UserSession; import org.hippoecm.frontend.widgets.TextFieldWidget; Modified: hippo-ecm/trunk/package/config/src/main/resources/cms-folder-views.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/cms-folder-views.xml 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/package/config/src/main/resources/cms-folder-views.xml 2009-01-02 12:12:48 UTC (rev 15716) @@ -470,6 +470,8 @@ wicket.id + model.folder + model.document Modified: hippo-ecm/trunk/package/config/src/main/resources/cms-pickers.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/cms-pickers.xml 2009-01-02 12:11:14 UTC (rev 15715) +++ hippo-ecm/trunk/package/config/src/main/resources/cms-pickers.xml 2009-01-02 12:12:48 UTC (rev 15716) @@ -20,15 +20,14 @@ frontend:clusterfolder - + frontend:plugincluster - - service.dialog.id + + ${cluster.id}.wicket - ${cluster.id}.model @@ -38,10 +37,10 @@ frontend:plugin - org.hippoecm.frontend.plugins.xinha.dialog.browse.BrowserPlugin + org.hippoecm.frontend.plugins.standards.browse.BrowserPlugin - service.modal.content + ${wicket.id} ${model.id} @@ -58,9 +57,6 @@ cms-folder-views - - ${service.dialog.id} - extension.shortcuts extension.breadcrumb @@ -114,7 +110,7 @@ frontend:plugin - org.hippoecm.frontend.plugins.xinha.dialog.browse.BreadcrumbPlugin + org.hippoecm.frontend.plugins.standards.browse.BreadcrumbPlugin ${cluster.id}.model.folder @@ -157,16 +153,14 @@ - - + frontend:plugincluster - - service.dialog.id + + ${cluster.id}.wicket - ${cluster.id}.model @@ -176,10 +170,10 @@ frontend:plugin - org.hippoecm.frontend.plugins.xinha.dialog.browse.BrowserPlugin + org.hippoecm.frontend.plugins.standards.browse.BrowserPlugin - service.modal.content + ${wicket.id} ${model.id} @@ -196,9 +190,6 @@ cms-folder-views - - ${service.dialog.id} - extension.shortcuts dialog.list @@ -265,7 +256,7 @@ frontend:plugin - org.hippoecm.frontend.plugins.xinha.dialog.browse.BreadcrumbPlugin + org.hippoecm.frontend.plugins.standards.browse.BreadcrumbPlugin service.dialog.breadcrumb From helpdesk at onehippo.com Fri Jan 2 13:48:41 2009 From: helpdesk at onehippo.com (JIRA (Frank van Lankvelt)) Date: Fri Jan 2 13:47:53 2009 Subject: [HippoRepos-dev] [JIRA] Resolved: (HREPTWO-2052) Use new pickers in plugins other than xinha In-Reply-To: <3516924.1230542879102.JavaMail.jira@hat01> Message-ID: <21048983.1230900521901.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-2052?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Frank van Lankvelt resolved HREPTWO-2052. ----------------------------------------- Resolution: Fixed > Use new pickers in plugins other than xinha > ------------------------------------------- > > Key: HREPTWO-2052 > URL: http://issues.onehippo.org/browse/HREPTWO-2052 > Project: Hippo Repository 2 > Issue Type: Sub-task > Reporter: Frank van Lankvelt > Assignee: Frank van Lankvelt > Fix For: r2.03.xx (m10 - scalability) > > Original Estimate: 1 day > Remaining Estimate: 1 day > > The facetselect picker and the gallerypicker should conform to the new popup style. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Jan 2 14:44:41 2009 From: helpdesk at onehippo.com (JIRA (Frank van Lankvelt)) Date: Fri Jan 2 14:43:51 2009 Subject: [HippoRepos-dev] [JIRA] Work started: (HREPTWO-1369) Simplify cluster controls In-Reply-To: <8862025.1218026578858.JavaMail.jira@hat01> Message-ID: <7722596.1230903881894.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-1369?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Work on HREPTWO-1369 started by Frank van Lankvelt. > Simplify cluster controls > ------------------------- > > Key: HREPTWO-1369 > URL: http://issues.onehippo.org/browse/HREPTWO-1369 > Project: Hippo Repository 2 > Issue Type: Improvement > Reporter: Frank van Lankvelt > Assignee: Frank van Lankvelt > Priority: High > Fix For: r2.03.xx (m10 - scalability) > > Original Estimate: 3 days > Time Spent: 1 week > Remaining Estimate: 0 minutes > > When a cluster is created, a special service is instantiated (an IPluginControl) where all services in the cluster are registered. This is used to identify services in extension points that exist outside of the cluster. > If such functionality is required, it is simpler to create a separate extension point for the cluster and reregister any services that register there. This would be done by the same plugin that receives the reference to the IPluginControl. > The IPluginControl should still be registered as a service, allowing plugins to register additional interfaces e.g. for lifecycle management. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Jan 2 14:44:41 2009 From: helpdesk at onehippo.com (JIRA (Frank van Lankvelt)) Date: Fri Jan 2 14:43:51 2009 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-1369) Simplify cluster controls In-Reply-To: <8862025.1218026578858.JavaMail.jira@hat01> Message-ID: <22377228.1230903881951.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-1369?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Frank van Lankvelt updated HREPTWO-1369: ---------------------------------------- Remaining Estimate: 2 days (was: 0 minutes) > Simplify cluster controls > ------------------------- > > Key: HREPTWO-1369 > URL: http://issues.onehippo.org/browse/HREPTWO-1369 > Project: Hippo Repository 2 > Issue Type: Improvement > Reporter: Frank van Lankvelt > Assignee: Frank van Lankvelt > Priority: High > Fix For: r2.03.xx (m10 - scalability) > > Original Estimate: 3 days > Time Spent: 1 week > Remaining Estimate: 2 days > > When a cluster is created, a special service is instantiated (an IPluginControl) where all services in the cluster are registered. This is used to identify services in extension points that exist outside of the cluster. > If such functionality is required, it is simpler to create a separate extension point for the cluster and reregister any services that register there. This would be done by the same plugin that receives the reference to the IPluginControl. > The IPluginControl should still be registered as a service, allowing plugins to register additional interfaces e.g. for lifecycle management. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Jan 2 15:23:41 2009 From: helpdesk at onehippo.com (JIRA ((Berry) A.W. van Halderen)) Date: Fri Jan 2 15:22:51 2009 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-2084) repairations according to failed unit tests In-Reply-To: <26286958.1230711461796.JavaMail.root@hat01> Message-ID: <9350707.1230906221794.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-2084?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#action_45545 ] (Berry) A.W. van Halderen commented on HREPTWO-2084: ---------------------------------------------------- Current failing tests: org.hippoecm.repository.CanonicalPathTest.txt org.hippoecm.repository.FacetedAuthorizationTest.txt org.hippoecm.repository.HREPTWO280Test.txt org.hippoecm.repository.HREPTWO475Test.txt org.hippoecm.repository.ImpersonateTest.txt org.hippoecm.repository.InternalCanonicalPathTest.txt org.hippoecm.repository.NodeNameCodecTest.txt org.hippoecm.repository.OrderByNodeNameTest.txt org.hippoecm.repository.RepositoryLoginTest.txt org.hippoecm.repository.decorating.MirrorTest.txt org.hippoecm.repository.decorating.PathsTest.txt mainly because deleting in virtual tree fails. > repairations according to failed unit tests > ------------------------------------------- > > Key: HREPTWO-2084 > URL: http://issues.onehippo.org/browse/HREPTWO-2084 > Project: Hippo Repository 2 > Issue Type: Sub-task > Reporter: (Berry) A.W. van Halderen > Assignee: (Berry) A.W. van Halderen > Fix For: r2.03.xx (m10 - scalability) > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Jan 2 16:23:41 2009 From: helpdesk at onehippo.com (JIRA (Mathijs Brand)) Date: Fri Jan 2 16:22:50 2009 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-2101) Paging in photo gallery Message-ID: <352490.1230909821812.JavaMail.root@hat01> Paging in photo gallery ----------------------- Key: HREPTWO-2101 URL: http://issues.onehippo.org/browse/HREPTWO-2101 Project: Hippo Repository 2 Issue Type: Task Reporter: Mathijs Brand Assignee: Mathijs Brand a fix in the css would be nice. For now a fix in the standard page size is a quick fix. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Jan 2 16:28:42 2009 From: helpdesk at onehippo.com (JIRA (Mathijs Brand)) Date: Fri Jan 2 16:27:51 2009 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-2101) Paging in photo gallery In-Reply-To: <352490.1230909821812.JavaMail.root@hat01> Message-ID: <22990285.1230910122495.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-2101?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Mathijs Brand updated HREPTWO-2101: ----------------------------------- Attachment: screenshot-1.jpg > Paging in photo gallery > ----------------------- > > Key: HREPTWO-2101 > URL: http://issues.onehippo.org/browse/HREPTWO-2101 > Project: Hippo Repository 2 > Issue Type: Task > Reporter: Mathijs Brand > Assignee: Mathijs Brand > Attachments: screenshot-1.jpg > > > a fix in the css would be nice. > For now a fix in the standard page size is a quick fix. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Jan 2 16:37:41 2009 From: helpdesk at onehippo.com (JIRA (Mathijs Brand)) Date: Fri Jan 2 16:36:50 2009 Subject: [HippoRepos-dev] [JIRA] Work started: (HREPTWO-2101) Paging in photo gallery In-Reply-To: <352490.1230909821812.JavaMail.root@hat01> Message-ID: <4789070.1230910661769.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-2101?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Work on HREPTWO-2101 started by Mathijs Brand. > Paging in photo gallery > ----------------------- > > Key: HREPTWO-2101 > URL: http://issues.onehippo.org/browse/HREPTWO-2101 > Project: Hippo Repository 2 > Issue Type: Task > Reporter: Mathijs Brand > Assignee: Mathijs Brand > Attachments: screenshot-1.jpg > > > a fix in the css would be nice. > For now a fix in the standard page size is a quick fix. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Jan 2 16:44:41 2009 From: helpdesk at onehippo.com (JIRA (Mathijs Brand)) Date: Fri Jan 2 16:43:51 2009 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-2101) Paging in photo gallery In-Reply-To: <352490.1230909821812.JavaMail.root@hat01> Message-ID: <4860631.1230911081862.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-2101?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#action_45549 ] Mathijs Brand commented on HREPTWO-2101: ---------------------------------------- In image folders: page size = 10 other folders: 20 > Paging in photo gallery > ----------------------- > > Key: HREPTWO-2101 > URL: http://issues.onehippo.org/browse/HREPTWO-2101 > Project: Hippo Repository 2 > Issue Type: Task > Reporter: Mathijs Brand > Assignee: Mathijs Brand > Attachments: screenshot-1.jpg > > > a fix in the css would be nice. > For now a fix in the standard page size is a quick fix. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Fri Jan 2 16:46:13 2009 From: svn-logs at hippocms.org (SVN (mbrand)) Date: Fri Jan 2 16:45:19 2009 Subject: [HippoRepos-dev] [15719] hippo-ecm: HREPTWO-2101 default folder sizes Message-ID: <20090102154613.64D02C19B@svnnew.onehippo.org> Revision: 15719 Author: mbrand Date: 2009-01-02 16:46:12 +0100 (Fri, 02 Jan 2009) Log Message: ----------- HREPTWO-2101 default folder sizes In image folders: page size = 10 other folders: 20 Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/package/config/src/main/resources/cms-folder-views.xml Modified: hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/package/config/src/main/resources/cms-folder-views.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/package/config/src/main/resources/cms-folder-views.xml 2009-01-02 15:03:59 UTC (rev 15718) +++ hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/package/config/src/main/resources/cms-folder-views.xml 2009-01-02 15:46:12 UTC (rev 15719) @@ -36,7 +36,7 @@ list.page.size - 15 + 10 @@ -243,7 +243,7 @@ list.page.size - 15 + 20 @@ -741,7 +741,7 @@ list.page.size - 15 + 20 @@ -937,7 +937,7 @@ list.page.size - 15 + 20 @@ -1133,7 +1133,7 @@ list.page.size - 15 + 20 From svn-logs at hippocms.org Fri Jan 2 16:58:14 2009 From: svn-logs at hippocms.org (SVN (mbrand)) Date: Fri Jan 2 16:57:21 2009 Subject: [HippoRepos-dev] [15720] hippo-ecm: HREPTWO-2101 default folder sizes Message-ID: <20090102155814.E04E4C589@svnnew.onehippo.org> Revision: 15720 Author: mbrand Date: 2009-01-02 16:58:13 +0100 (Fri, 02 Jan 2009) Log Message: ----------- HREPTWO-2101 default folder sizes In image folders: page size = 10 other folders: 20 Modified Paths: -------------- hippo-ecm/trunk/package/config/src/main/resources/cms-folder-views.xml Modified: hippo-ecm/trunk/package/config/src/main/resources/cms-folder-views.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/cms-folder-views.xml 2009-01-02 15:46:12 UTC (rev 15719) +++ hippo-ecm/trunk/package/config/src/main/resources/cms-folder-views.xml 2009-01-02 15:58:13 UTC (rev 15720) @@ -36,7 +36,7 @@ list.page.size - 15 + 10 @@ -243,7 +243,7 @@ list.page.size - 15 + 20 @@ -743,7 +743,7 @@ list.page.size - 15 + 20 @@ -939,7 +939,7 @@ list.page.size - 15 + 20 @@ -1135,7 +1135,7 @@ list.page.size - 15 + 20 From helpdesk at onehippo.com Fri Jan 2 16:59:41 2009 From: helpdesk at onehippo.com (JIRA (Mathijs Brand)) Date: Fri Jan 2 16:58:51 2009 Subject: [HippoRepos-dev] [JIRA] Work stopped: (HREPTWO-2101) Paging in photo gallery In-Reply-To: <352490.1230909821812.JavaMail.root@hat01> Message-ID: <540177.1230911981787.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-2101?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Work on HREPTWO-2101 stopped by Mathijs Brand. > Paging in photo gallery > ----------------------- > > Key: HREPTWO-2101 > URL: http://issues.onehippo.org/browse/HREPTWO-2101 > Project: Hippo Repository 2 > Issue Type: Task > Reporter: Mathijs Brand > Assignee: Mathijs Brand > Fix For: r2.02.xx (m9 update) > > Attachments: screenshot-1.jpg > > > a fix in the css would be nice. > For now a fix in the standard page size is a quick fix. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Jan 2 16:59:41 2009 From: helpdesk at onehippo.com (JIRA (Mathijs Brand)) Date: Fri Jan 2 16:58:53 2009 Subject: [HippoRepos-dev] [JIRA] Resolved: (HREPTWO-2101) Paging in photo gallery In-Reply-To: <352490.1230909821812.JavaMail.root@hat01> Message-ID: <29703148.1230911981841.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-2101?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Mathijs Brand resolved HREPTWO-2101. ------------------------------------ Fix Version/s: r2.02.xx (m9 update) Resolution: Fixed > Paging in photo gallery > ----------------------- > > Key: HREPTWO-2101 > URL: http://issues.onehippo.org/browse/HREPTWO-2101 > Project: Hippo Repository 2 > Issue Type: Task > Reporter: Mathijs Brand > Assignee: Mathijs Brand > Fix For: r2.02.xx (m9 update) > > Attachments: screenshot-1.jpg > > > a fix in the css would be nice. > For now a fix in the standard page size is a quick fix. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From seth at contenthere.net Fri Jan 2 18:00:40 2009 From: seth at contenthere.net (Seth Gottlieb) Date: Fri Jan 2 17:59:56 2009 Subject: [HippoRepos-dev] Getting started questions Message-ID: Browsing through the archives, this list does not seem like the place for n00b questions. But since this is the mailing list that was recommended on the getting started page (http://docs.onehippo.org/hippo-ecm/support/community_support.html), here goes. When I ran the bundled download (from http://docs.onehippo.org/hippo-ecm/delve_into/quickstart.html), I got some heap errors that I was able to correct by increasing the Java memory size: EXTRA_JVM_ARGUMENTS="-Xms512m -Xmx512m" in startup.sh You might want to make that change in the distribution. When I started to play around with the Hippo Site Toolkit downloads (http://docs.onehippo.org/site-toolkit/), I got all these internal errors that seem to trace back to NoClassDef Errors: 02.01.2009 11:21:03 ERROR [org.apache.wicket.RequestCycle.logRuntimeException():1432] Can't instantiate page using constructor public org.hippoecm.frontend.Home() org.apache.wicket.WicketRuntimeException: Can't instantiate page using constructor public org.hippoecm.frontend.Home() at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:168) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:58) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:262) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:283) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:210) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:91) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1171) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1248) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1349) at org.apache.wicket.RequestCycle.request(RequestCycle.java:493) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:387) at org.apache.wicket.protocol.http.WicketFilter.doFilter(WicketFilter.java:199) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:233) at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:191) at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:128) at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:102) at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:109) at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:286) at org.apache.coyote.http11.Http11Processor.process(Http11Processor.java:845) at org.apache.coyote.http11.Http11Protocol$Http11ConnectionHandler.process(Http11Protocol.java:583) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:447) at java.lang.Thread.run(Thread.java:613) Caused by: java.lang.reflect.InvocationTargetException at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:39) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:494) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:149) ... 23 more Caused by: java.lang.NoClassDefFoundError: javax/transaction/UserTransaction at java.lang.Class.forName0(Native Method) at java.lang.Class.forName(Class.java:164) at org.hippoecm.repository.HippoRepositoryFactory.getHippoRepository(HippoRepositoryFactory.java:85) at org.hippoecm.frontend.Main.getRepository(Main.java:212) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:131) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:114) at org.hippoecm.frontend.model.JcrSessionModel.getSession(JcrSessionModel.java:85) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:53) at org.hippoecm.frontend.Main$1.isInstantiationAuthorized(Main.java:78) at org.apache.wicket.Application$1.onInstantiation(Application.java:276) at org.apache.wicket.Application.notifyComponentInstantiationListeners(Application.java:974) at org.apache.wicket.Component.(Component.java:874) at org.apache.wicket.MarkupContainer.(MarkupContainer.java:105) at org.apache.wicket.Page.(Page.java:236) at org.apache.wicket.markup.html.WebPage.(WebPage.java:184) at org.hippoecm.frontend.Home.(Home.java:51) ... 28 more Any ideas? Thanks, Seth -- =============================== Seth Gottlieb Principal Content Here P.O. Box 60062 Florence, MA 01062 office: 857.488.4386 email: seth@contenthere.net web: http://www.contenthere.net =============================== From helpdesk at onehippo.com Mon Jan 5 09:52:41 2009 From: helpdesk at onehippo.com (JIRA ((Berry) A.W. van Halderen)) Date: Mon Jan 5 09:51:41 2009 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-2102) Creating a documen type with a hippo:resource component fails. Message-ID: <14565097.1231145561779.JavaMail.root@hat01> Creating a documen type with a hippo:resource component fails. -------------------------------------------------------------- Key: HREPTWO-2102 URL: http://issues.onehippo.org/browse/HREPTWO-2102 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.02.xx (m9 update) Reporter: (Berry) A.W. van Halderen Assignee: (Berry) A.W. van Halderen As reported by David Sean Taylor: "I want to create a document type with a hippo:resource. Can't seem to get it to save in the CMS (update all content). The dialog calls me to close, and then gives me a NPE." -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Mon Jan 5 10:04:15 2009 From: svn-logs at hippocms.org (SVN (bvanhalderen)) Date: Mon Jan 5 10:03:15 2009 Subject: [HippoRepos-dev] [15724] hippo-ecm: HREPTWO-2102: change english translation to be english Message-ID: <20090105090415.EF74BC589@svnnew.onehippo.org> Revision: 15724 Author: bvanhalderen Date: 2009-01-05 10:04:15 +0100 (Mon, 05 Jan 2009) Log Message: ----------- HREPTWO-2102: change english translation to be english Modified Paths: -------------- hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/remodel/RemodelWizard$ButtonBar.properties Modified: hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/remodel/RemodelWizard$ButtonBar.properties =================================================================== --- hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/remodel/RemodelWizard$ButtonBar.properties 2009-01-02 21:27:06 UTC (rev 15723) +++ hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/remodel/RemodelWizard$ButtonBar.properties 2009-01-05 09:04:15 UTC (rev 15724) @@ -1,3 +1,3 @@ ok: OK -cancel: Annuleer -finish: Sluit \ No newline at end of file +cancel: Cancel +finish: Close From helpdesk at onehippo.com Mon Jan 5 10:24:41 2009 From: helpdesk at onehippo.com (JIRA (Arje Cahn)) Date: Mon Jan 5 10:23:41 2009 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-2103) Hippo Collab Portal integration Message-ID: <3438647.1231147481776.JavaMail.root@hat01> Hippo Collab Portal integration ------------------------------- Key: HREPTWO-2103 URL: http://issues.onehippo.org/browse/HREPTWO-2103 Project: Hippo Repository 2 Issue Type: Task Affects Versions: r2.02.00 (m09) Reporter: Arje Cahn Fix For: r2.04.xx (m11 - new feats) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Jan 5 10:26:41 2009 From: helpdesk at onehippo.com (JIRA (Arje Cahn)) Date: Mon Jan 5 10:25:41 2009 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-2104) Using the Hippo Repository workflow from within the portal Message-ID: <25765594.1231147601810.JavaMail.root@hat01> Using the Hippo Repository workflow from within the portal ---------------------------------------------------------- Key: HREPTWO-2104 URL: http://issues.onehippo.org/browse/HREPTWO-2104 Project: Hippo Repository 2 Issue Type: Sub-task Reporter: Arje Cahn -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Jan 5 10:26:41 2009 From: helpdesk at onehippo.com (JIRA (Arje Cahn)) Date: Mon Jan 5 10:25:42 2009 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-2105) Single Sign On Portal / Repository Message-ID: <32640569.1231147601897.JavaMail.root@hat01> Single Sign On Portal / Repository ---------------------------------- Key: HREPTWO-2105 URL: http://issues.onehippo.org/browse/HREPTWO-2105 Project: Hippo Repository 2 Issue Type: Sub-task Reporter: Arje Cahn Fix For: r2.04.xx (m11 - new feats) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Jan 5 10:28:41 2009 From: helpdesk at onehippo.com (JIRA (Arje Cahn)) Date: Mon Jan 5 10:27:40 2009 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-2107) Setup minimal frontend application to be used as portlet Message-ID: <19818712.1231147721807.JavaMail.root@hat01> Setup minimal frontend application to be used as portlet -------------------------------------------------------- Key: HREPTWO-2107 URL: http://issues.onehippo.org/browse/HREPTWO-2107 Project: Hippo Repository 2 Issue Type: Sub-task Reporter: Arje Cahn Fix For: r2.04.xx (m11 - new feats) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Jan 5 10:28:41 2009 From: helpdesk at onehippo.com (JIRA (Arje Cahn)) Date: Mon Jan 5 10:27:41 2009 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-2106) Surf & Edit functionality Message-ID: <3766667.1231147721783.JavaMail.root@hat01> Surf & Edit functionality ------------------------- Key: HREPTWO-2106 URL: http://issues.onehippo.org/browse/HREPTWO-2106 Project: Hippo Repository 2 Issue Type: Sub-task Reporter: Arje Cahn Open a repository document in the CMS by passing it on the URL (or some other parameter) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Jan 5 10:37:41 2009 From: helpdesk at onehippo.com (JIRA ((Berry) A.W. van Halderen)) Date: Mon Jan 5 10:36:41 2009 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-2102) Creating a document type with a hippo:resource component fails. In-Reply-To: <14565097.1231145561779.JavaMail.root@hat01> Message-ID: <15188250.1231148261787.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-2102?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] (Berry) A.W. van Halderen updated HREPTWO-2102: ----------------------------------------------- Summary: Creating a document type with a hippo:resource component fails. (was: Creating a documen type with a hippo:resource component fails.) > Creating a document type with a hippo:resource component fails. > --------------------------------------------------------------- > > Key: HREPTWO-2102 > URL: http://issues.onehippo.org/browse/HREPTWO-2102 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.02.xx (m9 update) > Reporter: (Berry) A.W. van Halderen > Assignee: (Berry) A.W. van Halderen > > As reported by David Sean Taylor: > "I want to create a document type with a hippo:resource. Can't seem to get it to save in the CMS (update all content). The dialog calls me to close, and then gives me a NPE." -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Mon Jan 5 10:39:27 2009 From: svn-logs at hippocms.org (SVN (bvanhalderen)) Date: Mon Jan 5 10:38:27 2009 Subject: [HippoRepos-dev] [15725] hippo-ecm: HREPTWO-2102: backport Message-ID: <20090105093927.EA6E0C589@svnnew.onehippo.org> Revision: 15725 Author: bvanhalderen Date: 2009-01-05 10:39:27 +0100 (Mon, 05 Jan 2009) Log Message: ----------- HREPTWO-2102: backport Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/remodel/RemodelWizard$ButtonBar.properties Modified: hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/remodel/RemodelWizard$ButtonBar.properties =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/remodel/RemodelWizard$ButtonBar.properties 2009-01-05 09:04:15 UTC (rev 15724) +++ hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/remodel/RemodelWizard$ButtonBar.properties 2009-01-05 09:39:27 UTC (rev 15725) @@ -1,3 +1,3 @@ ok: OK -cancel: Annuleer -finish: Sluit \ No newline at end of file +cancel: Cancel +finish: Close From helpdesk at onehippo.com Mon Jan 5 10:41:41 2009 From: helpdesk at onehippo.com (JIRA (Arje Cahn)) Date: Mon Jan 5 10:40:41 2009 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-2108) Evaluate Jetspeed Desktop Message-ID: <19767410.1231148501902.JavaMail.root@hat01> Evaluate Jetspeed Desktop ------------------------- Key: HREPTWO-2108 URL: http://issues.onehippo.org/browse/HREPTWO-2108 Project: Hippo Repository 2 Issue Type: Sub-task Reporter: Arje Cahn Assignee: Arthur Bogaart Fix For: r2.04.xx (m11 - new feats) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Jan 5 10:41:41 2009 From: helpdesk at onehippo.com (JIRA (Arje Cahn)) Date: Mon Jan 5 10:40:43 2009 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-2109) Try out YUI with Collab Portal Message-ID: <17880633.1231148501963.JavaMail.root@hat01> Try out YUI with Collab Portal ------------------------------ Key: HREPTWO-2109 URL: http://issues.onehippo.org/browse/HREPTWO-2109 Project: Hippo Repository 2 Issue Type: Sub-task Reporter: Arje Cahn Assignee: Arthur Bogaart Fix For: r2.04.xx (m11 - new feats) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Jan 5 10:43:41 2009 From: helpdesk at onehippo.com (JIRA (Arje Cahn)) Date: Mon Jan 5 10:42:41 2009 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-1689) Integrate YUI LayoutManager with Wicket-Ajax to streamline ajax updates. In-Reply-To: <20018365.1223396819296.JavaMail.jira@hat01> Message-ID: <13703342.1231148621978.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-1689?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Arje Cahn updated HREPTWO-1689: ------------------------------- Fix Version/s: r2.03.xx (m10 - scalability) > Integrate YUI LayoutManager with Wicket-Ajax to streamline ajax updates. > ------------------------------------------------------------------------ > > Key: HREPTWO-1689 > URL: http://issues.onehippo.org/browse/HREPTWO-1689 > Project: Hippo Repository 2 > Issue Type: Improvement > Reporter: Arthur Bogaart > Assignee: Arthur Bogaart > Fix For: r2.03.xx (m10 - scalability) > > Original Estimate: 3 weeks > Remaining Estimate: 3 weeks > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Jan 5 10:45:42 2009 From: helpdesk at onehippo.com (JIRA (Arje Cahn)) Date: Mon Jan 5 10:44:41 2009 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-1689) Integrate YUI LayoutManager with Wicket-Ajax to streamline ajax updates. In-Reply-To: <20018365.1223396819296.JavaMail.jira@hat01> Message-ID: <10770579.1231148742296.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-1689?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Arje Cahn updated HREPTWO-1689: ------------------------------- Parent: HREPTWO-2059 Issue Type: Sub-task (was: Improvement) > Integrate YUI LayoutManager with Wicket-Ajax to streamline ajax updates. > ------------------------------------------------------------------------ > > Key: HREPTWO-1689 > URL: http://issues.onehippo.org/browse/HREPTWO-1689 > Project: Hippo Repository 2 > Issue Type: Sub-task > Reporter: Arthur Bogaart > Assignee: Arthur Bogaart > Fix For: r2.03.xx (m10 - scalability) > > Original Estimate: 3 weeks > Remaining Estimate: 3 weeks > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Jan 5 10:45:42 2009 From: helpdesk at onehippo.com (JIRA (Arje Cahn)) Date: Mon Jan 5 10:44:42 2009 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-611) Client caching tabsplugin In-Reply-To: <4907684.1204891308244.JavaMail.jira@hat01> Message-ID: <30963824.1231148742495.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-611?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Arje Cahn updated HREPTWO-611: ------------------------------ Fix Version/s: r2.04.xx (m11 - new feats) (was: r2.03.xx (m10 - scalability)) > Client caching tabsplugin > ------------------------- > > Key: HREPTWO-611 > URL: http://issues.onehippo.org/browse/HREPTWO-611 > Project: Hippo Repository 2 > Issue Type: Sub-task > Components: front-end-core > Affects Versions: 2.01.00m03 > Reporter: Arje Cahn > Assignee: Frank van Lankvelt > Priority: High > Fix For: r2.04.xx (m11 - new feats) > > Original Estimate: 4 days > Remaining Estimate: 4 days > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Jan 5 10:50:41 2009 From: helpdesk at onehippo.com (JIRA (Arthur Bogaart)) Date: Mon Jan 5 10:49:40 2009 Subject: [HippoRepos-dev] [JIRA] Work started: (HREPTWO-1689) Integrate YUI LayoutManager with Wicket-Ajax to streamline ajax updates. In-Reply-To: <20018365.1223396819296.JavaMail.jira@hat01> Message-ID: <14241237.1231149041779.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-1689?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Work on HREPTWO-1689 started by Arthur Bogaart. > Integrate YUI LayoutManager with Wicket-Ajax to streamline ajax updates. > ------------------------------------------------------------------------ > > Key: HREPTWO-1689 > URL: http://issues.onehippo.org/browse/HREPTWO-1689 > Project: Hippo Repository 2 > Issue Type: Sub-task > Reporter: Arthur Bogaart > Assignee: Arthur Bogaart > Fix For: r2.03.xx (m10 - scalability) > > Original Estimate: 3 weeks > Remaining Estimate: 3 weeks > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Jan 5 10:59:41 2009 From: helpdesk at onehippo.com (JIRA (Frank van Lankvelt)) Date: Mon Jan 5 10:58:41 2009 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-2110) branch doesn't build Message-ID: <11682062.1231149581825.JavaMail.root@hat01> branch doesn't build -------------------- Key: HREPTWO-2110 URL: http://issues.onehippo.org/browse/HREPTWO-2110 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.02.00 (m09) Reporter: Frank van Lankvelt Assignee: Bart van der Schans Priority: Blocker Fix For: r2.02.xx (m9 update) I'm getting the following error in a mvn build of the branch: [ERROR] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Compilation failure /home/frnk/Hippo/hippo-ecm-2_02_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/ListGroupsPanel.java:[74,43] cannot find symbol symbol: class ViewGroupPanel return new ViewGroupPanel(componentId, context, breadCrumbModel, model); /home/frnk/Hippo/hippo-ecm-2_02_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/ListGroupsPanel.java:[74,43] cannot find symbol symbol: class ViewGroupPanel return new ViewGroupPanel(componentId, context, breadCrumbModel, model); -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Mon Jan 5 11:14:27 2009 From: svn-logs at hippocms.org (SVN (bvdschans)) Date: Mon Jan 5 11:13:26 2009 Subject: [HippoRepos-dev] [15726] hippo-ecm: HREPTWO-2110: Add missing files from backport Message-ID: <20090105101427.A1533C589@svnnew.onehippo.org> Revision: 15726 Author: bvdschans Date: 2009-01-05 11:14:26 +0100 (Mon, 05 Jan 2009) Log Message: ----------- HREPTWO-2110: Add missing files from backport Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/Group.java hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/users/SetMembershipsPanel.java Added Paths: ----------- hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/EditGroupPanel.html hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/EditGroupPanel.java hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/ViewGroupPanel.html hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/ViewGroupPanel.java Added: hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/EditGroupPanel.html =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/EditGroupPanel.html (rev 0) +++ hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/EditGroupPanel.html 2009-01-05 10:14:26 UTC (rev 15726) @@ -0,0 +1,46 @@ + + + + +
+ + + + + +
: + +
+ + + + + + + +
+ + +
+ + + [table]
+ +
+ + Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/EditGroupPanel.html ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native Added: hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/EditGroupPanel.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/EditGroupPanel.java (rev 0) +++ hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/EditGroupPanel.java 2009-01-05 10:14:26 UTC (rev 15726) @@ -0,0 +1,150 @@ +/* + * Copyright 2008 Hippo. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.hippoecm.frontend.plugins.cms.admin.groups; + +import java.util.ArrayList; +import java.util.List; + +import javax.jcr.RepositoryException; + +import org.apache.wicket.Component; +import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.extensions.breadcrumb.IBreadCrumbModel; +import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn; +import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; +import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn; +import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.markup.html.list.ListItem; +import org.apache.wicket.markup.html.list.ListView; +import org.apache.wicket.markup.repeater.Item; +import org.apache.wicket.model.IModel; +import org.apache.wicket.model.Model; +import org.apache.wicket.model.PropertyModel; +import org.apache.wicket.model.ResourceModel; +import org.apache.wicket.model.StringResourceModel; +import org.hippoecm.frontend.plugin.IPluginContext; +import org.hippoecm.frontend.plugins.cms.admin.crumbs.AdminBreadCrumbPanel; +import org.hippoecm.frontend.plugins.cms.admin.users.User; +import org.hippoecm.frontend.plugins.cms.admin.users.UserDataProvider; +import org.hippoecm.frontend.plugins.cms.admin.widgets.AdminDataTable; +import org.hippoecm.frontend.plugins.cms.admin.widgets.AjaxLinkLabel; +import org.hippoecm.frontend.widgets.TextAreaWidget; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class EditGroupPanel extends AdminBreadCrumbPanel { + @SuppressWarnings("unused") + private static final String SVN_ID = "$Id$"; + private static final long serialVersionUID = 1L; + private static final Logger log = LoggerFactory.getLogger(EditGroupPanel.class); + + private final IModel model; + private final ListView localList; + + private final AdminDataTable table; + + public EditGroupPanel(final String id, final IPluginContext context, final IBreadCrumbModel breadCrumbModel, + final IModel model) { + super(id, breadCrumbModel); + setOutputMarkupId(true); + this.model = model; + final Group group = (Group) model.getObject(); + + add(new TextAreaWidget("description", new PropertyModel(group, "description"))); + + // members + Label localLabel = new Label("group-members-label", new ResourceModel("group-members")); + localList = new MembershipsListEditView("group-members", "group-member", group); + add(localLabel); + add(localList); + + // All local groups + List columns = new ArrayList(); + columns.add(new AbstractColumn(new Model(""), "add") { + private static final long serialVersionUID = 1L; + + public void populateItem(final Item item, final String componentId, final IModel model) { + final User user = (User) model.getObject(); + AjaxLinkLabel action = new AjaxLinkLabel(componentId, new ResourceModel("group-member-add-action")) { + private static final long serialVersionUID = 1L; + + @Override + public void onClick(AjaxRequestTarget target) { + try { + group.addMembership(user.getDisplayName()); + info(getString("group-member-added", model)); + localList.removeAll(); + target.addComponent(localList); + } catch (RepositoryException e) { + error(getString("group-member-add-failed", model)); + log.error("Failed to add member", e); + } + } + }; + item.add(action); + } + }); + + columns.add(new PropertyColumn(new Model("First Name"), "frontend:firstname", "firstName")); + columns.add(new PropertyColumn(new Model("Last Name"), "frontend:lastname", "lastName")); + + table = new AdminDataTable("table", columns, new UserDataProvider(), 40); + table.setOutputMarkupId(true); + add(table); + } + + /** list view to be nested in the form. */ + private final class MembershipsListEditView extends ListView { + private static final long serialVersionUID = 1L; + private String labelId; + private Group group; + + public MembershipsListEditView(final String id, final String labelId, final Group group) { + super(id, new PropertyModel(group, "members")); + this.labelId = labelId; + this.group = group; + setReuseItems(false); + setOutputMarkupId(true); + } + + protected void populateItem(ListItem item) { + item.setOutputMarkupId(true); + final String userName = (String) item.getModelObject(); + item.add(new Label(labelId, userName)); + item.add(new AjaxLinkLabel("remove", new ResourceModel("group-member-remove-action")) { + private static final long serialVersionUID = 1L; + + @Override + public void onClick(AjaxRequestTarget target) { + try { + group.removeMembership(userName); + info(getString("group-member-removed", null)); + localList.removeAll(); + target.addComponent(localList); + } catch (RepositoryException e) { + error(getString("group-member-remove-failed", null)); + log.error("Failed to remove memberships", e); + } + } + }); + } + } + + public IModel getTitle(Component component) { + return new StringResourceModel("group-edit-title", component, model); + } + +} Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/EditGroupPanel.java ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native Modified: hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/Group.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/Group.java 2009-01-05 09:39:27 UTC (rev 15725) +++ hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/Group.java 2009-01-05 10:14:26 UTC (rev 15726) @@ -31,7 +31,6 @@ import org.apache.wicket.IClusterable; import org.apache.wicket.Session; -import org.hippoecm.frontend.plugins.cms.admin.users.User; import org.hippoecm.frontend.session.UserSession; import org.hippoecm.repository.api.HippoNodeType; import org.hippoecm.repository.api.NodeNameCodec; @@ -164,10 +163,6 @@ return external; } - public void setExternal(boolean external) { - this.external = external; - } - public String getGroupname() { return groupname; } @@ -184,8 +179,10 @@ return description; } - public void setDescription(String description) { + public void setDescription(String description) throws RepositoryException { this.description = description; + node.setProperty(PROP_DESCRIPTION, description); + node.save(); } @@ -199,7 +196,7 @@ this.node = node; if (node.isNodeType(HippoNodeType.NT_EXTERNALGROUP)) { - setExternal(true); + external = true; } if (node.hasProperty(PROP_DESCRIPTION)) { @@ -217,10 +214,9 @@ } } - public Set getMembers() { - return members; + public List getMembers() { + return new ArrayList(members); } - //-------------------- persistence helpers ----------// /** @@ -269,18 +265,17 @@ parent.save(); } - public void removeMembership(User user) throws RepositoryException { - members.remove(user.getUsername()); + public void removeMembership(String user) throws RepositoryException { + members.remove(user); node.setProperty(HippoNodeType.HIPPO_MEMBERS, members.toArray(new String[members.size()])); node.save(); } - public void addMembership(User user) throws RepositoryException { - members.add(user.getUsername()); + public void addMembership(String user) throws RepositoryException { + members.add(user); node.setProperty(HippoNodeType.HIPPO_MEMBERS, members.toArray(new String[members.size()])); node.save(); } - //--------------------- default object -------------------// /** Added: hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/ViewGroupPanel.html =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/ViewGroupPanel.html (rev 0) +++ hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/ViewGroupPanel.html 2009-01-05 10:14:26 UTC (rev 15726) @@ -0,0 +1,52 @@ + + + + +
+ + + + + + + + + + +
:
:
+ +
+ +
+ + Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/ViewGroupPanel.html ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native Added: hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/ViewGroupPanel.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/ViewGroupPanel.java (rev 0) +++ hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/ViewGroupPanel.java 2009-01-05 10:14:26 UTC (rev 15726) @@ -0,0 +1,83 @@ +/* + * Copyright 2008 Hippo. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.hippoecm.frontend.plugins.cms.admin.groups; + +import org.apache.wicket.Component; +import org.apache.wicket.extensions.breadcrumb.IBreadCrumbModel; +import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.markup.html.list.ListItem; +import org.apache.wicket.markup.html.list.ListView; +import org.apache.wicket.model.IModel; +import org.apache.wicket.model.PropertyModel; +import org.apache.wicket.model.ResourceModel; +import org.apache.wicket.model.StringResourceModel; +import org.hippoecm.frontend.plugin.IPluginContext; +import org.hippoecm.frontend.plugins.cms.admin.crumbs.AdminBreadCrumbPanel; +import org.hippoecm.frontend.plugins.cms.admin.widgets.AjaxBreadCrumbPanelLink; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class ViewGroupPanel extends AdminBreadCrumbPanel { + @SuppressWarnings("unused") + private static final String SVN_ID = "$Id$"; + private static final long serialVersionUID = 1L; + private static final Logger log = LoggerFactory.getLogger(ViewGroupPanel.class); + + private final IModel model; + + public ViewGroupPanel(final String id, final IPluginContext context, final IBreadCrumbModel breadCrumbModel, + final IModel model) { + super(id, breadCrumbModel); + setOutputMarkupId(true); + + this.model = model; + final Group group = (Group) model.getObject(); + + // common group properties + add(new Label("groupname", new PropertyModel(model, "groupname"))); + add(new Label("description", new PropertyModel(model, "description"))); + + // local memberships + add(new Label("group-members-label", new ResourceModel("group-members-label"))); + add(new MembershipsListView("members", "member", new PropertyModel(group, "members"))); + + // actions + AjaxBreadCrumbPanelLink edit = new AjaxBreadCrumbPanelLink("edit-group", context, this, EditGroupPanel.class, model); + edit.setVisible(!group.isExternal()); + add(edit); + } + + /** list view to be nested in the form. */ + private static final class MembershipsListView extends ListView { + private static final long serialVersionUID = 1L; + private String labelId; + + public MembershipsListView(final String id, final String labelId, IModel listModel) { + super(id, listModel); + this.labelId = labelId; + } + + protected void populateItem(ListItem item) { + String user = (String) item.getModelObject(); + item.add(new Label(labelId, user)); + } + } + + public IModel getTitle(Component component) { + return new StringResourceModel("group-view-title", component, model); + } + +} Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/ViewGroupPanel.java ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native Modified: hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/users/SetMembershipsPanel.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/users/SetMembershipsPanel.java 2009-01-05 09:39:27 UTC (rev 15725) +++ hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/users/SetMembershipsPanel.java 2009-01-05 10:14:26 UTC (rev 15726) @@ -68,7 +68,7 @@ @Override protected void onSubmit(AjaxRequestTarget target, Form form) { try { - selectedGroup.addMembership(user); + selectedGroup.addMembership(user.getUsername()); info(getString("user-membership-added", new DetachableGroup(selectedGroup))); localList.removeAll(); target.addComponent(localList); @@ -128,7 +128,7 @@ @Override public void onClick(AjaxRequestTarget target) { try { - model.getGroup().removeMembership(user); + model.getGroup().removeMembership(user.getUsername()); info(getString("user-membership-removed", model)); localList.removeAll(); target.addComponent(localList); From helpdesk at onehippo.com Mon Jan 5 11:19:41 2009 From: helpdesk at onehippo.com (JIRA (Bart van der Schans)) Date: Mon Jan 5 11:18:41 2009 Subject: [HippoRepos-dev] [JIRA] Resolved: (HREPTWO-2110) branch doesn't build In-Reply-To: <11682062.1231149581825.JavaMail.root@hat01> Message-ID: <8028648.1231150781849.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-2110?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Bart van der Schans resolved HREPTWO-2110. ------------------------------------------ Resolution: Fixed Some files failed the commit from the backport. :-( > branch doesn't build > -------------------- > > Key: HREPTWO-2110 > URL: http://issues.onehippo.org/browse/HREPTWO-2110 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.02.00 (m09) > Reporter: Frank van Lankvelt > Assignee: Bart van der Schans > Priority: Blocker > Fix For: r2.02.xx (m9 update) > > > I'm getting the following error in a mvn build of the branch: > [ERROR] BUILD FAILURE > [INFO] ------------------------------------------------------------------------ > [INFO] Compilation failure > /home/frnk/Hippo/hippo-ecm-2_02_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/ListGroupsPanel.java:[74,43] cannot find symbol > symbol: class ViewGroupPanel > return new ViewGroupPanel(componentId, context, breadCrumbModel, model); > /home/frnk/Hippo/hippo-ecm-2_02_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/groups/ListGroupsPanel.java:[74,43] cannot find symbol > symbol: class ViewGroupPanel > return new ViewGroupPanel(componentId, context, breadCrumbModel, model); -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From j.reijn at onehippo.com Mon Jan 5 11:20:12 2009 From: j.reijn at onehippo.com (Jeroen Reijn) Date: Mon Jan 5 11:19:18 2009 Subject: [HippoRepos-dev] Getting started questions In-Reply-To: References: Message-ID: <21287684.post@talk.nabble.com> Hi Seth, I'm afraid both quickstart wars are quite old. You will be missing out a lot compared to the new versions. I'll try and see if I can fix that though and put some new wars online. The problem here is that the documentation changed during some release cycles and that one essential step was removed. Try adding the java transaction jar[1] file to $TOMCATDIR/lib in case you're using Tomcat. If you are using another Application container, there should be a similar lib folder. [1]http://repo1.maven.org/maven/geronimo-spec/jars/geronimo-spec-jta-1.0-M1.jar Kind regards, Jeroen Reijn Seth Gottlieb-3 wrote: > > > When I started to play around with the Hippo Site Toolkit downloads > (http://docs.onehippo.org/site-toolkit/), I got all these internal > errors that seem to trace back to NoClassDef Errors: > > Any ideas? > > Thanks, > > Seth > > =============================== > -- View this message in context: http://www.nabble.com/Getting-started-questions-tp21254002p21287684.html Sent from the Hippo Repository development public mailinglist mailing list archive at Nabble.com. From b.vanhalderen at hippo.nl Mon Jan 5 11:32:34 2009 From: b.vanhalderen at hippo.nl ((Berry) A.W. van Halderen) Date: Mon Jan 5 11:28:38 2009 Subject: [HippoRepos-dev] Getting started questions In-Reply-To: <21287684.post@talk.nabble.com> References: <21287684.post@talk.nabble.com> Message-ID: <20090105103234.GC10397@had13.hippointern.lan> On Mon, Jan 05, 2009 at 02:20:12AM -0800, Jeroen Reijn wrote: > Try adding the java transaction jar[1] file to $TOMCATDIR/lib in case you're > using Tomcat. If you are using another Application container, there should > be a similar lib folder. > > [1]http://repo1.maven.org/maven/geronimo-spec/jars/geronimo-spec-jta-1.0-M1.jar > To be complete; the specifications for application containers dictate that the JTA interface must be present in the application container and may not even be present in applications. Websphere and glassfish, a.o., will (rightfully) refuse applications which have such a jar in them. Glassfish, being just a servlet container i.s.o. an application container just needs it. With kind regards, Berry van Halderen -- Berry A.W. van Halderen b.vanhalderen@onehippo.com / berry@halderen.net Disclaimer: the above is the author's personal opinion and is not the opinion or policy of his employer or of the little green men that have been following him all day. From helpdesk at onehippo.com Mon Jan 5 11:49:41 2009 From: helpdesk at onehippo.com (JIRA (Arje Cahn)) Date: Mon Jan 5 11:48:41 2009 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-2080) dutch word in English version In-Reply-To: <22618982.1230656381843.JavaMail.root@hat01> Message-ID: <31872643.1231152581973.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-2080?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Arje Cahn updated HREPTWO-2080: ------------------------------- Fix Version/s: r2.03.xx (m10 - scalability) > dutch word in English version > ----------------------------- > > Key: HREPTWO-2080 > URL: http://issues.onehippo.org/browse/HREPTWO-2080 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.03.xx (m10 - scalability) > Environment: Hippo CMS version 2.03.00-SNAPSHOT build 15649 > Reporter: Rita Bijlsma > Fix For: r2.03.xx (m10 - scalability) > > Attachments: bug_dutch_word_in_en.png > > > 'sluit' button in 'update all content' popup window -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Jan 5 11:53:41 2009 From: helpdesk at onehippo.com (JIRA (Arje Cahn)) Date: Mon Jan 5 11:52:40 2009 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-2080) Add i18n translations for "Close" button In-Reply-To: <22618982.1230656381843.JavaMail.root@hat01> Message-ID: <1405298.1231152821831.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-2080?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Arje Cahn updated HREPTWO-2080: ------------------------------- Summary: Add i18n translations for "Close" button (was: dutch word in English version) > Add i18n translations for "Close" button > ---------------------------------------- > > Key: HREPTWO-2080 > URL: http://issues.onehippo.org/browse/HREPTWO-2080 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.03.xx (m10 - scalability) > Environment: Hippo CMS version 2.03.00-SNAPSHOT build 15649 > Reporter: Rita Bijlsma > Fix For: r2.03.xx (m10 - scalability) > > Attachments: bug_dutch_word_in_en.png > > > 'sluit' button in 'update all content' popup window -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Jan 5 11:55:41 2009 From: helpdesk at onehippo.com (JIRA (Arje Cahn)) Date: Mon Jan 5 11:54:40 2009 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-2080) Add i18n translations for "Close" button In-Reply-To: <22618982.1230656381843.JavaMail.root@hat01> Message-ID: <3631605.1231152941963.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-2080?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Arje Cahn updated HREPTWO-2080: ------------------------------- Assignee: (Berry) A.W. van Halderen > Add i18n translations for "Close" button > ---------------------------------------- > > Key: HREPTWO-2080 > URL: http://issues.onehippo.org/browse/HREPTWO-2080 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.03.xx (m10 - scalability) > Environment: Hippo CMS version 2.03.00-SNAPSHOT build 15649 > Reporter: Rita Bijlsma > Assignee: (Berry) A.W. van Halderen > Fix For: r2.03.xx (m10 - scalability) > > Attachments: bug_dutch_word_in_en.png > > > 'sluit' button in 'update all content' popup window -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Jan 5 11:59:41 2009 From: helpdesk at onehippo.com (JIRA ((Berry) A.W. van Halderen)) Date: Mon Jan 5 11:58:41 2009 Subject: [HippoRepos-dev] [JIRA] Resolved: (HREPTWO-2080) Add i18n translations for "Close" button In-Reply-To: <22618982.1230656381843.JavaMail.root@hat01> Message-ID: <9658286.1231153181935.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-2080?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] (Berry) A.W. van Halderen resolved HREPTWO-2080. ------------------------------------------------ Fix Version/s: r2.02.xx (m9 update) Resolution: Fixed Fixes by means of commit on HREPTWO-2102. "Sluit" is a dutch word, meaning "close" in english. > Add i18n translations for "Close" button > ---------------------------------------- > > Key: HREPTWO-2080 > URL: http://issues.onehippo.org/browse/HREPTWO-2080 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.03.xx (m10 - scalability) > Environment: Hippo CMS version 2.03.00-SNAPSHOT build 15649 > Reporter: Rita Bijlsma > Assignee: (Berry) A.W. van Halderen > Fix For: r2.02.xx (m9 update), r2.03.xx (m10 - scalability) > > Attachments: bug_dutch_word_in_en.png > > > 'sluit' button in 'update all content' popup window -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Jan 5 12:37:41 2009 From: helpdesk at onehippo.com (JIRA (Rita Bijlsma)) Date: Mon Jan 5 12:36:40 2009 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-2111) unclear node export window in console Message-ID: <11766232.1231155461830.JavaMail.root@hat01> unclear node export window in console ------------------------------------- Key: HREPTWO-2111 URL: http://issues.onehippo.org/browse/HREPTWO-2111 Project: Hippo Repository 2 Issue Type: Bug Components: user experience Affects Versions: r2.03.xx (m10 - scalability) Environment: Hippo CMS version 2.03.00-SNAPSHOT build 15685 Reporter: Rita Bijlsma Attachments: Unclear node export window in console .png In the window, it is unclear that 'download' and 'view' are actions to choose from, as they are not rendered as buttons. It is also unclear that the button on the lower right just closes the window, canceling the intended export, as that button is marked with 'OK'. I was thinking that I was saying OK to exporting. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Jan 5 12:37:41 2009 From: helpdesk at onehippo.com (JIRA (Rita Bijlsma)) Date: Mon Jan 5 12:36:41 2009 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-2111) unclear node export window in console In-Reply-To: <11766232.1231155461830.JavaMail.root@hat01> Message-ID: <16540782.1231155461879.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-2111?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Rita Bijlsma updated HREPTWO-2111: ---------------------------------- Attachment: Unclear node export window in console .png > unclear node export window in console > ------------------------------------- > > Key: HREPTWO-2111 > URL: http://issues.onehippo.org/browse/HREPTWO-2111 > Project: Hippo Repository 2 > Issue Type: Bug > Components: user experience > Affects Versions: r2.03.xx (m10 - scalability) > Environment: Hippo CMS version 2.03.00-SNAPSHOT build 15685 > Reporter: Rita Bijlsma > Attachments: Unclear node export window in console .png > > > In the window, it is unclear that 'download' and 'view' are actions to choose from, as they are not rendered as buttons. > It is also unclear that the button on the lower right just closes the window, canceling the intended export, as that button is marked with 'OK'. > I was thinking that I was saying OK to exporting. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Jan 5 13:39:42 2009 From: helpdesk at onehippo.com (JIRA (Ard Schrijvers)) Date: Mon Jan 5 13:38:42 2009 Subject: [HippoRepos-dev] [JIRA] Work started: (HREPTWO-1738) Make CMS search on nodename too In-Reply-To: <21312549.1224067378668.JavaMail.jira@hat01> Message-ID: <32172638.1231159182775.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-1738?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Work on HREPTWO-1738 started by Ard Schrijvers. > Make CMS search on nodename too > ------------------------------- > > Key: HREPTWO-1738 > URL: http://issues.onehippo.org/browse/HREPTWO-1738 > Project: Hippo Repository 2 > Issue Type: Sub-task > Components: repository-core > Affects Versions: 2.01.00m06.4 > Reporter: Ard Schrijvers > Assignee: Ard Schrijvers > Priority: High > Fix For: r2.03.xx (m10 - scalability) > > Original Estimate: 2 hours > Remaining Estimate: 2 hours > > When searching on the nodename, you do not find hits in the cms when the nodename does not occur in the node's content. We have to add the nodename (decoded name??) to the fulltext index of a node -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From seth at contenthere.net Mon Jan 5 13:59:56 2009 From: seth at contenthere.net (Seth Gottlieb) Date: Mon Jan 5 13:59:03 2009 Subject: [HippoRepos-dev] Getting started questions In-Reply-To: <20090105103234.GC10397@had13.hippointern.lan> References: <21287684.post@talk.nabble.com> <20090105103234.GC10397@had13.hippointern.lan> Message-ID: Thanks! I am using Tomcat 6. I will try that JTA interface. --Seth On Mon, Jan 5, 2009 at 5:32 AM, (Berry) A.W. van Halderen wrote: > On Mon, Jan 05, 2009 at 02:20:12AM -0800, Jeroen Reijn wrote: >> Try adding the java transaction jar[1] file to $TOMCATDIR/lib in case you're >> using Tomcat. If you are using another Application container, there should >> be a similar lib folder. >> >> [1]http://repo1.maven.org/maven/geronimo-spec/jars/geronimo-spec-jta-1.0-M1.jar >> > > To be complete; the specifications for application containers dictate > that the JTA interface must be present in the application container and > may not even be present in applications. Websphere and glassfish, a.o., > will (rightfully) refuse applications which have such a jar in them. > > Glassfish, being just a servlet container i.s.o. an application container > just needs it. > > With kind regards, > Berry van Halderen > -- > Berry A.W. van Halderen b.vanhalderen@onehippo.com / berry@halderen.net > Disclaimer: the above is the author's personal opinion and is not the opinion > or policy of his employer or of the little green men that have been following > him all day. > _______________________________________________ > HippoRepos-dev mailing list > HippoRepos-dev@lists.hippo.nl > http://lists.hippo.nl/mailman/listinfo/hipporepos-dev > -- =============================== Seth Gottlieb Principal Content Here P.O. Box 60062 Florence, MA 01062 office: 857.488.4386 email: seth@contenthere.net web: http://www.contenthere.net =============================== From a.schrijvers at onehippo.com Mon Jan 5 15:24:35 2009 From: a.schrijvers at onehippo.com (Ard Schrijvers) Date: Mon Jan 5 15:23:35 2009 Subject: [HippoRepos-dev] Getting started questions In-Reply-To: <21287684.post@talk.nabble.com> References: <21287684.post@talk.nabble.com> Message-ID: Does this new distribution of the quickstart also have the suggested jvm settings from Seth of -Xms512m and -Xmx512m? Furthermore regarding the Hippo Site Toolkit, it might be not clear from the documentation, that this toolkit is not based on the quickstart. The quickstarts sole purpose is to have a quick up and running repository and cms and see what it can do. The site toolkit currently still needs to be used through the gettingstarted (which atm needs to be sync-ed with the latest hst developments though. It will be useable again in short notice) part in svn, which assembles some repository initialization content from a couple of projects, and needs to be build with maven2. This still needs to be finalized into an easy ready to deploy war. Regards Ard > > Hi Seth, > > I'm afraid both quickstart wars are quite old. You will be > missing out a lot compared to the new versions. I'll try and > see if I can fix that though and put some new wars online. > The problem here is that the documentation changed during > some release cycles and that one essential step was removed. > > Try adding the java transaction jar[1] file to $TOMCATDIR/lib > in case you're using Tomcat. If you are using another > Application container, there should be a similar lib folder. > > [1]http://repo1.maven.org/maven/geronimo-spec/jars/geronimo-sp > ec-jta-1.0-M1.jar > > Kind regards, > > Jeroen Reijn > > Seth Gottlieb-3 wrote: > > > > > > When I started to play around with the Hippo Site Toolkit downloads > > (http://docs.onehippo.org/site-toolkit/), I got all these internal > > errors that seem to trace back to NoClassDef Errors: > > > > Any ideas? > > > > Thanks, > > > > Seth > > > > =============================== > > > > -- > View this message in context: > http://www.nabble.com/Getting-started-questions-tp21254002p212 > 87684.html > Sent from the Hippo Repository development public mailinglist > mailing list archive at Nabble.com. > > _______________________________________________ > HippoRepos-dev mailing list > HippoRepos-dev@lists.hippo.nl > http://lists.hippo.nl/mailman/listinfo/hipporepos-dev > From j.reijn at onehippo.com Mon Jan 5 15:47:59 2009 From: j.reijn at onehippo.com (Jeroen Reijn) Date: Mon Jan 5 15:47:00 2009 Subject: [HippoRepos-dev] Getting started questions In-Reply-To: References: <21287684.post@talk.nabble.com> Message-ID: <49621D9F.8070508@onehippo.com> Ard Schrijvers wrote: > > Does this new distribution of the quickstart also have the suggested jvm > settings from Seth of -Xms512m and -Xmx512m? Keep in mind that the HST2 quick start is different from the Hippo ECM quickstart. See Seth's original email. They come from different locations. > > Furthermore regarding the Hippo Site Toolkit, it might be not clear from > the documentation, that this toolkit is not based on the quickstart. The > quickstarts sole purpose is to have a quick up and running repository > and cms and see what it can do. The site toolkit currently still needs > to be used through the gettingstarted (which atm needs to be sync-ed > with the latest hst developments though. It will be useable again in > short notice) part in svn, which assembles some repository > initialization content from a couple of projects, and needs to be build > with maven2. This still needs to be finalized into an easy ready to > deploy war. I'm currently working on that, so with the new release of the HST2, it will be compatible with CMS release m9 again. I'll send a message to this list once I'm finished. Regards, Jeroen > > Regards Ard > > >> Hi Seth, >> >> I'm afraid both quickstart wars are quite old. You will be >> missing out a lot compared to the new versions. I'll try and >> see if I can fix that though and put some new wars online. >> The problem here is that the documentation changed during >> some release cycles and that one essential step was removed. >> >> Try adding the java transaction jar[1] file to $TOMCATDIR/lib >> in case you're using Tomcat. If you are using another >> Application container, there should be a similar lib folder. >> >> [1]http://repo1.maven.org/maven/geronimo-spec/jars/geronimo-sp >> ec-jta-1.0-M1.jar >> >> Kind regards, >> >> Jeroen Reijn >> >> Seth Gottlieb-3 wrote: >>> >>> When I started to play around with the Hippo Site Toolkit downloads >>> (http://docs.onehippo.org/site-toolkit/), I got all these internal >>> errors that seem to trace back to NoClassDef Errors: >>> >>> Any ideas? >>> >>> Thanks, >>> >>> Seth >>> >>> =============================== >>> >> -- >> View this message in context: >> http://www.nabble.com/Getting-started-questions-tp21254002p212 >> 87684.html >> Sent from the Hippo Repository development public mailinglist >> mailing list archive at Nabble.com. >> >> _______________________________________________ >> HippoRepos-dev mailing list >> HippoRepos-dev@lists.hippo.nl >> http://lists.hippo.nl/mailman/listinfo/hipporepos-dev >> > _______________________________________________ > HippoRepos-dev mailing list > HippoRepos-dev@lists.hippo.nl > http://lists.hippo.nl/mailman/listinfo/hipporepos-dev From helpdesk at onehippo.com Mon Jan 5 17:18:41 2009 From: helpdesk at onehippo.com (JIRA (Rita Bijlsma)) Date: Mon Jan 5 17:17:39 2009 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-2112) calendar in schedule publication of document by contributor (author) fails Message-ID: <27652733.1231172321828.JavaMail.root@hat01> calendar in schedule publication of document by contributor (author) fails -------------------------------------------------------------------------- Key: HREPTWO-2112 URL: http://issues.onehippo.org/browse/HREPTWO-2112 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.03.xx (m10 - scalability) Environment: Hippo CMS version 2.03.00-SNAPSHOT build 15726 Reporter: Rita Bijlsma Clicking on the calendar icon does not popup the calendar and in the left bottom there is a message: Error on page. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Mon Jan 5 17:44:24 2009 From: svn-logs at hippocms.org (SVN (jtietema)) Date: Mon Jan 5 17:43:20 2009 Subject: [HippoRepos-dev] [15737] hippo-ecm: HREPTWO-1687 adding empty multivalued string resulted in NPE Message-ID: <20090105164424.72910C58C@svnnew.onehippo.org> Revision: 15737 Author: jtietema Date: 2009-01-05 17:44:23 +0100 (Mon, 05 Jan 2009) Log Message: ----------- HREPTWO-1687 adding empty multivalued string resulted in NPE Modified Paths: -------------- hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/property/PropertyDialog.java Modified: hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/property/PropertyDialog.java =================================================================== --- hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/property/PropertyDialog.java 2009-01-05 15:29:41 UTC (rev 15736) +++ hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/property/PropertyDialog.java 2009-01-05 16:44:23 UTC (rev 15737) @@ -76,7 +76,7 @@ Value jcrValue = getJcrValue(); if (isMultiple.booleanValue()) { - if (jcrValue == null || value.equals("")) { + if (jcrValue == null || value == null || value.equals("")) { jcrValue = ((UserSession) Session.get()).getJcrSession().getValueFactory().createValue("...", PropertyType.STRING); } From helpdesk at onehippo.com Mon Jan 5 17:45:41 2009 From: helpdesk at onehippo.com (JIRA (Jeroen Tietema)) Date: Mon Jan 5 17:44:40 2009 Subject: [HippoRepos-dev] [JIRA] Closed: (HREPTWO-1687) console: creating a multivalue property without values results in nullpointer In-Reply-To: <3433429.1223386318941.JavaMail.jira@hat01> Message-ID: <13122603.1231173941833.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-1687?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Jeroen Tietema closed HREPTWO-1687. ----------------------------------- Fix Version/s: r2.03.xx (m10 - scalability) (was: Backlog) Resolution: Fixed > console: creating a multivalue property without values results in nullpointer > ----------------------------------------------------------------------------- > > Key: HREPTWO-1687 > URL: http://issues.onehippo.org/browse/HREPTWO-1687 > Project: Hippo Repository 2 > Issue Type: Bug > Reporter: Jeroen Tietema > Assignee: Jeroen Tietema > Fix For: r2.03.xx (m10 - scalability) > > > Creating an multivalue property in the console without values results in a nullpointer exception. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Jan 5 18:20:42 2009 From: helpdesk at onehippo.com (JIRA (Rita Bijlsma)) Date: Mon Jan 5 18:19:40 2009 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-2113) Invisible document type in editor Message-ID: <17548986.1231176042300.JavaMail.root@hat01> Invisible document type in editor --------------------------------- Key: HREPTWO-2113 URL: http://issues.onehippo.org/browse/HREPTWO-2113 Project: Hippo Repository 2 Issue Type: Bug Components: front-end-core Affects Versions: r2.03.xx (m10 - scalability) Environment: Hippo CMS version 2.03.00-SNAPSHOT build 15726 Reporter: Rita Bijlsma Attachments: bug_document_type_invisible_in_editor.png - The information architect created a document type. - A new build was used. The repository had been kept in a separate place to be reused. * Everything was still there, documents and document type. !* However, the document type was invisible in the editor. !* Only the move up and down and delete buttons per element were visible. !* The buttons were shown horizontally in Firefox on Ubuntu and vertically in IE under Vista. That everything was OK exept from being invisible followed like this: - I added a few more elements to the document type. * The properties of the elements were visible at the right, but not in the actual editor region. - I used 'update all content', which was succesfull. * The new elements were added to the documents of that type, being visible there. - I removed the added elements from the document type, pressing the delete buttons that where in the right position in the order of button sets. - I used 'update all content' again and got success. * The added elements were correctly removed from the documents of that type. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Jan 5 18:20:42 2009 From: helpdesk at onehippo.com (JIRA (Rita Bijlsma)) Date: Mon Jan 5 18:19:41 2009 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-2113) Invisible document type in editor In-Reply-To: <17548986.1231176042300.JavaMail.root@hat01> Message-ID: <16296775.1231176042326.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-2113?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Rita Bijlsma updated HREPTWO-2113: ---------------------------------- Attachment: bug_document_type_invisible_in_editor.png > Invisible document type in editor > --------------------------------- > > Key: HREPTWO-2113 > URL: http://issues.onehippo.org/browse/HREPTWO-2113 > Project: Hippo Repository 2 > Issue Type: Bug > Components: front-end-core > Affects Versions: r2.03.xx (m10 - scalability) > Environment: Hippo CMS version 2.03.00-SNAPSHOT build 15726 > Reporter: Rita Bijlsma > Attachments: bug_document_type_invisible_in_editor.png > > > - The information architect created a document type. > - A new build was used. The repository had been kept in a separate place to be reused. > * Everything was still there, documents and document type. > !* However, the document type was invisible in the editor. > !* Only the move up and down and delete buttons per element were visible. > !* The buttons were shown horizontally in Firefox on Ubuntu and vertically in IE under Vista. > That everything was OK exept from being invisible followed like this: > - I added a few more elements to the document type. > * The properties of the elements were visible at the right, but not in the actual editor region. > - I used 'update all content', which was succesfull. > * The new elements were added to the documents of that type, being visible there. > - I removed the added elements from the document type, pressing the delete buttons that where in the right position in the order of button sets. > - I used 'update all content' again and got success. > * The added elements were correctly removed from the documents of that type. > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Jan 5 18:22:41 2009 From: helpdesk at onehippo.com (JIRA (Rita Bijlsma)) Date: Mon Jan 5 18:21:40 2009 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-2113) Invisible document type in editor In-Reply-To: <17548986.1231176042300.JavaMail.root@hat01> Message-ID: <29821596.1231176161814.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-2113?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Rita Bijlsma updated HREPTWO-2113: ---------------------------------- Component/s: user experience (was: front-end-core) > Invisible document type in editor > --------------------------------- > > Key: HREPTWO-2113 > URL: http://issues.onehippo.org/browse/HREPTWO-2113 > Project: Hippo Repository 2 > Issue Type: Bug > Components: user experience > Affects Versions: r2.03.xx (m10 - scalability) > Environment: Hippo CMS version 2.03.00-SNAPSHOT build 15726 > Reporter: Rita Bijlsma > Attachments: bug_document_type_invisible_in_editor.png > > > - The information architect created a document type. > - A new build was used. The repository had been kept in a separate place to be reused. > * Everything was still there, documents and document type. > !* However, the document type was invisible in the editor. > !* Only the move up and down and delete buttons per element were visible. > !* The buttons were shown horizontally in Firefox on Ubuntu and vertically in IE under Vista. > That everything was OK exept from being invisible followed like this: > - I added a few more elements to the document type. > * The properties of the elements were visible at the right, but not in the actual editor region. > - I used 'update all content', which was succesfull. > * The new elements were added to the documents of that type, being visible there. > - I removed the added elements from the document type, pressing the delete buttons that where in the right position in the order of button sets. > - I used 'update all content' again and got success. > * The added elements were correctly removed from the documents of that type. > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Jan 5 18:26:42 2009 From: helpdesk at onehippo.com (JIRA (Rita Bijlsma)) Date: Mon Jan 5 18:25:40 2009 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-2114) The admin todo list shows editor's todo's Message-ID: <31158252.1231176402276.JavaMail.root@hat01> The admin todo list shows editor's todo's ----------------------------------------- Key: HREPTWO-2114 URL: http://issues.onehippo.org/browse/HREPTWO-2114 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.03.xx (m10 - scalability) Environment: Hippo CMS version 2.03.00-SNAPSHOT build 15726 Reporter: Rita Bijlsma It's requests for scheduling publication and deletions. Of course also the editor's todo list shows them. This makes it unclear who should do it. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Jan 5 19:13:41 2009 From: helpdesk at onehippo.com (JIRA (Rita Bijlsma)) Date: Mon Jan 5 19:12:40 2009 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-2115) ghost todo items: request for deletion of non-existing documents Message-ID: <15400970.1231179221823.JavaMail.root@hat01> ghost todo items: request for deletion of non-existing documents ---------------------------------------------------------------- Key: HREPTWO-2115 URL: http://issues.onehippo.org/browse/HREPTWO-2115 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.03.xx (m10 - scalability) Environment: Hippo CMS version 2.03.00-SNAPSHOT build 15726 Reporter: Rita Bijlsma - An contributor (author) requested deletion of a document. - The editor deleted it via the direct way, going to the document via the folder, not via the todo list. - Pressing the delete button, not the accept delete request button. !* The request stays in the todo list, even after logout and login in. !* The only way to remove this ghost request is via the console. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Jan 6 10:25:41 2009 From: helpdesk at onehippo.com (JIRA (Rita Bijlsma)) Date: Tue Jan 6 10:24:39 2009 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-2116) NPE at 'update all content' when same path used in multiple fields Message-ID: <5477964.1231233941824.JavaMail.root@hat01> NPE at 'update all content' when same path used in multiple fields ------------------------------------------------------------------ Key: HREPTWO-2116 URL: http://issues.onehippo.org/browse/HREPTWO-2116 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.03.xx (m10 - scalability) Environment: Hippo CMS version 2.03.00-SNAPSHOT build 15726 Reporter: Rita Bijlsma - The inar (information architect) edits a document type. !- The inar makes an error: she adds two elements with the same path and type. For example two strings with path snp:string. - The inar tries to save and close. * Error message: Path snp:string is used in multiple fields !* After a short while, the errormessage disappears automatically. - The inar now does 'update all content' !* At the end of the 'update all content' process a NPE is presented inside of the update window. The process is said to be successful. - A document of the edited type is inspected by the user. * The added elements of the same path where successfully added to the document. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Tue Jan 6 10:40:47 2009 From: svn-logs at hippocms.org (SVN (aschrijvers)) Date: Tue Jan 6 10:39:44 2009 Subject: [HippoRepos-dev] [15738] hippo-ecm: HREPTWO-16 trivial comment Message-ID: <20090106094048.61718C58C@svnnew.onehippo.org> Revision: 15738 Author: aschrijvers Date: 2009-01-06 10:40:45 +0100 (Tue, 06 Jan 2009) Log Message: ----------- HREPTWO-16 trivial comment Modified Paths: -------------- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/FacetedNavigationEngineThirdImpl.java Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/FacetedNavigationEngineThirdImpl.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/FacetedNavigationEngineThirdImpl.java 2009-01-05 16:44:23 UTC (rev 15737) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/FacetedNavigationEngineThirdImpl.java 2009-01-06 09:40:45 UTC (rev 15738) @@ -152,7 +152,7 @@ (ServicingIndexingConfiguration) getIndexingConfig()); /* - * initialQuery: get the query for initialQuery + * initialQuery: get the query for initialQuery. This is the hippo:docbase value. */ org.apache.lucene.search.Query initialLuceneQuery = null; if (initialQuery != null && !initialQuery.xpath.equals("")) { @@ -165,7 +165,6 @@ */ BooleanQuery searchQuery = new BooleanQuery(true); - if (facetsQuery.getQuery().clauses().size() > 0) { searchQuery.add(facetsQuery.getQuery(), Occur.MUST); } @@ -184,7 +183,7 @@ try { /* * if getIndexReader(true) you will also get version storage index which - * cannot be used for facet searches, therefore set 'false' + * should not be used for facet searches, therefore set 'false' */ //indexReader = getIndex().getIndexReader(); indexReader = getIndexReader(false); @@ -219,6 +218,7 @@ searcher.search(searchQuery, collector); // set the numHits value collector.setNumhits(numHits); + if (log.isDebugEnabled()) { log.debug("lucene query with collector took: \t" + (System.currentTimeMillis() - start) + " ms for #" + collector.getNumhits() + ". Query: " + searchQuery.toString()); From helpdesk at onehippo.com Tue Jan 6 10:44:42 2009 From: helpdesk at onehippo.com (JIRA (Ard Schrijvers)) Date: Tue Jan 6 10:43:39 2009 Subject: [HippoRepos-dev] [JIRA] Work logged: (HREPTWO-1738) Make CMS search on nodename too In-Reply-To: <21312549.1224067378668.JavaMail.jira@hat01> Message-ID: <26921254.1231235082503.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-1738?page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#action_28484 ] Ard Schrijvers logged work on HREPTWO-1738: ------------------------------------------- Author: Ard Schrijvers Created on: 06/Jan/09 10:42 AM Start Date: 05/Jan/09 10:42 AM Worklog Time Spent: 2 hours Issue Time Tracking ------------------- Remaining Estimate: 0 minutes (was: 2 hours) Time Spent: 2 hours > Make CMS search on nodename too > ------------------------------- > > Key: HREPTWO-1738 > URL: http://issues.onehippo.org/browse/HREPTWO-1738 > Project: Hippo Repository 2 > Issue Type: Sub-task > Components: repository-core > Affects Versions: 2.01.00m06.4 > Reporter: Ard Schrijvers > Assignee: Ard Schrijvers > Priority: High > Fix For: r2.03.xx (m10 - scalability) > > Original Estimate: 2 hours > Time Spent: 2 hours > Remaining Estimate: 0 minutes > > When searching on the nodename, you do not find hits in the cms when the nodename does not occur in the node's content. We have to add the nodename (decoded name??) to the fulltext index of a node -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Jan 6 10:44:42 2009 From: helpdesk at onehippo.com (JIRA (Ard Schrijvers)) Date: Tue Jan 6 10:43:39 2009 Subject: [HippoRepos-dev] [JIRA] Work logged: (HREPTWO-2090) Enable searching on nodename In-Reply-To: <24338727.1230723162205.JavaMail.root@hat01> Message-ID: <28203516.1231235082669.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-2090?page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#action_28485 ] Ard Schrijvers logged work on HREPTWO-2090: ------------------------------------------- Author: Ard Schrijvers Created on: 06/Jan/09 10:43 AM Start Date: 05/Jan/09 10:42 AM Worklog Time Spent: 3 hours, 45 minutes Issue Time Tracking ------------------- Remaining Estimate: 0 minutes (was: 2 hours) Time Spent: 1 day, 1 hour, 45 minutes (was: 6 hours) > Enable searching on nodename > ---------------------------- > > Key: HREPTWO-2090 > URL: http://issues.onehippo.org/browse/HREPTWO-2090 > Project: Hippo Repository 2 > Issue Type: Sub-task > Components: repository-core > Affects Versions: r2.02.00 (m09) > Reporter: Ard Schrijvers > Assignee: Ard Schrijvers > Fix For: r2.03.xx (m10 - scalability) > > Time Spent: 1 day, 1 hour, 45 minutes > Remaining Estimate: 0 minutes > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Jan 6 10:46:41 2009 From: helpdesk at onehippo.com (JIRA (Frank van Lankvelt)) Date: Tue Jan 6 10:45:37 2009 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-2117) Disable CMS for some user accounts Message-ID: <24419999.1231235201795.JavaMail.root@hat01> Disable CMS for some user accounts ---------------------------------- Key: HREPTWO-2117 URL: http://issues.onehippo.org/browse/HREPTWO-2117 Project: Hippo Repository 2 Issue Type: New Feature Reporter: Frank van Lankvelt It should be possible to disable the cms for user accounts that don't have access to /content. Likewise, the console should only be accessible to users with the admin role. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Tue Jan 6 10:57:04 2009 From: svn-logs at hippocms.org (SVN (aschrijvers)) Date: Tue Jan 6 10:56:00 2009 Subject: [HippoRepos-dev] [15739] hippo-ecm: HREPTWO-2090, HREPTWO-1738 with @hippo: _localname property you can search on nodenames specifically. Message-ID: <20090106095704.CC2B2C589@svnnew.onehippo.org> Revision: 15739 Author: aschrijvers Date: 2009-01-06 10:57:04 +0100 (Tue, 06 Jan 2009) Log Message: ----------- HREPTWO-2090, HREPTWO-1738 with @hippo:_localname property you can search on nodenames specifically. Nodename is now also nodescope included, so jcr:contains(.,'foo') also searches in nodename, and jcr:contains(@hippo:_localname,'foo') only search in nodename (local nodename as the name indicates) Modified Paths: -------------- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/query/lucene/ServicingNodeIndexer.java Added Paths: ----------- hippo-ecm/trunk/repository/engine/src/test/java/org/hippoecm/repository/SearchOnNodeNameTest.java Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/query/lucene/ServicingNodeIndexer.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/query/lucene/ServicingNodeIndexer.java 2009-01-06 09:40:45 UTC (rev 15738) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/query/lucene/ServicingNodeIndexer.java 2009-01-06 09:57:04 UTC (rev 15739) @@ -25,6 +25,7 @@ import org.apache.jackrabbit.core.PropertyId; import org.apache.jackrabbit.core.query.QueryHandlerContext; import org.apache.jackrabbit.core.query.lucene.DoubleField; +import org.apache.jackrabbit.core.query.lucene.FieldNames; import org.apache.jackrabbit.core.query.lucene.LongField; import org.apache.jackrabbit.core.query.lucene.NamespaceMappings; import org.apache.jackrabbit.core.query.lucene.NodeIndexer; @@ -35,12 +36,15 @@ import org.apache.jackrabbit.core.value.InternalValue; import org.apache.jackrabbit.extractor.TextExtractor; import org.apache.jackrabbit.spi.Name; +import org.apache.jackrabbit.spi.NameFactory; +import org.apache.jackrabbit.spi.commons.conversion.IllegalNameException; import org.apache.jackrabbit.spi.commons.name.NameConstants; import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; import org.apache.lucene.document.DateTools; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.hippoecm.repository.api.HippoNodeType; +import org.hippoecm.repository.api.ISO9075Helper; import org.hippoecm.repository.jackrabbit.FacetTypeConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,8 +56,17 @@ /** The logger instance for this class */ private static final Logger log = LoggerFactory.getLogger(ServicingNodeIndexer.class); + /** + * Hardcoded nodescope indexing exluded properties. Currently hippo:paths + */ private Name excludeName; + /** + * The hippo namespace, derived from the prefix 'hippo', hence still valid after bumbing the hippo namespace to a next version + */ + private String hippo_ns; + + /** * The indexing configuration or null if none is available. */ protected ServicingIndexingConfiguration servicingIndexingConfig; @@ -66,10 +79,10 @@ try { String name = HippoNodeType.HIPPO_PATHS.substring(HippoNodeType.HIPPO_PATHS.indexOf(":")+1); String prefix = HippoNodeType.HIPPO_PATHS.substring(0,HippoNodeType.HIPPO_PATHS.indexOf(":")); - String hippo_ns = this.queryHandlerContext.getNamespaceRegistry().getURI(prefix); + hippo_ns = this.queryHandlerContext.getNamespaceRegistry().getURI(prefix); excludeName = NameFactoryImpl.getInstance().create(hippo_ns,name); } catch (NamespaceException e1) { - log.warn("Error creating exclude name for hippo:paths"); + log.warn("Error creating exclude name for hippo:paths ", e1.getMessage()); } } @@ -98,6 +111,7 @@ // TODO : only index facets for hippo:document + subtypes try{ + if (node.getParentId() == null) { // root node } else { @@ -108,11 +122,21 @@ "for node with id: " + node.getNodeId()); } String nodename = child.getName().getLocalName(); + String prefix = null; if(child.getName().getNamespaceURI() != null && !"".equals(child.getName().getNamespaceURI())) { - String prefix = queryHandlerContext.getNamespaceRegistry().getPrefix(child.getName().getNamespaceURI()); + prefix = queryHandlerContext.getNamespaceRegistry().getPrefix(child.getName().getNamespaceURI()); nodename = prefix+":"+nodename; } + // index the nodename to sort on doc.add(new Field(ServicingFieldNames.HIPPO_SORTABLE_NODENAME, nodename , Field.Store.NO, Field.Index.NO_NORMS, Field.TermVector.NO)); + + /** + * index the nodename to search on. We index this as hippo:_localname, a pseudo property which does not really exist but + * only meant to search on + */ + + indexNodeName(doc, prefix ,child.getName().getLocalName()); + } } catch (ItemStateException e) { throwRepositoryException(e); @@ -142,6 +166,33 @@ return doc; } + + private void indexNodeName(Document doc, String prefix, String localName) { + // simple String + String hippo_ns_prefix = null; + try { + hippo_ns_prefix = this.mappings.getPrefix(hippo_ns); + } catch (NamespaceException e) { + log.warn("Cannot get 'hippo' lucene prefix. ", e.getMessage()); + return; + } + String fieldName = hippo_ns_prefix + ":" + FieldNames.FULLTEXT_PREFIX + "_localname"; + Field localNameField = new Field(fieldName, localName, Field.Store.NO, Field.Index.TOKENIZED, Field.TermVector.NO); + localNameField.setBoost(5); + doc.add(localNameField); + + // also create fulltext index of this value + Field localNameFullTextField; + if (supportHighlighting) { + localNameFullTextField = new Field(FieldNames.FULLTEXT, localName, Field.Store.NO, Field.Index.TOKENIZED, + Field.TermVector.WITH_OFFSETS); + } else { + localNameFullTextField = new Field(FieldNames.FULLTEXT, localName, Field.Store.NO, Field.Index.TOKENIZED, + Field.TermVector.NO); + } + doc.add(localNameFullTextField); + } + // below: When the QName is configured to be a facet, also index like one private void addValue(Document doc, InternalValue value, Name name) { String fieldName = name.getLocalName(); Added: hippo-ecm/trunk/repository/engine/src/test/java/org/hippoecm/repository/SearchOnNodeNameTest.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/test/java/org/hippoecm/repository/SearchOnNodeNameTest.java (rev 0) +++ hippo-ecm/trunk/repository/engine/src/test/java/org/hippoecm/repository/SearchOnNodeNameTest.java 2009-01-06 09:57:04 UTC (rev 15739) @@ -0,0 +1,96 @@ +package org.hippoecm.repository; + +import static org.junit.Assert.assertTrue; + +import java.util.ArrayList; +import java.util.List; + +import javax.jcr.Node; +import javax.jcr.RepositoryException; +import javax.jcr.query.QueryResult; + +import org.junit.Before; +import org.junit.Test; + +public class SearchOnNodeNameTest extends TestCase { + @SuppressWarnings("unused") + + private final static String TEST_PATH = "testnodes"; + private Node testPath; + + private final static List names = new ArrayList(); + + static { + names.add("foobarlux"); + names.add("fooluxbar"); + names.add("barfoolux"); + names.add("barluxfoo"); + names.add("luxbarfoo"); + names.add("luxfoo bar"); + } + + @Override + @Before + public void setUp() throws Exception { + super.setUp(); + if (session.getRootNode().hasNode(TEST_PATH)) { + session.getRootNode().getNode(TEST_PATH).remove(); + } + testPath = session.getRootNode().addNode(TEST_PATH); + session.save(); + } + + + @Test + public void testSearchNodeNameInNodeScope() throws RepositoryException { + for (String name : names) { + testPath.addNode(name); + } + session.save(); + String xpath = "//*[jcr:contains(.,'luxfoo')]"; + QueryResult queryResult = session.getWorkspace().getQueryManager().createQuery(xpath, "xpath").execute(); + + assertTrue(queryResult.getNodes().getSize() > 0); + + } + + @Test + public void testSearchNodeNameInProp() throws RepositoryException { + for (String name : names) { + testPath.addNode(name); + } + session.save(); + String xpath = "//*[jcr:contains(@hippo:_localname,'luxfoo')]"; + QueryResult queryResult = session.getWorkspace().getQueryManager().createQuery(xpath, "xpath").execute(); + + assertTrue(queryResult.getNodes().getSize() > 0); + + } + + + @Test + public void testSearchWildcardNodeNameInProp() throws RepositoryException { + for (String name : names) { + testPath.addNode(name); + } + session.save(); + String xpath = "//*[jcr:contains(@hippo:_localname,'luxfoo*')]"; + QueryResult queryResult = session.getWorkspace().getQueryManager().createQuery(xpath, "xpath").execute(); + + assertTrue(queryResult.getNodes().getSize() > 0); + } + + @Test + public void testSearchWildcardNodeNameInNodeScope() throws RepositoryException { + for (String name : names) { + testPath.addNode(name); + } + session.save(); + String xpath = "//*[jcr:contains(.,'luxfoo*')]"; + QueryResult queryResult = session.getWorkspace().getQueryManager().createQuery(xpath, "xpath").execute(); + + assertTrue(queryResult.getNodes().getSize() > 0); + + } + +} Property changes on: hippo-ecm/trunk/repository/engine/src/test/java/org/hippoecm/repository/SearchOnNodeNameTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Id Added: svn:eol-style + native From helpdesk at onehippo.com Tue Jan 6 11:02:42 2009 From: helpdesk at onehippo.com (JIRA (Ard Schrijvers)) Date: Tue Jan 6 11:01:40 2009 Subject: [HippoRepos-dev] [JIRA] Resolved: (HREPTWO-1738) Make CMS search on nodename too In-Reply-To: <21312549.1224067378668.JavaMail.jira@hat01> Message-ID: <9689845.1231236162475.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-1738?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Ard Schrijvers resolved HREPTWO-1738. ------------------------------------- Resolution: Fixed > Make CMS search on nodename too > ------------------------------- > > Key: HREPTWO-1738 > URL: http://issues.onehippo.org/browse/HREPTWO-1738 > Project: Hippo Repository 2 > Issue Type: Sub-task > Components: repository-core > Affects Versions: 2.01.00m06.4 > Reporter: Ard Schrijvers > Assignee: Ard Schrijvers > Priority: High > Fix For: r2.03.xx (m10 - scalability) > > Original Estimate: 2 hours > Time Spent: 2 hours > Remaining Estimate: 0 minutes > > When searching on the nodename, you do not find hits in the cms when the nodename does not occur in the node's content. We have to add the nodename (decoded name??) to the fulltext index of a node -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Jan 6 11:02:42 2009 From: helpdesk at onehippo.com (JIRA (Ard Schrijvers)) Date: Tue Jan 6 11:01:41 2009 Subject: [HippoRepos-dev] [JIRA] Resolved: (HREPTWO-2090) Enable searching on nodename In-Reply-To: <24338727.1230723162205.JavaMail.root@hat01> Message-ID: <24669293.1231236162540.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-2090?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Ard Schrijvers resolved HREPTWO-2090. ------------------------------------- Resolution: Fixed > Enable searching on nodename > ---------------------------- > > Key: HREPTWO-2090 > URL: http://issues.onehippo.org/browse/HREPTWO-2090 > Project: Hippo Repository 2 > Issue Type: Sub-task > Components: repository-core > Affects Versions: r2.02.00 (m09) > Reporter: Ard Schrijvers > Assignee: Ard Schrijvers > Fix For: r2.03.xx (m10 - scalability) > > Time Spent: 1 day, 1 hour, 45 minutes > Remaining Estimate: 0 minutes > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Tue Jan 6 11:33:29 2009 From: svn-logs at hippocms.org (SVN (rbijlsma)) Date: Tue Jan 6 11:32:25 2009 Subject: [HippoRepos-dev] [15740] hippo-ecm/tags/Tag-HREPTWO-v2_02_01/src/site/site.xml: HREPTWODOCS-82 removed SNAPSHOT from skin version. Message-ID: <20090106103329.95FEDC535@svnnew.onehippo.org> Revision: 15740 Author: rbijlsma Date: 2009-01-06 11:33:28 +0100 (Tue, 06 Jan 2009) Log Message: ----------- HREPTWODOCS-82 removed SNAPSHOT from skin version. Modified Paths: -------------- hippo-ecm/tags/Tag-HREPTWO-v2_02_01/src/site/site.xml Modified: hippo-ecm/tags/Tag-HREPTWO-v2_02_01/src/site/site.xml =================================================================== --- hippo-ecm/tags/Tag-HREPTWO-v2_02_01/src/site/site.xml 2009-01-06 09:57:04 UTC (rev 15739) +++ hippo-ecm/tags/Tag-HREPTWO-v2_02_01/src/site/site.xml 2009-01-06 10:33:28 UTC (rev 15740) @@ -25,7 +25,7 @@ org.onehippo.ecm.skin maven-skin - 1.01.05-SNAPSHOT + 1.01.05 hippo:workflowcategory Modified: hippo-ecm/trunk/addon/sample/test/pom.xml =================================================================== --- hippo-ecm/trunk/addon/sample/test/pom.xml 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/addon/sample/test/pom.xml 2009-01-07 11:46:35 UTC (rev 15762) @@ -72,6 +72,12 @@ test + + junit + junit + test + + com.atomikos Modified: hippo-ecm/trunk/addon/sample/test/src/test/java/org/hippoecm/repository/sample/SamplePersistencyTest.java =================================================================== --- hippo-ecm/trunk/addon/sample/test/src/test/java/org/hippoecm/repository/sample/SamplePersistencyTest.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/addon/sample/test/src/test/java/org/hippoecm/repository/sample/SamplePersistencyTest.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -20,7 +20,8 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; -import junit.framework.TestCase; +import org.junit.*; +import static org.junit.Assert.*; import org.hippoecm.repository.HippoRepository; import org.hippoecm.repository.HippoRepositoryFactory; @@ -28,24 +29,25 @@ import org.hippoecm.repository.api.DocumentManager; import org.hippoecm.repository.api.HippoWorkspace; -public class SamplePersistencyTest extends TestCase { +public class SamplePersistencyTest { @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; private HippoRepository server; - @Override + @Before public void setUp() throws RepositoryException, IOException { server = HippoRepositoryFactory.getHippoRepository(); SampleWorkflowSetup.commonStart(server); } - @Override + @After public void tearDown() throws RepositoryException { SampleWorkflowSetup.commonEnd(server); server.close(); } + @Test public void testAuthorDocument() throws RepositoryException { Session session = server.login("dummy","dummy".toCharArray()); Modified: hippo-ecm/trunk/addon/sample/test/src/test/java/org/hippoecm/repository/sample/SampleWorkflowTest.java =================================================================== --- hippo-ecm/trunk/addon/sample/test/src/test/java/org/hippoecm/repository/sample/SampleWorkflowTest.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/addon/sample/test/src/test/java/org/hippoecm/repository/sample/SampleWorkflowTest.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -27,7 +27,8 @@ import javax.transaction.TransactionManager; import javax.transaction.UserTransaction; -import junit.framework.TestCase; +import org.junit.*; +import static org.junit.Assert.*; import org.hippoecm.frontend.model.FrontendNodeTypes; import org.hippoecm.repository.HippoRepository; @@ -40,19 +41,19 @@ import com.atomikos.icatch.jta.UserTransactionManager; -public class SampleWorkflowTest extends TestCase { +public class SampleWorkflowTest { @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; private HippoRepository server; - @Override + @Before public void setUp() throws Exception { System.setProperty("com.atomikos.icatch.file", "../src/test/resources/jta.properties"); server = HippoRepositoryFactory.getHippoRepository(); } - @Override + @After public void tearDown() throws Exception { server.close(); } Modified: hippo-ecm/trunk/pom.xml =================================================================== --- hippo-ecm/trunk/pom.xml 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/pom.xml 2009-01-07 11:46:35 UTC (rev 15762) @@ -491,32 +491,32 @@ org.apache.jackrabbit jackrabbit-api - 1.4 + 1.5.0 org.apache.jackrabbit jackrabbit-jcr-commons - [1.4,1.5) + 1.5.0 org.apache.jackrabbit jackrabbit-text-extractors - [1.4,1.5) + 1.5.0 org.apache.jackrabbit jackrabbit-jcr-rmi - 1.4.1 + 1.5.0 org.apache.jackrabbit jackrabbit-classloader - 1.4.1 + 1.5.0 org.apache.jackrabbit jackrabbit-core - 1.4.6 + 1.5.0 org.apache.wicket Modified: hippo-ecm/trunk/repository/connector/pom.xml =================================================================== --- hippo-ecm/trunk/repository/connector/pom.xml 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/connector/pom.xml 2009-01-07 11:46:35 UTC (rev 15762) @@ -123,12 +123,12 @@ org.apache.jackrabbit jackrabbit-jcr2spi - 1.4 + 1.5.0 org.apache.jackrabbit jackrabbit-spi2jcr - 1.4 + 1.5.0 Modified: hippo-ecm/trunk/repository/connector/src/main/java/org/apache/jackrabbit/spi/rmi/client/ClientRepositoryService.java =================================================================== --- hippo-ecm/trunk/repository/connector/src/main/java/org/apache/jackrabbit/spi/rmi/client/ClientRepositoryService.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/connector/src/main/java/org/apache/jackrabbit/spi/rmi/client/ClientRepositoryService.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -105,22 +105,6 @@ this.remoteService = remoteService; } - public boolean exists(SessionInfo sessionInfo, ItemId id) throws RepositoryException { - try { - return remoteService.exists(getRemoteSessionInfo(sessionInfo), id); - } catch (RemoteException e) { - throw new RemoteRepositoryException(e); - } - } - - public NodeId getRootId(SessionInfo sessionInfo) throws RepositoryException { - try { - return remoteService.getRootId(getRemoteSessionInfo(sessionInfo)); - } catch (RemoteException e) { - throw new RemoteRepositoryException(e); - } - } - /** * {@inheritDoc} */ @@ -467,10 +451,10 @@ /** * {@inheritDoc} */ - public void checkin(SessionInfo sessionInfo, NodeId nodeId) + public NodeId checkin(SessionInfo sessionInfo, NodeId nodeId) throws VersionException, UnsupportedRepositoryOperationException, InvalidItemStateException, LockException, RepositoryException { try { - remoteService.checkin(getRemoteSessionInfo(sessionInfo), nodeId); + return remoteService.checkin(getRemoteSessionInfo(sessionInfo), nodeId); } catch (RemoteException e) { throw new RemoteRepositoryException(e); } Modified: hippo-ecm/trunk/repository/connector/src/main/java/org/apache/jackrabbit/spi/rmi/remote/RemoteRepositoryService.java =================================================================== --- hippo-ecm/trunk/repository/connector/src/main/java/org/apache/jackrabbit/spi/rmi/remote/RemoteRepositoryService.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/connector/src/main/java/org/apache/jackrabbit/spi/rmi/remote/RemoteRepositoryService.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -45,11 +45,6 @@ * {@link org.apache.jackrabbit.spi.RepositoryService}. */ public interface RemoteRepositoryService extends Remote { - public boolean exists(RemoteSessionInfo sessionInfo, ItemId id) - throws RepositoryException, RemoteException; - public NodeId getRootId(RemoteSessionInfo sessionInfo) - throws RepositoryException, RemoteException; - /** * @return key-value pairs for repository descriptor keys and values. * @throws RemoteException on RMI errors. @@ -364,7 +359,7 @@ * @throws RemoteException if an error occurs. * @see org.apache.jackrabbit.spi.RepositoryService#checkin(org.apache.jackrabbit.spi.SessionInfo, org.apache.jackrabbit.spi.NodeId) */ - public void checkin(RemoteSessionInfo sessionInfo, NodeId nodeId) + public NodeId checkin(RemoteSessionInfo sessionInfo, NodeId nodeId) throws RepositoryException, RemoteException; /** Modified: hippo-ecm/trunk/repository/connector/src/main/java/org/apache/jackrabbit/spi/rmi/server/ServerRepositoryService.java =================================================================== --- hippo-ecm/trunk/repository/connector/src/main/java/org/apache/jackrabbit/spi/rmi/server/ServerRepositoryService.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/connector/src/main/java/org/apache/jackrabbit/spi/rmi/server/ServerRepositoryService.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -125,16 +125,6 @@ return jcrSession; } - public boolean exists(RemoteSessionInfo sessionInfo, ItemId id) - throws RepositoryException, RemoteException { - return service.exists(getSessionInfo(sessionInfo), id); - } - - public NodeId getRootId(RemoteSessionInfo sessionInfo) - throws RepositoryException, RemoteException { - return service.getRootId(getSessionInfo(sessionInfo)); - } - /** * {@inheritDoc} */ @@ -514,10 +504,10 @@ /** * {@inheritDoc} */ - public void checkin(RemoteSessionInfo sessionInfo, NodeId nodeId) + public NodeId checkin(RemoteSessionInfo sessionInfo, NodeId nodeId) throws RepositoryException, RemoteException { try { - service.checkin(getSessionInfo(sessionInfo), nodeId); + return service.checkin(getSessionInfo(sessionInfo), nodeId); } catch (RepositoryException e) { throw getRepositoryException(e); } Modified: hippo-ecm/trunk/repository/connector/src/main/java/org/hippoecm/repository/SPIHippoRepository.java =================================================================== --- hippo-ecm/trunk/repository/connector/src/main/java/org/hippoecm/repository/SPIHippoRepository.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/connector/src/main/java/org/hippoecm/repository/SPIHippoRepository.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -79,6 +79,10 @@ public org.apache.jackrabbit.jcr2spi.config.CacheBehaviour getCacheBehaviour() { return org.apache.jackrabbit.jcr2spi.config.CacheBehaviour.OBSERVATION; } + + public int getItemCacheSize() { + return 1000; + } }); repository = new DecoratorFactoryImpl(clientService, adapterFactory, clientRepository).getRepositoryDecorator(repository); } Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/impl/NodeDecorator.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/impl/NodeDecorator.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/impl/NodeDecorator.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -30,12 +30,17 @@ import javax.jcr.version.VersionException; import org.apache.jackrabbit.core.NodeImpl; +import org.apache.jackrabbit.core.WorkspaceImpl; import org.hippoecm.repository.DerivedDataEngine; import org.hippoecm.repository.api.HippoNode; import org.hippoecm.repository.api.HippoNodeType; import org.hippoecm.repository.api.HippoSession; import org.hippoecm.repository.decorating.DecoratorFactory; +import org.hippoecm.repository.jackrabbit.HippoLocalItemStateManager; import org.hippoecm.repository.jackrabbit.HippoNodeId; +import org.hippoecm.repository.jackrabbit.ItemManager; +import org.hippoecm.repository.jackrabbit.SessionImpl; +import org.hippoecm.repository.jackrabbit.XASessionImpl; public class NodeDecorator extends org.hippoecm.repository.decorating.NodeDecorator implements HippoNode { @SuppressWarnings("unused") @@ -49,8 +54,14 @@ @Override public Node getCanonicalNode() throws RepositoryException { - if (hasProperty("hippo:uuid")) { - return getSession().getNodeByUUID(getProperty("hippo:uuid").getString()); + // FIXME HREPTWO-2127 + String p = null; + try { + p = getProperty("hippo:uuid").getString(); + } catch(RepositoryException ex) { + } + if (p != null) { + return getSession().getNodeByUUID(p); } else if(((NodeImpl)node).getId() instanceof HippoNodeId) { return null; } else { @@ -63,7 +74,7 @@ public void save() throws AccessDeniedException, ConstraintViolationException, InvalidItemStateException, ReferentialIntegrityException, VersionException, LockException, RepositoryException { if(item.isNode()) { - ((SessionDecorator)getSession()).derivedEngine.save((Node)item); + ((SessionDecorator)getSession()).postSave((Node)item); } super.save(); } @@ -71,10 +82,12 @@ /** {@inheritDoc} */ @Override public void remove() throws VersionException, LockException, RepositoryException { + ((SessionDecorator)getSession()).postMountEnabled(false); if(isNode()) { DerivedDataEngine.removal(this); } super.remove(); + ((SessionDecorator)getSession()).postMountEnabled(true); } @Override Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/BootstrapRepositoryProvider.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/BootstrapRepositoryProvider.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/BootstrapRepositoryProvider.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -24,6 +24,7 @@ import org.apache.jackrabbit.core.NodeId; import org.apache.jackrabbit.core.PropertyId; import org.apache.jackrabbit.core.nodetype.PropDefId; +import org.apache.jackrabbit.core.state.ChildNodeEntry; import org.apache.jackrabbit.core.state.NodeState; import org.apache.jackrabbit.core.state.PropertyState; import org.apache.jackrabbit.spi.Name; @@ -70,7 +71,7 @@ String docbase = getProperty(nodeId, docbaseName)[0]; NodeState upstream = getNodeState(new NodeId(new UUID(docbase))); for(Iterator iter = upstream.getChildNodeEntries().iterator(); iter.hasNext(); ) { - NodeState.ChildNodeEntry entry = (NodeState.ChildNodeEntry) iter.next(); + ChildNodeEntry entry = (ChildNodeEntry) iter.next(); NodeId childNodeId = new BootstrapNodeId(nodeId, entry.getId(), entry.getName()); state.addChildNodeEntry(entry.getName(), childNodeId); } @@ -114,7 +115,7 @@ protected void populateChildren(NodeId nodeId, NodeState state, NodeState upstream) { for(Iterator iter = upstream.getChildNodeEntries().iterator(); iter.hasNext(); ) { - NodeState.ChildNodeEntry entry = (NodeState.ChildNodeEntry) iter.next(); + ChildNodeEntry entry = (ChildNodeEntry) iter.next(); BootstrapNodeId childNodeId = new BootstrapNodeId(nodeId, entry.getId(), entry.getName()); state.addChildNodeEntry(entry.getName(), childNodeId); } Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/HippoHierarchyManager.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/HippoHierarchyManager.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/HippoHierarchyManager.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -68,6 +68,10 @@ return hierMgr.getName(id); } + public Name getName(NodeId id, NodeId parentId) throws ItemNotFoundException, RepositoryException { + return hierMgr.getName(id, parentId); + } + public int getDepth(ItemId id) throws ItemNotFoundException, RepositoryException { return hierMgr.getDepth(id); } @@ -79,4 +83,13 @@ public boolean isAncestor(NodeId nodeId, ItemId itemId) throws ItemNotFoundException, RepositoryException { return hierMgr.isAncestor(nodeId, itemId); } + + public boolean isShareAncestor(NodeId ancestor, NodeId descendant) + throws ItemNotFoundException, RepositoryException { + return hierMgr.isShareAncestor(ancestor, descendant); + } + + public int getShareRelativeDepth(NodeId ancestorId, ItemId descendantId) throws ItemNotFoundException, RepositoryException { + return hierMgr.getShareRelativeDepth(ancestorId, descendantId); + } } Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/HippoLocalItemStateManager.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/HippoLocalItemStateManager.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/HippoLocalItemStateManager.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -23,6 +23,7 @@ import java.util.NoSuchElementException; import java.util.Set; +import javax.jcr.NamespaceException; import javax.jcr.ReferentialIntegrityException; import javax.jcr.RepositoryException; @@ -46,7 +47,9 @@ import org.apache.jackrabbit.core.state.StaleItemStateException; import org.apache.jackrabbit.core.state.XAItemStateManager; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver; +import org.apache.jackrabbit.spi.Path; +import org.apache.jackrabbit.spi.commons.conversion.IllegalNameException; +import org.apache.jackrabbit.spi.commons.conversion.MalformedPathException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -56,7 +59,7 @@ import org.hippoecm.repository.FacetedNavigationEngine.Query; import org.hippoecm.repository.Modules; -class HippoLocalItemStateManager extends XAItemStateManager implements DataProviderContext { +public class HippoLocalItemStateManager extends XAItemStateManager implements DataProviderContext { @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; @@ -77,7 +80,7 @@ static final int ITEM_TYPE_VIRTUAL = 0x02; NodeTypeRegistry ntReg; - NamespaceResolver nsResolver; + protected org.apache.jackrabbit.core.SessionImpl session; protected HierarchyManager hierMgr; FacetedNavigationEngine facetedEngine; FacetedNavigationEngine.Context facetedContext; @@ -88,27 +91,37 @@ protected Set virtualPropertyNames; private Set virtualStates = new HashSet(); private Map virtualNodes = new HashMap(); - + private NodeId rootNodeId; private boolean virtualLayerEnabled = false; public HippoLocalItemStateManager(SharedItemStateManager sharedStateMgr, EventStateCollectionFactory factory, - ItemStateCacheFactory cacheFactory, NodeTypeRegistry ntReg, boolean enabled) { + ItemStateCacheFactory cacheFactory, NodeTypeRegistry ntReg, boolean enabled, + NodeId rootNodeId) { super(sharedStateMgr, factory, cacheFactory); this.ntReg = ntReg; this.virtualLayerEnabled = enabled; + this.rootNodeId = rootNodeId; virtualProviders = new HashMap(); virtualNodeNames = new HashMap(); virtualPropertyNames = new HashSet(); } + int removal = 0; + public boolean isEnabled() { + return virtualLayerEnabled && removal==0; + } + public void setEnabled(boolean enabled) { + if(enabled) { + --removal; + } else { + ++removal; + } + } + public NodeTypeRegistry getNodeTypeRegistry() { return ntReg; } - public NamespaceResolver getNamespaceResolver() { - return nsResolver; - } - public HierarchyManager getHierarchyManager() { return hierMgr; } @@ -140,12 +153,20 @@ public HippoVirtualProvider lookupProvider(Name nodeTypeName) { return virtualNodeNames.get(nodeTypeName); } + + public Name getQName(String name) throws IllegalNameException, NamespaceException { + return session.getQName(name); + } + + public Path getQPath(String path) throws MalformedPathException, IllegalNameException, NamespaceException { + return session.getQPath(path); + } - void initialize(NamespaceResolver nsResolver, HierarchyManager hierMgr, + void initialize(org.apache.jackrabbit.core.SessionImpl session, FacetedNavigationEngine facetedEngine, FacetedNavigationEngine.Context facetedContext) { - this.nsResolver = nsResolver; - this.hierMgr = hierMgr; + this.session = session; + this.hierMgr = session.getHierarchyManager(); this.facetedEngine = facetedEngine; this.facetedContext = facetedContext; @@ -226,10 +247,21 @@ NodeState nodeState; if(state != null) { nodeState = (NodeState) state; - nodeState = ((HippoNodeId)id).populate(nodeState); + if(isEnabled() || true) { // FIXME HREPTWO-2125 + nodeState = ((HippoNodeId)id).populate(nodeState); + } else { + // keep nodestate as is + } } else { - nodeState = ((HippoNodeId)id).populate(); + if(isEnabled() || true) { // FIXME HREPTWO-2125 + nodeState = ((HippoNodeId)id).populate(); + } else { + nodeState = populate((HippoNodeId)id); + } } + if (nodeState == null) { + throw new NoSuchItemStateException(id.toString()); + } Name nodeTypeName = nodeState.getNodeTypeName(); if(virtualNodeNames.containsKey(nodeTypeName) && !virtualStates.contains(state)) { @@ -300,7 +332,12 @@ state = (NodeState) virtualNodes.get(id); } else if(state == null && id instanceof HippoNodeId) { edit(); - NodeState nodeState = ((HippoNodeId)id).populate(); + NodeState nodeState; + if (isEnabled() || true) { // FIXME HREPTWO-2125 + nodeState = ((HippoNodeId)id).populate(); + } else { + nodeState = populate((HippoNodeId)id); + } virtualNodes.put((HippoNodeId)id, nodeState); store(nodeState); @@ -334,6 +371,15 @@ return super.getPropertyState(id); } + + private NodeState populate(HippoNodeId nodeId) throws NoSuchItemStateException, ItemStateException { + NodeState dereference = getNodeState(rootNodeId); + NodeState state = createNew(nodeId, dereference.getNodeTypeName(), nodeId.parentId); + state.setNodeTypeName(dereference.getNodeTypeName()); + state.setDefinitionId(dereference.getDefinitionId()); + return state; + } + int isVirtual(ItemState state) { if(state.isNode()) { int type = ITEM_TYPE_REGULAR; @@ -534,6 +580,5 @@ actualIterator.remove(); } } - } } Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/HippoSessionItemStateManager.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/HippoSessionItemStateManager.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/HippoSessionItemStateManager.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -45,8 +45,8 @@ HippoLocalItemStateManager localStateMgr; NodeId rootNodeId; - HippoSessionItemStateManager(NodeId rootNodeId, LocalItemStateManager mgr, PathResolver resolver, NodeTypeRegistry ntReg) { - super(rootNodeId, mgr, resolver, ntReg); + HippoSessionItemStateManager(NodeId rootNodeId, LocalItemStateManager mgr, NodeTypeRegistry ntReg) { + super(rootNodeId, mgr, ntReg); this.rootNodeId = rootNodeId; this.localStateMgr = (HippoLocalItemStateManager) mgr; if (wrappedHierMgr == null) { Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/ItemManager.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/ItemManager.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/ItemManager.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -18,32 +18,18 @@ import java.util.HashSet; import java.util.Set; -import javax.jcr.AccessDeniedException; -import javax.jcr.ItemNotFoundException; -import javax.jcr.NamespaceException; -import javax.jcr.PathNotFoundException; import javax.jcr.RepositoryException; import javax.jcr.nodetype.NodeDefinition; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.jackrabbit.core.HierarchyManager; import org.apache.jackrabbit.core.ItemId; -import org.apache.jackrabbit.core.ItemImpl; -import org.apache.jackrabbit.core.ItemLifeCycleListener; import org.apache.jackrabbit.core.NodeId; import org.apache.jackrabbit.core.SessionImpl; -import org.apache.jackrabbit.core.nodetype.NodeDefId; -import org.apache.jackrabbit.core.nodetype.NodeDefinitionImpl; -import org.apache.jackrabbit.core.security.AccessManager; -import org.apache.jackrabbit.core.state.ItemState; -import org.apache.jackrabbit.core.state.ItemStateException; import org.apache.jackrabbit.core.state.ItemStateManager; -import org.apache.jackrabbit.core.state.NoSuchItemStateException; -import org.apache.jackrabbit.core.state.NodeState; import org.apache.jackrabbit.core.state.SessionItemStateManager; -import org.apache.jackrabbit.spi.Path; -import org.apache.jackrabbit.spi.commons.name.NameConstants; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class ItemManager extends org.apache.jackrabbit.core.ItemManager { @SuppressWarnings("unused") @@ -68,197 +54,7 @@ itemIdCache = new HashSet(); } - /* - @Override - org.apache.jackrabbit.core.NodeImpl createNodeInstance(NodeState state, NodeDefinition def) throws RepositoryException { - if (state.getNodeTypeName().equals(HippoNameConstants.NT_VERSION) || - state.getNodeTypeName().equals(HippoNameConstants.NT_VERSIONHISTORY)) { - return super.createNodeInstance(state, def); - } else { - NodeId id = state.getNodeId(); - ItemLifeCycleListener[] listeners = new ItemLifeCycleListener[]{this}; - return new NodeImpl(this, session, id, state, def, listeners); - } - } - */ - - private boolean inParentCache(ItemId id) { - synchronized (itemIdCache) { - return itemIdCache.contains(id); - } - } - - private NodeDefinition getDefinition(NodeState state) - throws RepositoryException { - NodeDefId defId = state.getDefinitionId(); - NodeDefinitionImpl def = session.getNodeTypeManager().getNodeDefinition(defId); - if (def == null) { - /** - * todo need proper way of handling inconsistent/corrupt definition - * e.g. 'flag' items that refer to non-existent definitions - */ - log.warn("node at " + state.getNodeId() + " has invalid definitionId (" + defId + ")"); - - // fallback: try finding applicable definition - NodeImpl parent = (NodeImpl) getItem(state.getParentId()); - NodeState parentState = (NodeState) parent.getItemState(); - NodeState.ChildNodeEntry cne = parentState.getChildNodeEntry(state.getNodeId()); - def = parent.getApplicableChildNodeDefinition(cne.getName(), state.getNodeTypeName()); - state.setDefinitionId(def.unwrap().getId()); - } - return def; - } - org.apache.jackrabbit.core.NodeImpl getRootNode() throws RepositoryException { return (org.apache.jackrabbit.core.NodeImpl) getItem(rootNodeId); } - - public ItemImpl getItem(Path path) - throws PathNotFoundException, AccessDeniedException, RepositoryException { - ItemId id = hierMgr.resolvePath(path); - if (id == null) { - throw new PathNotFoundException(safeGetJCRPath(path)); - } - try { - return getItem(id); - } catch (ItemNotFoundException infe) { - throw new PathNotFoundException(safeGetJCRPath(path)); - } - } - - public synchronized ItemImpl getItem(ItemId id) - throws ItemNotFoundException, AccessDeniedException, RepositoryException { - - // check if node is in parent cache - if(inParentCache(id)) { - return super.getItem(id); - } - - if (id.denotesNode()) { - // Create instance of node locally - if (!session.getAccessManager().isGranted(id, AccessManager.READ)) { - throw new AccessDeniedException("cannot read item " + id); - } - ItemImpl item = createItemInstance(id); - if (item == null) { - log.error("Internal error: item null"); - } - return item; - } else { - // Create instance of property by parent - return super.getItem(id); - } - } - - - public synchronized ItemImpl getItem(ItemState state) - throws ItemNotFoundException, AccessDeniedException, RepositoryException { - ItemId id = state.getId(); - - // check if node is in parent cache - if(inParentCache(id)) { - return super.getItem(id); - } - - if (id.denotesNode()) { - // Create instance of node locally - // only check privileges if state is not new - if (state.getStatus() != ItemState.STATUS_NEW - && !session.getAccessManager().isGranted(id, AccessManager.READ)) { - throw new AccessDeniedException("cannot read item " + id); - } - // create instance of item - return createItemInstance(id); - } else { - // Create instance of property by parent - return super.getItem(id); - } - } - - - //-------------------------------------------------< item factory methods > - private ItemImpl createItemInstance(ItemId id) - throws ItemNotFoundException, RepositoryException { - // create instance of item using its state object - ItemImpl item; - ItemState state; - try { - state = itemStateProvider.getItemState(id); - } catch (NoSuchItemStateException nsise) { - throw new ItemNotFoundException(id.toString()); - } catch (ItemStateException ise) { - String msg = "failed to retrieve item state of item " + id; - log.error(msg, ise); - throw new RepositoryException(msg, ise); - } - - if (id.equals(rootNodeId)) { - // special handling required for root node - item = createNodeInstance((NodeState) state, rootNodeDef); - } else if (state != null && state.isNode()) { - item = createNodeInstance((NodeState) state); - } else { - item = null; - } - return item; - } - - org.apache.jackrabbit.core.NodeImpl createNodeInstance(NodeState state, NodeDefinition def) - throws RepositoryException { - NodeId id = state.getNodeId(); - // we want to be informed on life cycle changes of the new node object - // in order to maintain item cache consistency - ItemLifeCycleListener[] listeners = new ItemLifeCycleListener[]{this}; - - // check special nodes - if (state.getNodeTypeName().equals(NameConstants.NT_VERSION)) { - return createVersionInstance(id, state, def, listeners); - - } else if (state.getNodeTypeName().equals(NameConstants.NT_VERSIONHISTORY)) { - return createVersionHistoryInstance(id, state, def, listeners); - - } else { - // create node object - return new NodeImpl(this, session, id, state, def, listeners); - } - } - - org.apache.jackrabbit.core.NodeImpl createNodeInstance(NodeState state) throws RepositoryException { - // 1. get definition of the specified node - NodeDefinition def = getDefinition(state); - // 2. create instance - return createNodeInstance(state, def); - } - - String safeGetJCRPath(Path path) { - try { - return session.getJCRPath(path); - } catch (NamespaceException e) { - log.error("failed to convert " + path.toString() + " to JCR path."); - // return string representation of internal path as a fallback - return path.toString(); - } - } - - public void itemCreated(ItemImpl item) { - synchronized (itemIdCache) { - ItemId id = item.getId(); - itemIdCache.add(id); - super.itemCreated(item); - } - } - - public void itemInvalidated(ItemId id, ItemImpl item) { - synchronized (itemIdCache) { - itemIdCache.remove(id); - super.itemInvalidated(id, item); - } - } - - public void itemDestroyed(ItemId id, ItemImpl item) { - synchronized (itemIdCache) { - itemIdCache.remove(id); - super.itemDestroyed(id, item); - } - } } Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/RepositoryImpl.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/RepositoryImpl.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/RepositoryImpl.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -42,7 +42,7 @@ import org.apache.jackrabbit.core.observation.DelegatingObservationDispatcher; import org.apache.jackrabbit.core.persistence.PMContext; import org.apache.jackrabbit.core.persistence.PersistenceManager; -import org.apache.jackrabbit.core.security.AuthContext; +import org.apache.jackrabbit.core.security.authentication.AuthContext; import org.apache.jackrabbit.core.state.ISMLocking; import org.apache.jackrabbit.core.state.ItemStateCacheFactory; import org.apache.jackrabbit.core.state.ItemStateException; @@ -89,8 +89,7 @@ FacetedNavigationEngine facetedEngine = getFacetedNavigationEngine(); FacetedNavigationEngine.Context facetedContext; facetedContext = facetedEngine.prepare(session.getUserID(), subject, null, session); - stateMgr.initialize(session.getNamespaceResolver(), session.getHierarchyManager(), facetedEngine, - facetedContext); + stateMgr.initialize(session, facetedEngine, facetedContext); } @Override @@ -100,15 +99,25 @@ return new HippoSharedItemStateManager(this, persistMgr, rootNodeId, ntReg, true, cacheFactory, locking); } - @Override + /*@Override protected org.apache.jackrabbit.core.SessionImpl createSessionInstance(AuthContext loginContext, WorkspaceConfig wspConfig) throws AccessDeniedException, RepositoryException { return new XASessionImpl(this, loginContext, wspConfig); + }*/ + + @Override + protected org.apache.jackrabbit.core.SessionImpl createSessionInstance(AuthContext loginContext, + WorkspaceConfig wspConfig) + throws AccessDeniedException, RepositoryException { + + return new XASessionImpl(this, loginContext, wspConfig); } @Override - protected org.apache.jackrabbit.core.SessionImpl createSessionInstance(Subject subject, WorkspaceConfig wspConfig) + protected org.apache.jackrabbit.core.SessionImpl createSessionInstance(Subject subject, + WorkspaceConfig wspConfig) throws AccessDeniedException, RepositoryException { + return new XASessionImpl(this, subject, wspConfig); } @@ -175,7 +184,7 @@ DelegatingObservationDispatcher delegatingDispatcher) throws RepositoryException { - FileSystem fs = vConfig.getFileSystemConfig().createFileSystem(); + FileSystem fs = vConfig.getFileSystem(); PersistenceManager pm = createPersistenceManager(vConfig.getHomeDir(), fs, vConfig.getPersistenceManagerConfig(), getRootNodeId(), getNamespaceRegistry(), Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/SessionImpl.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/SessionImpl.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/SessionImpl.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -36,22 +36,21 @@ import javax.jcr.version.VersionException; import javax.security.auth.Subject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.xml.sax.ContentHandler; + import org.apache.jackrabbit.core.HierarchyManager; import org.apache.jackrabbit.core.config.AccessManagerConfig; import org.apache.jackrabbit.core.config.WorkspaceConfig; import org.apache.jackrabbit.core.security.AccessManager; -import org.apache.jackrabbit.core.security.AuthContext; +import org.apache.jackrabbit.core.security.authentication.AuthContext; import org.apache.jackrabbit.core.state.LocalItemStateManager; import org.apache.jackrabbit.core.state.SessionItemStateManager; import org.apache.jackrabbit.core.state.SharedItemStateManager; -import org.apache.jackrabbit.core.version.VersionManager; -import org.hippoecm.repository.jackrabbit.version.VersionManagerImpl; -import org.hippoecm.repository.jackrabbit.version.XAVersionManager; + import org.hippoecm.repository.jackrabbit.xml.DefaultContentHandler; import org.hippoecm.repository.security.HippoAMContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.xml.sax.ContentHandler; public class SessionImpl extends org.apache.jackrabbit.core.SessionImpl { @SuppressWarnings("unused") @@ -93,13 +92,7 @@ try { HippoAMContext ctx = new HippoAMContext(new File(((RepositoryImpl)rep).getConfig().getHomeDir()), ((RepositoryImpl)rep).getFileSystem(), - subject, - hierMgr, - getItemStateManager(), - ((RepositoryImpl)rep).getNamespaceRegistry(), - getWorkspace().getName(), - ntMgr, - getNamePathResolver()); + this, subject, hierMgr, this, getWorkspace().getName(), ntMgr, getItemStateManager()); AccessManager accessMgr = (AccessManager)amConfig.newInstance(); accessMgr.init(ctx); return accessMgr; @@ -114,7 +107,10 @@ @Override public void checkPermission(String absPath, String actions) throws AccessControlException, RepositoryException { - super.checkPermission(absPath, actions); + try { + super.checkPermission(absPath, actions); + } catch(IllegalArgumentException ex) { + } helper.checkPermission(absPath, actions); } @@ -127,7 +123,7 @@ @Override protected SessionItemStateManager createSessionItemStateManager(LocalItemStateManager manager) { - return new HippoSessionItemStateManager(((RepositoryImpl)rep).getRootNodeId(), manager, getNamePathResolver(), ((RepositoryImpl)rep).getNodeTypeRegistry()); + return new HippoSessionItemStateManager(((RepositoryImpl)rep).getRootNodeId(), manager, ((RepositoryImpl)rep).getNodeTypeRegistry()); } @Override @@ -148,7 +144,7 @@ return helper.getUserPrincipals(); } - public NodeIterator pendingChanges(Node node, String nodeType, boolean prune) throws NamespaceException, NoSuchNodeTypeException, RepositoryException { + public NodeIterator pendingChanges(Node node, String nodeType, boolean prune) throws NamespaceException, NoSuchNodeTypeException, RepositoryException { return helper.pendingChanges(node, nodeType, prune); } @@ -166,4 +162,10 @@ getDereferencedImportContentHandler(parentAbsPath, uuidBehavior, referenceBehavior, mergeBehavior); new DefaultContentHandler(handler).parse(in); } + + + @Override + public SessionItemStateManager getItemStateManager() { + return super.getItemStateManager(); + } } Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/SessionImplHelper.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/SessionImplHelper.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/SessionImplHelper.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -209,11 +209,8 @@ if (!mixins.contains(ntName)) { // build effective node type of mixins & primary type NodeTypeRegistry ntReg = ntMgr.getNodeTypeRegistry(); - Name[] types = new Name[mixins.size()+1]; - mixins.toArray(types); - types[types.length-1] = state.getNodeTypeName(); try { - if (!ntReg.getEffectiveNodeType(types).includesNodeType(ntName)) + if (!ntReg.getEffectiveNodeType(state.getNodeTypeName(),mixins).includesNodeType(ntName)) continue; } catch (NodeTypeConflictException ntce) { String msg = "internal error: failed to build effective node type"; @@ -348,7 +345,6 @@ } DereferencedSessionImporter importer = new DereferencedSessionImporter(parent, sessionImpl, uuidBehavior, referenceBehavior, mergeBehavior); - //return new ImportHandler(importer, sessionImpl.getNamespaceResolver(), rep.getNamespaceRegistry()); - return new DereferencedImportHandler(importer, sessionImpl.getNamespaceResolver(), rep.getNamespaceRegistry()); + return new DereferencedImportHandler(importer, sessionImpl, rep.getNamespaceRegistry()); } } Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/XASessionImpl.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/XASessionImpl.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/XASessionImpl.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -36,22 +36,24 @@ import javax.jcr.version.VersionException; import javax.security.auth.Subject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.xml.sax.ContentHandler; + import org.apache.jackrabbit.core.HierarchyManager; import org.apache.jackrabbit.core.config.AccessManagerConfig; import org.apache.jackrabbit.core.config.WorkspaceConfig; import org.apache.jackrabbit.core.security.AccessManager; -import org.apache.jackrabbit.core.security.AuthContext; +import org.apache.jackrabbit.core.security.authentication.AuthContext; import org.apache.jackrabbit.core.state.LocalItemStateManager; import org.apache.jackrabbit.core.state.SessionItemStateManager; import org.apache.jackrabbit.core.state.SharedItemStateManager; import org.apache.jackrabbit.core.version.VersionManager; + import org.hippoecm.repository.jackrabbit.version.VersionManagerImpl; import org.hippoecm.repository.jackrabbit.version.XAVersionManager; import org.hippoecm.repository.jackrabbit.xml.DefaultContentHandler; import org.hippoecm.repository.security.HippoAMContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.xml.sax.ContentHandler; public class XASessionImpl extends org.apache.jackrabbit.core.XASessionImpl { @SuppressWarnings("unused") @@ -92,14 +94,7 @@ AccessManagerConfig amConfig = rep.getConfig().getAccessManagerConfig(); try { HippoAMContext ctx = new HippoAMContext(new File(((RepositoryImpl)rep).getConfig().getHomeDir()), - ((RepositoryImpl)rep).getFileSystem(), - subject, - hierMgr, - getItemStateManager(), - ((RepositoryImpl)rep).getNamespaceRegistry(), - getWorkspace().getName(), - ntMgr, - getNamePathResolver()); + ((RepositoryImpl)rep).getFileSystem(), this, subject, hierMgr, this, getWorkspace().getName(), ntMgr, getItemStateManager()); AccessManager accessMgr = (AccessManager)amConfig.newInstance(); accessMgr.init(ctx); return accessMgr; @@ -114,7 +109,10 @@ @Override public void checkPermission(String absPath, String actions) throws AccessControlException, RepositoryException { - super.checkPermission(absPath, actions); + try { + super.checkPermission(absPath, actions); + } catch(IllegalArgumentException ex) { + } helper.checkPermission(absPath, actions); } @@ -127,7 +125,7 @@ @Override protected SessionItemStateManager createSessionItemStateManager(LocalItemStateManager manager) { - return new HippoSessionItemStateManager(((RepositoryImpl)rep).getRootNodeId(), manager, getNamePathResolver(), ((RepositoryImpl)rep).getNodeTypeRegistry()); + return new HippoSessionItemStateManager(((RepositoryImpl)rep).getRootNodeId(), manager, ((RepositoryImpl)rep).getNodeTypeRegistry()); } @Override @@ -140,12 +138,15 @@ return helper.getUserID(); } + /** + * Method to expose the authenticated users' principals + * @return Set An unmodifiable set containing the principals + */ public Set getUserPrincipals() { return helper.getUserPrincipals(); } - public NodeIterator pendingChanges(Node node, String nodeType, boolean prune) throws NamespaceException, - NoSuchNodeTypeException, RepositoryException { + public NodeIterator pendingChanges(Node node, String nodeType, boolean prune) throws NamespaceException, NoSuchNodeTypeException, RepositoryException { return helper.pendingChanges(node, nodeType, prune); } @@ -172,4 +173,8 @@ return new XAVersionManager(vMgr, ((RepositoryImpl)rep).getNodeTypeRegistry(), this, rep.getItemStateCacheFactory()); } + @Override + public SessionItemStateManager getItemStateManager() { + return super.getItemStateManager(); + } } Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/version/AbstractVersionManager.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/version/AbstractVersionManager.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/version/AbstractVersionManager.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -15,31 +15,18 @@ */ package org.hippoecm.repository.jackrabbit.version; -import EDU.oswego.cs.dl.util.concurrent.ReadWriteLock; -import EDU.oswego.cs.dl.util.concurrent.ReentrantWriterPreferenceReadWriteLock; +import javax.jcr.RepositoryException; +import javax.jcr.Session; +import javax.jcr.version.VersionException; + import org.apache.jackrabbit.core.NodeId; import org.apache.jackrabbit.core.NodeImpl; -import org.apache.jackrabbit.core.SessionImpl; -import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry; -import org.apache.jackrabbit.core.state.ItemStateException; -import org.apache.jackrabbit.core.state.LocalItemStateManager; import org.apache.jackrabbit.core.state.NodeState; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.uuid.UUID; -import org.apache.jackrabbit.spi.commons.name.NameConstants; -import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.jcr.RepositoryException; -import javax.jcr.Session; -import javax.jcr.Value; -import javax.jcr.InvalidItemStateException; -import javax.jcr.version.VersionException; -import javax.jcr.version.VersionHistory; import org.apache.jackrabbit.core.version.InternalVersion; import org.apache.jackrabbit.core.version.InternalVersionHistory; import org.apache.jackrabbit.core.version.InternalVersionItem; +import org.apache.jackrabbit.core.version.VersionHistoryInfo; import org.apache.jackrabbit.core.version.VersionManager; /** @@ -60,11 +47,10 @@ public void releaseWriteLock(); public void acquireReadLock(); public void releaseReadLock(); - public VersionHistory getVersionHistory(Session session, NodeState node) throws RepositoryException; + public VersionHistoryInfo getVersionHistory(Session session, NodeState node) throws RepositoryException; public InternalVersionItem getItem(NodeId id) throws RepositoryException; public boolean hasItem(NodeId id); public boolean hasItemReferences(InternalVersionItem item) throws RepositoryException; - public InternalVersionHistory createVersionHistory(NodeState node) throws RepositoryException; public InternalVersion checkin(InternalVersionHistoryImpl history, NodeImpl node) throws RepositoryException; public String calculateCheckinVersionName(InternalVersionHistoryImpl history, NodeImpl node) throws RepositoryException; public void removeVersion(InternalVersionHistoryImpl history, Name name) throws VersionException, RepositoryException; Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/version/InternalFrozenNodeImpl.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/version/InternalFrozenNodeImpl.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/version/InternalFrozenNodeImpl.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -20,7 +20,6 @@ import org.apache.jackrabbit.core.NodeId; import org.apache.jackrabbit.core.nodetype.NodeTypeImpl; import org.apache.jackrabbit.core.state.ItemStateException; -import org.apache.jackrabbit.core.state.NodeState; import org.apache.jackrabbit.core.state.PropertyState; import org.apache.jackrabbit.core.value.InternalValue; import org.apache.jackrabbit.spi.Name; @@ -37,6 +36,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.apache.jackrabbit.core.state.ChildNodeEntry; import org.apache.jackrabbit.core.version.InternalFreeze; import org.apache.jackrabbit.core.version.InternalFrozenNode; import org.apache.jackrabbit.core.version.InternalFrozenVersionHistory; @@ -176,8 +176,8 @@ Iterator iter = entries.iterator(); int i = 0; while (iter.hasNext()) { - NodeState.ChildNodeEntry entry = - (NodeState.ChildNodeEntry) iter.next(); + ChildNodeEntry entry = + (ChildNodeEntry) iter.next(); frozenNodes[i++] = (InternalFreeze) vMgr.getItem(entry.getId()); } } catch (RepositoryException e) { Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/version/InternalVersionHistoryImpl.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/version/InternalVersionHistoryImpl.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/version/InternalVersionHistoryImpl.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -20,7 +20,7 @@ import org.apache.jackrabbit.core.state.ItemStateException; import org.apache.jackrabbit.core.state.NodeState; import org.apache.jackrabbit.core.state.PropertyState; -import org.apache.jackrabbit.core.state.NodeState.ChildNodeEntry; +import org.apache.jackrabbit.core.state.ChildNodeEntry; import org.apache.jackrabbit.core.value.InternalValue; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.uuid.UUID; @@ -513,13 +513,12 @@ * @return * @throws RepositoryException */ - static InternalVersionHistoryImpl create(AbstractVersionManager vMgr, - NodeStateEx parent, - NodeId historyId, Name name, - NodeState nodeState) - throws RepositoryException { + static NodeStateEx create( + AbstractVersionManager vMgr, NodeStateEx parent, Name name, + NodeState nodeState) throws RepositoryException { // create history node + NodeId historyId = new NodeId(UUID.randomUUID()); NodeStateEx pNode = parent.addNode(name, NameConstants.NT_VERSIONHISTORY, historyId, true); // set the versionable uuid @@ -534,7 +533,7 @@ NodeStateEx vNode = pNode.addNode(NameConstants.JCR_ROOTVERSION, NameConstants.NT_VERSION, versionId, true); // initialize 'created' and 'predecessors' - vNode.setPropertyValue(NameConstants.JCR_CREATED, InternalValue.create(Calendar.getInstance())); + vNode.setPropertyValue(NameConstants.JCR_CREATED, InternalValue.create(getCurrentTime())); vNode.setPropertyValues(NameConstants.JCR_PREDECESSORS, PropertyType.REFERENCE, InternalValue.EMPTY_ARRAY); vNode.setPropertyValues(NameConstants.JCR_SUCCESSORS, PropertyType.REFERENCE, InternalValue.EMPTY_ARRAY); @@ -557,6 +556,18 @@ } parent.store(); - return new InternalVersionHistoryImpl(vMgr, pNode); + return pNode; } + private static final Calendar CURRENT_TIME = Calendar.getInstance(); + static Calendar getCurrentTime() { + long time = System.currentTimeMillis(); + synchronized (CURRENT_TIME) { + if (time > CURRENT_TIME.getTimeInMillis()) { + CURRENT_TIME.setTimeInMillis(time); + } else { + CURRENT_TIME.add(Calendar.MILLISECOND, 1); + } + return (Calendar) CURRENT_TIME.clone(); + } + } } Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/version/InternalVersionImpl.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/version/InternalVersionImpl.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/version/InternalVersionImpl.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -15,7 +15,6 @@ */ package org.hippoecm.repository.jackrabbit.version; -import org.apache.jackrabbit.core.state.NodeState; import org.apache.jackrabbit.core.value.InternalValue; import org.apache.jackrabbit.core.NodeId; import org.apache.jackrabbit.spi.Name; @@ -28,6 +27,7 @@ import java.util.Calendar; import java.util.HashSet; import java.util.List; +import org.apache.jackrabbit.core.state.ChildNodeEntry; import org.apache.jackrabbit.core.version.InternalFrozenNode; import org.apache.jackrabbit.core.version.InternalVersion; import org.apache.jackrabbit.core.version.InternalVersionHistory; @@ -122,7 +122,7 @@ * {@inheritDoc} */ public NodeId getFrozenNodeId() { - NodeState.ChildNodeEntry entry = node.getState().getChildNodeEntry(NameConstants.JCR_FROZENNODE, 1); + ChildNodeEntry entry = node.getState().getChildNodeEntry(NameConstants.JCR_FROZENNODE, 1); if (entry == null) { throw new InternalError("version has no frozen node: " + getId()); } Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/version/NodeStateEx.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/version/NodeStateEx.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/version/NodeStateEx.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -15,6 +15,15 @@ */ package org.hippoecm.repository.jackrabbit.version; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + +import javax.jcr.RepositoryException; +import javax.jcr.nodetype.ConstraintViolationException; +import javax.jcr.nodetype.NoSuchNodeTypeException; + import org.apache.jackrabbit.core.NodeId; import org.apache.jackrabbit.core.PropertyId; import org.apache.jackrabbit.core.PropertyImpl; @@ -32,16 +41,8 @@ import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.uuid.UUID; import org.apache.jackrabbit.spi.commons.name.NameConstants; +import org.apache.jackrabbit.core.state.ChildNodeEntry; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -import javax.jcr.RepositoryException; -import javax.jcr.nodetype.ConstraintViolationException; -import javax.jcr.nodetype.NoSuchNodeTypeException; - /** * This Class provides some basic node operations directly on the node state. */ @@ -288,10 +289,8 @@ // build effective node type of mixins & primary type // existing mixin's HashSet set = new HashSet((nodeState).getMixinTypeNames()); - // primary type - set.add(nodeState.getNodeTypeName()); try { - return ntReg.getEffectiveNodeType((Name[]) set.toArray(new Name[set.size()])); + return ntReg.getEffectiveNodeType(nodeState.getNodeTypeName(), set); } catch (NodeTypeConflictException ntce) { String msg = "internal error: failed to build effective node type for node " + nodeState.getNodeId(); throw new RepositoryException(msg, ntce); @@ -329,7 +328,7 @@ */ public boolean removeNode(Name name, int index) throws RepositoryException { try { - NodeState.ChildNodeEntry entry = nodeState.getChildNodeEntry(name, index); + ChildNodeEntry entry = nodeState.getChildNodeEntry(name, index); if (entry == null) { return false; } else { @@ -365,7 +364,7 @@ // remove child nodes iter = state.getChildNodeEntries().iterator(); while (iter.hasNext()) { - NodeState.ChildNodeEntry entry = (NodeState.ChildNodeEntry) iter.next(); + ChildNodeEntry entry = (ChildNodeEntry) iter.next(); removeNode(entry.getId()); } state.removeAllChildNodeEntries(); @@ -408,7 +407,7 @@ * @throws RepositoryException */ public NodeStateEx getNode(Name name, int index) throws RepositoryException { - NodeState.ChildNodeEntry entry = nodeState.getChildNodeEntry(name, index); + ChildNodeEntry entry = nodeState.getChildNodeEntry(name, index); if (entry == null) { return null; } @@ -484,7 +483,7 @@ List entries = nodeState.getChildNodeEntries(); NodeStateEx[] children = new NodeStateEx[entries.size()]; for (int i = 0; i < entries.size(); i++) { - NodeState.ChildNodeEntry entry = (NodeState.ChildNodeEntry) entries.get(i); + ChildNodeEntry entry = (ChildNodeEntry) entries.get(i); NodeState state = (NodeState) stateMgr.getItemState(entry.getId()); children[i] = new NodeStateEx(stateMgr, ntReg, state, entry.getName()); } @@ -530,7 +529,7 @@ // now store all child node entries List nodes = state.getChildNodeEntries(); for (int i = 0; i < nodes.size(); i++) { - NodeState.ChildNodeEntry entry = (NodeState.ChildNodeEntry) nodes.get(i); + ChildNodeEntry entry = (ChildNodeEntry) nodes.get(i); NodeState nstate = (NodeState) stateMgr.getItemState(entry.getId()); store(nstate); } @@ -575,7 +574,7 @@ // now reload all child node entries List nodes = state.getChildNodeEntries(); for (int i = 0; i < nodes.size(); i++) { - NodeState.ChildNodeEntry entry = (NodeState.ChildNodeEntry) nodes.get(i); + ChildNodeEntry entry = (ChildNodeEntry) nodes.get(i); NodeState nstate = (NodeState) stateMgr.getItemState(entry.getId()); reload(nstate); } Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/version/VersionItemStateProvider.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/version/VersionItemStateProvider.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/version/VersionItemStateProvider.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -15,6 +15,8 @@ */ package org.hippoecm.repository.jackrabbit.version; +import javax.jcr.RepositoryException; + import org.apache.commons.collections.map.ReferenceMap; import org.apache.jackrabbit.core.ItemId; import org.apache.jackrabbit.core.NodeId; @@ -28,8 +30,7 @@ import org.apache.jackrabbit.core.virtual.VirtualNodeState; import org.apache.jackrabbit.core.virtual.VirtualPropertyState; import org.apache.jackrabbit.spi.Name; - -import javax.jcr.RepositoryException; +import org.apache.jackrabbit.core.state.ChangeLog; import org.apache.jackrabbit.core.version.VersionItemStateManager; /** @@ -117,7 +118,7 @@ /** * @inheritDoc */ - public boolean setNodeReferences(NodeReferences refs) { + public boolean setNodeReferences(ChangeLog refs) { return stateMgr.setNodeReferences(refs); } Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/version/VersionManagerImpl.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/version/VersionManagerImpl.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/version/VersionManagerImpl.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -73,6 +73,7 @@ import org.apache.jackrabbit.core.version.InternalVersionHistory; import org.apache.jackrabbit.core.version.InternalVersionItem; import org.apache.jackrabbit.core.version.VersionHistoryImpl; +import org.apache.jackrabbit.core.version.VersionHistoryInfo; import org.apache.jackrabbit.core.version.VersionImpl; import org.apache.jackrabbit.core.version.VersionItemStateManager; import org.apache.jackrabbit.core.version.VersionManager; @@ -229,19 +230,22 @@ } @Override - public VersionHistory createVersionHistory(Session session, final NodeState node) + public VersionHistoryInfo createVersionHistory(Session session, final NodeState node) throws RepositoryException { - InternalVersionHistory history = (InternalVersionHistory) - escFactory.doSourced((SessionImpl) session, new SourcedTarget(){ + NodeStateEx state = (NodeStateEx) + escFactory.doSourced((SessionImpl) session, new SourcedTarget() { public Object run() throws RepositoryException { return createVersionHistory(node); } }); - if (history == null) { + if (state == null) { throw new VersionException("History already exists for node " + node.getNodeId()); } - return (VersionHistory) ((SessionImpl) session).getNodeById(history.getId()); + Name root = NameConstants.JCR_ROOTVERSION; + return new VersionHistoryInfo( + state.getNodeId(), + state.getState().getChildNodeEntry(root, 1).getId()); } @Override @@ -703,19 +707,53 @@ /** * {@inheritDoc} */ - public VersionHistory getVersionHistory(Session session, NodeState node) + public VersionHistoryInfo getVersionHistory(Session session, NodeState node) throws RepositoryException { + VersionHistoryInfo info = null; + acquireReadLock(); try { - NodeId vhId = getVersionHistoryId(node); - if (vhId == null) { - return null; + String uuid = node.getNodeId().getUUID().toString(); + Name name = getName(uuid); + + NodeStateEx parent = getParentNode(uuid, false); + if (parent != null && parent.hasNode(name)) { + NodeStateEx history = parent.getNode(name, 1); + Name root = NameConstants.JCR_ROOTVERSION; + info = new VersionHistoryInfo( + history.getNodeId(), + history.getState().getChildNodeEntry(root, 1).getId()); } - return (VersionHistory) ((SessionImpl) session).getNodeById(vhId); } finally { releaseReadLock(); } + + if (info == null) { + info = createVersionHistory(session, node); + } + + return info; } + private Name getName(String name) { + return NameFactoryImpl.getInstance().create(Name.NS_DEFAULT_URI, name); + } + private NodeStateEx getParentNode(String uuid, boolean create) + throws RepositoryException { + NodeStateEx n = historyRoot; + for (int i = 0; i < 3; i++) { + Name name = getName(uuid.substring(i * 2, i * 2 + 2)); + if (n.hasNode(name)) { + n = n.getNode(name, 1); + } else if (create) { + n.addNode(name, NameConstants.REP_VERSIONSTORAGE, null, false); + n.store(); + n = n.getNode(name, 1); + } else { + return null; + } + } + return n; + } /** * Creates a new Version History. @@ -724,7 +762,7 @@ * @return the newly created version history. * @throws javax.jcr.RepositoryException */ - public InternalVersionHistory createVersionHistory(NodeState node) + public NodeStateEx createVersionHistory(NodeState node) throws RepositoryException { WriteOperation operation = startWriteOperation(); try { @@ -749,13 +787,12 @@ } // create new history node in the persistent state - InternalVersionHistoryImpl hist = InternalVersionHistoryImpl.create( - this, root, new NodeId(UUID.randomUUID()), historyNodeName, node); + NodeStateEx hist = InternalVersionHistoryImpl.create( + this, root, historyNodeName, node); // end update operation.save(); - log.debug("Created new version history " + hist.getId() + " for " + node + "."); return hist; } catch (ItemStateException e) { Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/version/XAVersionManager.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/version/XAVersionManager.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/version/XAVersionManager.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -63,6 +63,7 @@ import org.apache.jackrabbit.core.version.InternalVersionHistory; import org.apache.jackrabbit.core.version.InternalVersionItem; import org.apache.jackrabbit.core.version.VersionHistoryImpl; +import org.apache.jackrabbit.core.version.VersionHistoryInfo; import org.apache.jackrabbit.core.version.VersionManager; /** @@ -149,17 +150,52 @@ /** * {@inheritDoc} */ - public VersionHistory createVersionHistory(Session session, NodeState node) + public VersionHistoryInfo createVersionHistory(Session session, NodeState node) throws RepositoryException { - if (isInXA()) { - InternalVersionHistory history = createVersionHistory(node); - xaItems.put(history.getId(), history); - return (VersionHistory) ((SessionImpl) session).getNodeById(history.getId()); + NodeStateEx state = createVersionHistory(node); + InternalVersionHistory history = + new InternalVersionHistoryImpl(vMgr, state); + xaItems.put(state.getNodeId(), history); + Name root = NameConstants.JCR_ROOTVERSION; + return new VersionHistoryInfo( + state.getNodeId(), + state.getState().getChildNodeEntry(root, 1).getId()); } return vMgr.createVersionHistory(session, node); } + NodeStateEx createVersionHistory(NodeState node) + throws RepositoryException { + WriteOperation operation = startWriteOperation(); + try { + // create deep path + String uuid = node.getNodeId().getUUID().toString(); + NodeStateEx parent = getParentNode(uuid, true); + Name name = getName(uuid); + if (parent.hasNode(name)) { + // already exists + return null; + } + + // create new history node in the persistent state + NodeStateEx history = + InternalVersionHistoryImpl.create(this, parent, name, node); + + // end update + operation.save(); + + log.debug( + "Created new version history " + history.getNodeId() + + " for " + node + "."); + return history; + } catch (ItemStateException e) { + throw new RepositoryException(e); + } finally { + operation.close(); + } + } + /** * {@inheritDoc} */ @@ -537,7 +573,6 @@ Map vItems = (Map) tx.getAttribute(ITEMS_ATTRIBUTE_NAME); if (!vItems.isEmpty()) { vMgr.acquireWriteLock(); - vMgr.getSharedStateMgr().setNoLockHack(true); vmgrLocked = true; } } @@ -584,7 +619,6 @@ private void internalReleaseWriteLock() { if (vmgrLocked) { - vMgr.getSharedStateMgr().setNoLockHack(false); vMgr.releaseWriteLock(); vmgrLocked = false; } @@ -833,19 +867,53 @@ /** * {@inheritDoc} */ - public VersionHistory getVersionHistory(Session session, NodeState node) + public VersionHistoryInfo getVersionHistory(Session session, NodeState node) throws RepositoryException { + VersionHistoryInfo info = null; + acquireReadLock(); try { - NodeId vhId = getVersionHistoryId(node); - if (vhId == null) { - return null; + String uuid = node.getNodeId().getUUID().toString(); + Name name = getName(uuid); + + NodeStateEx parent = getParentNode(uuid, false); + if (parent != null && parent.hasNode(name)) { + NodeStateEx history = parent.getNode(name, 1); + Name root = NameConstants.JCR_ROOTVERSION; + info = new VersionHistoryInfo( + history.getNodeId(), + history.getState().getChildNodeEntry(root, 1).getId()); } - return (VersionHistory) ((SessionImpl) session).getNodeById(vhId); } finally { releaseReadLock(); } + + if (info == null) { + info = createVersionHistory(session, node); + } + + return info; } + private Name getName(String name) { + return NameFactoryImpl.getInstance().create(Name.NS_DEFAULT_URI, name); + } + private NodeStateEx getParentNode(String uuid, boolean create) + throws RepositoryException { + NodeStateEx n = historyRoot; + for (int i = 0; i < 3; i++) { + Name name = getName(uuid.substring(i * 2, i * 2 + 2)); + if (n.hasNode(name)) { + n = n.getNode(name, 1); + } else if (create) { + n.addNode(name, NameConstants.REP_VERSIONSTORAGE, null, false); + n.store(); + n = n.getNode(name, 1); + } else { + return null; + } + } + return n; + } /** * Creates a new Version History. @@ -853,7 +921,8 @@ * @param node the node for which the version history is to be initialized * @return the newly created version history. * @throws javax.jcr.RepositoryException - */ + * + // FIXME HREPTWO-2098 public InternalVersionHistory createVersionHistory(NodeState node) throws RepositoryException { WriteOperation operation = startWriteOperation(); @@ -893,7 +962,7 @@ } finally { operation.close(); } - } + }*/ /** * Returns the id of the version history associated with the given node Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/xml/DereferencedImportHandler.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/xml/DereferencedImportHandler.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/xml/DereferencedImportHandler.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -18,13 +18,15 @@ import java.util.HashMap; import java.util.Map; +import javax.jcr.NamespaceException; import javax.jcr.RepositoryException; import org.apache.jackrabbit.core.NamespaceRegistryImpl; +import org.apache.jackrabbit.core.SessionImpl; import org.apache.jackrabbit.core.xml.ImportHandler; import org.apache.jackrabbit.core.xml.Importer; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.xml.sax.Attributes; @@ -41,7 +43,7 @@ protected final Importer importer; protected final NamespaceRegistryImpl nsReg; - protected final NamespaceResolver nsResolver; + protected final SessionImpl session; /** * The local namespace mappings reported by @@ -53,12 +55,11 @@ private DereferencedSysViewImportHandler targetHandler; - public DereferencedImportHandler(Importer importer, NamespaceResolver nsResolver, - NamespaceRegistryImpl nsReg) { - super(importer, nsResolver, nsReg); + public DereferencedImportHandler(Importer importer, SessionImpl session, NamespaceRegistryImpl nsReg) throws RepositoryException { + super(importer, session); this.importer = importer; - this.nsResolver = nsResolver; this.nsReg = nsReg; + this.session = session; } //---------------------------------------------------------< ErrorHandler > @@ -103,8 +104,7 @@ localNamespaceMappings = new HashMap(); String[] uris = nsReg.getURIs(); for (int i = 0; i < uris.length; i++) { - localNamespaceMappings.put( - nsResolver.getPrefix(uris[i]), uris[i]); + localNamespaceMappings.put(session.getPrefix(uris[i]), uris[i]); } } catch (RepositoryException re) { throw new SAXException(re); @@ -136,7 +136,14 @@ localNamespaceMappings.put(prefix, uri); try { // Register the namespace unless already registered - nsReg.safeRegisterNamespace(prefix, uri); + String existingURI = null; + try { + existingURI = nsReg.getURI(prefix); + } catch(NamespaceException ex) { + nsReg.registerNamespace(prefix, uri); + } + if(existingURI != null && !existingURI.equals(uri)) + throw new NamespaceException("prefix already mapped to different URI"); } catch (RepositoryException re) { throw new SAXException(re); } Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/xml/DereferencedSessionImporter.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/xml/DereferencedSessionImporter.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/xml/DereferencedSessionImporter.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -37,6 +37,8 @@ import org.apache.jackrabbit.core.xml.Importer; import org.apache.jackrabbit.core.xml.NodeInfo; import org.apache.jackrabbit.spi.Name; +import org.apache.jackrabbit.spi.commons.conversion.DefaultNamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.spi.commons.name.NameConstants; import org.apache.jackrabbit.uuid.UUID; import org.hippoecm.repository.api.ImportMergeBehavior; @@ -57,6 +59,7 @@ private final int referenceBehavior; private final int mergeBehavior; private final String importPath; + private NamePathResolver resolver; private boolean isRootReferenceable; @@ -83,6 +86,7 @@ this.uuidBehavior = uuidBehavior; this.mergeBehavior = mergeBehavior; this.referenceBehavior = referenceBehavior; + this.resolver = resolver = new DefaultNamePathResolver(session, true); isRootReferenceable = false; try { @@ -353,7 +357,7 @@ Iterator iter = propInfos.iterator(); while (iter.hasNext()) { PropInfo propInfo = (PropInfo) iter.next(); - propInfo.apply(node, session.getNamePathResolver(), derefNodes, importPath, referenceBehavior); + propInfo.apply(node, resolver, derefNodes, importPath, referenceBehavior); } parents.push(node); Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/query/lucene/LuceneSpellChecker.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/query/lucene/LuceneSpellChecker.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/query/lucene/LuceneSpellChecker.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -21,12 +21,13 @@ import java.util.ArrayList; import java.util.List; +import javax.jcr.RepositoryException; import org.apache.jackrabbit.core.query.QueryHandler; -import org.apache.jackrabbit.core.query.QueryRootNode; -import org.apache.jackrabbit.core.query.RelationQueryNode; -import org.apache.jackrabbit.core.query.TraversingQueryNodeVisitor; import org.apache.jackrabbit.core.query.lucene.FieldNames; import org.apache.jackrabbit.core.query.lucene.SearchIndex; +import org.apache.jackrabbit.spi.commons.query.QueryRootNode; +import org.apache.jackrabbit.spi.commons.query.RelationQueryNode; +import org.apache.jackrabbit.spi.commons.query.TraversingQueryNodeVisitor; import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.index.IndexReader; @@ -143,6 +144,7 @@ /** * {@inheritDoc} */ + @Override public String check(QueryRootNode aqt) throws IOException { String stmt = getFulltextStatement(aqt); if (stmt == null) { @@ -166,9 +168,10 @@ * @return the fulltext statement or null. */ private String getFulltextStatement(QueryRootNode aqt) { + try { final String[] stmt = new String[1]; aqt.accept(new TraversingQueryNodeVisitor() { - public Object visit(RelationQueryNode node, Object o) { + public Object visit(RelationQueryNode node, Object o) throws RepositoryException { if (stmt[0] == null && node.getOperation() == RelationQueryNode.OPERATION_SPELLCHECK) { stmt[0] = node.getStringValue(); } @@ -176,6 +179,9 @@ } }, null); return stmt[0]; + } catch(RepositoryException ex) { + return null; + } } private final class InternalSpellChecker { Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/query/lucene/ServicingLuceneQueryBuilder.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/query/lucene/ServicingLuceneQueryBuilder.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/query/lucene/ServicingLuceneQueryBuilder.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -18,10 +18,10 @@ import org.apache.jackrabbit.core.HierarchyManager; import org.apache.jackrabbit.core.SessionImpl; import org.apache.jackrabbit.core.query.PropertyTypeRegistry; -import org.apache.jackrabbit.core.query.QueryRootNode; import org.apache.jackrabbit.core.query.lucene.NamespaceMappings; import org.apache.jackrabbit.core.query.lucene.SynonymProvider; import org.apache.jackrabbit.core.state.ItemStateManager; +import org.apache.jackrabbit.spi.commons.query.QueryRootNode; import org.apache.lucene.analysis.Analyzer; /** Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/query/lucene/ServicingNodeIndexer.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/query/lucene/ServicingNodeIndexer.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/query/lucene/ServicingNodeIndexer.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -29,6 +29,7 @@ import org.apache.jackrabbit.core.query.lucene.LongField; import org.apache.jackrabbit.core.query.lucene.NamespaceMappings; import org.apache.jackrabbit.core.query.lucene.NodeIndexer; +import org.apache.jackrabbit.core.state.ChildNodeEntry; import org.apache.jackrabbit.core.state.ItemStateException; import org.apache.jackrabbit.core.state.NoSuchItemStateException; import org.apache.jackrabbit.core.state.NodeState; @@ -116,7 +117,7 @@ // root node } else { NodeState parent = (NodeState) stateProvider.getItemState(node.getParentId()); - NodeState.ChildNodeEntry child = parent.getChildNodeEntry(node.getNodeId()); + ChildNodeEntry child = parent.getChildNodeEntry(node.getNodeId()); if (child == null) { throw new RepositoryException("Missing child node entry " + "for node with id: " + node.getNodeId()); Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/query/lucene/ServicingSearchIndex.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/query/lucene/ServicingSearchIndex.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/query/lucene/ServicingSearchIndex.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -35,10 +35,10 @@ import org.apache.jackrabbit.core.query.lucene.MultiIndex; import org.apache.jackrabbit.core.query.lucene.NamespaceMappings; import org.apache.jackrabbit.core.query.lucene.SearchIndex; +import org.apache.jackrabbit.core.state.ChildNodeEntry; import org.apache.jackrabbit.core.state.ItemStateException; import org.apache.jackrabbit.core.state.NoSuchItemStateException; import org.apache.jackrabbit.core.state.NodeState; -import org.apache.jackrabbit.core.state.NodeState.ChildNodeEntry; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.spi.commons.name.NameConstants; import org.apache.lucene.document.Document; Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/security/HippoAMContext.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/security/HippoAMContext.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/security/HippoAMContext.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -17,6 +17,7 @@ import java.io.File; +import javax.jcr.Session; import javax.jcr.nodetype.NodeTypeManager; import javax.security.auth.Subject; @@ -26,7 +27,6 @@ import org.apache.jackrabbit.core.security.AccessManager; import org.apache.jackrabbit.core.state.SessionItemStateManager; import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; -import org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver; /** * An AMContext is used to provide context information for an @@ -35,7 +35,6 @@ * @see AccessManager#init(AMContext) */ public class HippoAMContext extends AMContext { - /** SVN id placeholder */ @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; @@ -51,11 +50,6 @@ private final SessionItemStateManager itemMgr; /** - * NamePathResolver - */ - private final NamePathResolver npResolver; - - /** * Creates a new AMContext. * * @param physicalHomeDir the physical home directory @@ -67,17 +61,16 @@ */ public HippoAMContext(File physicalHomeDir, FileSystem fs, + Session session, Subject subject, HierarchyManager hierMgr, - SessionItemStateManager itemMgr, - NamespaceResolver nsResolver, + NamePathResolver npResolver, String workspaceName, NodeTypeManager ntMgr, - NamePathResolver npResolver) { - super(physicalHomeDir, fs, subject, hierMgr, nsResolver, workspaceName); + SessionItemStateManager itemMgr) { + super(physicalHomeDir, fs, session, subject, hierMgr, npResolver, workspaceName); this.ntMgr = ntMgr; this.itemMgr = itemMgr; - this.npResolver = npResolver; } /** @@ -96,8 +89,4 @@ public SessionItemStateManager getSessionItemStateManager() { return itemMgr; } - - public NamePathResolver getNamePathResolver() { - return npResolver; - } } Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/security/HippoAccessManager.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/security/HippoAccessManager.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/security/HippoAccessManager.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -16,9 +16,7 @@ package org.hippoecm.repository.security; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.WeakHashMap; @@ -36,7 +34,6 @@ import javax.jcr.nodetype.NodeTypeManager; import javax.security.auth.Subject; -import org.apache.commons.collections.map.LRUMap; import org.apache.jackrabbit.core.ItemId; import org.apache.jackrabbit.core.NodeId; import org.apache.jackrabbit.core.PropertyId; @@ -45,6 +42,9 @@ import org.apache.jackrabbit.core.security.AnonymousPrincipal; import org.apache.jackrabbit.core.security.SystemPrincipal; import org.apache.jackrabbit.core.security.UserPrincipal; +import org.apache.jackrabbit.core.security.authorization.AccessControlProvider; +import org.apache.jackrabbit.core.security.authorization.Permission; +import org.apache.jackrabbit.core.security.authorization.WorkspaceAccessManager; import org.apache.jackrabbit.core.state.ItemState; import org.apache.jackrabbit.core.state.ItemStateException; import org.apache.jackrabbit.core.state.NoSuchItemStateException; @@ -57,13 +57,10 @@ import org.apache.jackrabbit.spi.commons.conversion.NameException; import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.spi.commons.conversion.NameResolver; -import org.apache.jackrabbit.spi.commons.conversion.ParsingNameResolver; import org.apache.jackrabbit.spi.commons.conversion.ParsingPathResolver; import org.apache.jackrabbit.spi.commons.conversion.PathResolver; import org.apache.jackrabbit.spi.commons.name.NameConstants; -import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; import org.apache.jackrabbit.spi.commons.name.PathFactoryImpl; -import org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver; import org.hippoecm.repository.api.HippoNodeType; import org.hippoecm.repository.jackrabbit.HippoHierarchyManager; import org.hippoecm.repository.jackrabbit.HippoSessionItemStateManager; @@ -117,11 +114,6 @@ private NodeTypeManager ntMgr; /** - * NamespaceResolver - */ - private NamespaceResolver nsRes; - - /** * NamePathResolver */ private NamePathResolver npRes; @@ -216,12 +208,19 @@ /** * {@inheritDoc} */ + public void init(AMContext context, AccessControlProvider acProvider, WorkspaceAccessManager wspAccessMgr) + throws AccessDeniedException, Exception { + init(context); + } + + /** + * {@inheritDoc} + */ public void init(AMContext context) throws AccessDeniedException, Exception { if (initialized) { throw new IllegalStateException("already initialized"); } subject = context.getSubject(); - nsRes = context.getNamespaceResolver(); hierMgr = (HippoHierarchyManager) context.getHierarchyManager(); if (context instanceof HippoAMContext) { ntMgr = ((HippoAMContext) context).getNodeTypeManager(); @@ -229,7 +228,7 @@ // This will be part of the new AMContext in JR 1.5 npRes = ((HippoAMContext) context).getNamePathResolver(); } - nRes = new CachingNameResolver(new ParsingNameResolver(NameFactoryImpl.getInstance(), nsRes)); + nRes = new CachingNameResolver(context.getNamePathResolver()); // Shortcuts for checks isSystem = !subject.getPrincipals(SystemPrincipal.class).isEmpty(); @@ -292,7 +291,6 @@ hierMgr = null; itemMgr = null; ntMgr = null; - nsRes = null; npRes = null; nRes = null; } @@ -387,7 +385,7 @@ } // Does the user has the correct permissions for the Domain - if ((permissions & fap.getPermissions()) == permissions) { + if ((fap.matchPermissions(permissions))) { // is the node part of one of the domain rules if (isNodeInDomain(nodeState, fap)) { allowed = true; @@ -558,6 +556,44 @@ return true; } + public boolean canRead(Path path) throws RepositoryException { + return isGranted(hierMgr.resolvePath(path), Permission.READ); + } + + public boolean isGranted(Path path, Name name, int permissions) throws RepositoryException { + if((permissions & Permission.SET_PROPERTY) != 0) { + return isGranted(path, Permission.SET_PROPERTY); + } else if((permissions & Permission.ADD_NODE) != 0) { + return isGranted(path, Permission.ADD_NODE); + } else if((permissions & Permission.REMOVE_PROPERTY) != 0) { + return isGranted(path, Permission.SET_PROPERTY); + } else if((permissions & Permission.REMOVE_NODE) != 0) { + return isGranted(path, Permission.ADD_NODE); + } else { + return isGranted(PathFactoryImpl.getInstance().create(path, name, true), permissions); + } + } + + public boolean isGranted(Path path, int permissions) throws RepositoryException { + ItemId itemId = hierMgr.resolvePath(path); + if (itemId != null) { + return isGranted(itemId, permissions); + } else { + Path parent = path.getAncestor(1); + if((permissions & Permission.SET_PROPERTY) != 0) { + return isGranted(parent, Permission.SET_PROPERTY); + } else if((permissions & Permission.ADD_NODE) != 0) { + return isGranted(parent, Permission.ADD_NODE); + } else if((permissions & Permission.REMOVE_PROPERTY) != 0) { + return isGranted(parent, Permission.SET_PROPERTY); + } else if((permissions & Permission.REMOVE_NODE) != 0) { + return isGranted(parent, Permission.ADD_NODE); + } + return true; + } + } + + /** * {@inheritDoc} */ @@ -568,6 +604,9 @@ if (log.isTraceEnabled()) { log.trace("Checking [" + pString(permissions) + "] for: " + id); } + if (!(id instanceof NodeId)) { + return true; + } if (isSystem) { if (log.isTraceEnabled()) { log.trace("Granted [" + pString(permissions) + "] for: " + id + " to system user"); @@ -577,7 +616,7 @@ // handle properties if (!id.denotesNode()) { - if ((permissions & REMOVE) == REMOVE) { + if ((permissions & (Permission.REMOVE_NODE|Permission.REMOVE_PROPERTY)) != 0) { // Don't check remove on properties. A write check on the node itself is done. return true; } @@ -585,7 +624,7 @@ } // Check read access cache - if ((permissions & READ) == READ) { + if ((permissions & Permission.READ) != 0) { Boolean allowRead = readAccessCache.get(id); if (allowRead != null) { if (log.isTraceEnabled()) { @@ -614,7 +653,7 @@ boolean isGranted = canAccessNode(nodeState, permissions); // update read access cache - if ((permissions & READ) == READ) { + if ((permissions & Permission.READ) != 0) { readAccessCache.put(id, isGranted); } @@ -746,21 +785,21 @@ StringBuffer buf = new StringBuffer(); // narrow down permissions - if ((permissions & READ) == READ) { + if ((permissions & Permission.READ) != 0) { buf.append('r'); } else { buf.append('-'); } // narrow down permissions - if ((permissions & WRITE) == WRITE) { + if ((permissions & (Permission.ADD_NODE|Permission.SET_PROPERTY)) != 0) { buf.append('w'); } else { buf.append('-'); } // narrow down permissions - if ((permissions & REMOVE) == REMOVE) { + if ((permissions & (Permission.REMOVE_NODE|Permission.REMOVE_PROPERTY)) != 0) { buf.append('d'); } else { buf.append('-'); Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/security/SimpleAccessManager.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/security/SimpleAccessManager.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/security/SimpleAccessManager.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -20,9 +20,13 @@ import javax.jcr.NoSuchWorkspaceException; import javax.jcr.RepositoryException; +import javax.security.auth.Subject; +import org.apache.jackrabbit.core.HierarchyManager; import org.apache.jackrabbit.core.ItemId; import org.apache.jackrabbit.core.security.AMContext; import org.apache.jackrabbit.core.security.AccessManager; +import org.apache.jackrabbit.core.security.AnonymousPrincipal; +import org.apache.jackrabbit.core.security.SystemPrincipal; import org.apache.jackrabbit.core.security.UserPrincipal; import org.apache.jackrabbit.core.state.ItemState; import org.apache.jackrabbit.core.state.ItemStateException; @@ -32,13 +36,18 @@ import org.hippoecm.repository.jackrabbit.HippoHierarchyManager; @Deprecated -public class SimpleAccessManager extends org.apache.jackrabbit.core.security.SimpleAccessManager implements AccessManager { +public class SimpleAccessManager extends org.apache.jackrabbit.core.security.simple.SimpleAccessManager implements AccessManager { /** SVN id placeholder */ @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; private boolean initialized; + + private Subject subject; + private HierarchyManager hierMgr; + private boolean system; + private boolean anonymous; /** * Empty constructor @@ -59,7 +68,12 @@ throw new IllegalStateException("already initialized"); } super.init(context); - + + subject = context.getSubject(); + anonymous = !subject.getPrincipals(AnonymousPrincipal.class).isEmpty(); + system = !subject.getPrincipals(SystemPrincipal.class).isEmpty(); + hierMgr = context.getHierarchyManager(); + initialized = true; } Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/security/principals/FacetAuthPrincipal.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/security/principals/FacetAuthPrincipal.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/security/principals/FacetAuthPrincipal.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -20,6 +20,8 @@ import java.util.Collections; import java.util.Set; +import org.apache.jackrabbit.core.security.AccessManager; +import org.apache.jackrabbit.core.security.authorization.Permission; import org.apache.jackrabbit.spi.Name; import org.hippoecm.repository.security.domain.DomainRule; @@ -117,18 +119,29 @@ } /** - * Get the JCR permissions - * @return the JCR permissions the user has for the domain + * Match the JCR permissions + * @param requestedPermissions the permissions the users requests + * @return wether the permissions are granted within the domain */ - public int getPermissions() { - return permissions; + public boolean matchPermissions(int requestedPermissions) { + if((requestedPermissions & Permission.READ) != 0) { + if((permissions&AccessManager.READ) != AccessManager.READ) { + return false; + } + } + if((requestedPermissions & (Permission.ADD_NODE|Permission.SET_PROPERTY)) != 0) { + if((permissions&AccessManager.WRITE) != AccessManager.WRITE) { + return false; + } + } + if((requestedPermissions & (Permission.REMOVE_PROPERTY|Permission.REMOVE_NODE)) != 0) { + if((permissions&AccessManager.REMOVE) != AccessManager.REMOVE) { + return false; + } + } + return true; } - - - - - /** * String for pretty printing and generating the hashcode * @param facet Modified: hippo-ecm/trunk/repository/engine/src/test/java/org/hippoecm/repository/CanonicalPathTest.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/test/java/org/hippoecm/repository/CanonicalPathTest.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/engine/src/test/java/org/hippoecm/repository/CanonicalPathTest.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -15,9 +15,6 @@ */ package org.hippoecm.repository; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import javax.jcr.ItemExistsException; import javax.jcr.Node; import javax.jcr.PathNotFoundException; @@ -28,11 +25,15 @@ import javax.jcr.nodetype.NoSuchNodeTypeException; import javax.jcr.version.VersionException; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import org.junit.Ignore; +import org.junit.Test; + import org.apache.jackrabbit.core.ItemId; import org.apache.jackrabbit.core.NodeImpl; import org.hippoecm.repository.api.HippoNode; import org.hippoecm.repository.api.HippoNodeType; -import org.junit.Test; public class CanonicalPathTest extends TestCase { @SuppressWarnings("unused") Modified: hippo-ecm/trunk/repository/engine/src/test/java/org/hippoecm/repository/FacetedAuthorizationTest.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/test/java/org/hippoecm/repository/FacetedAuthorizationTest.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/engine/src/test/java/org/hippoecm/repository/FacetedAuthorizationTest.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -15,11 +15,6 @@ */ package org.hippoecm.repository; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import java.security.AccessControlException; import javax.jcr.AccessDeniedException; @@ -31,11 +26,17 @@ import javax.jcr.query.Query; import javax.jcr.query.QueryManager; -import org.hippoecm.repository.api.HippoNodeType; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; +import org.hippoecm.repository.api.HippoNodeType; + public class FacetedAuthorizationTest extends TestCase { @SuppressWarnings("unused") @@ -104,7 +105,7 @@ @Override @Before public void setUp() throws Exception { - super.setUp(); + super.setUp(true); cleanup(); Node config = session.getRootNode().getNode(HippoNodeType.CONFIGURATION_PATH); @@ -260,7 +261,7 @@ @After public void tearDown() throws Exception { cleanup(); - super.tearDown(); + super.tearDown(true); } @Test @@ -334,7 +335,7 @@ userSession.checkPermission(testData.getPath() + "/" + "writedoc0/newnode" , ADD_NODE_ACTION); node = testData.getNode("writedoc0"); - node.addNode("newnode", "hippo:ntunstructured").setProperty("authtest", "canread"); + node.addNode("newnode", "nt:unstructured").setProperty("authtest", "canread"); userSession.save(); } @@ -349,7 +350,7 @@ userSession.checkPermission(testData.getPath() + "/" + "readdoc0/subwrite/newnode" , ADD_NODE_ACTION); node = testData.getNode("readdoc0/subwrite"); - node.addNode("newnode", "hippo:ntunstructured").setProperty("authtest", "canread"); + node.addNode("newnode", "nt:unstructured").setProperty("authtest", "canread"); userSession.save(); } @@ -374,16 +375,6 @@ // expected userSession.refresh(false); } - - try { - node = testData.getNode("writedoc0"); - node.setProperty("authtest", "nope"); - userSession.save(); - fail("Shouldn't be allowed to change node to non-writeable."); - } catch (AccessDeniedException e) { - // expected - userSession.refresh(false); - } } @Test @@ -448,16 +439,21 @@ fail("Should be allowed to add and remove property from node."); } try { - - userSession.checkPermission(testData.getPath() + "/" + "writedoc0/subwrite" , REMOVE_ACTION); + node = testData.getNode("writedoc0"); + node.setProperty("allowedprop", "test"); + userSession.save(); + userSession.checkPermission(testData.getPath() + "/" + "writedoc0/subwrite", REMOVE_ACTION); node = testData.getNode("writedoc0/subwrite"); node.remove(); userSession.save(); } catch (AccessDeniedException e) { fail("Should be allowed to delete node."); + } catch (AccessControlException ex) { + fail("Should be allowed to delete node"); } } + @Test public void testDeletesNotAllowed() throws RepositoryException { Node node; try { @@ -480,7 +476,7 @@ } } - @Test + @Ignore // FIXME HREPTWO-2126 public void testSubDeletesNotAllowed() throws RepositoryException { try { testData.getNode("readdoc0/subread").remove(); @@ -500,7 +496,7 @@ } } - @Test + @Ignore // FIXME HREPTWO-2126 public void testSelfExclusionNotAllowed() throws RepositoryException { Node node; try { @@ -525,7 +521,7 @@ try { node = testData.getNode("writedoc0"); - node.addNode("mynode1", "hippo:ntunstructured").setProperty("authtest", "none"); + node.addNode("mynode1", "nt:unstructured").setProperty("authtest", "none"); userSession.save(); // JackRabbit swallows the AccessDeniedException, so check manually for node @@ -542,7 +538,7 @@ } try { node = testData.getNode("writedoc0"); - node.addNode("mynode2", "hippo:ntunstructured").setProperty("authtest", "read"); + node.addNode("mynode2", "nt:unstructured").setProperty("authtest", "read"); userSession.save(); // JackRabbit swallows the AccessDeniedException, so check manually for node Modified: hippo-ecm/trunk/repository/engine/src/test/java/org/hippoecm/repository/decorating/FacetedReferenceTest.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/test/java/org/hippoecm/repository/decorating/FacetedReferenceTest.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/engine/src/test/java/org/hippoecm/repository/decorating/FacetedReferenceTest.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -129,6 +129,7 @@ @Test public void testPreferenceOrder() throws Exception { Node node = traverse(session, "/test/prefer/articles/war-of-the-worlds"); + assertNotNull(node); NodeIterator iter = node.getNodes(node.getName()); assertTrue(iter.hasNext()); node = iter.nextNode(); Modified: hippo-ecm/trunk/repository/modules/src/main/java/org/hippoecm/repository/jackrabbit/DataProviderContext.java =================================================================== --- hippo-ecm/trunk/repository/modules/src/main/java/org/hippoecm/repository/jackrabbit/DataProviderContext.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/modules/src/main/java/org/hippoecm/repository/jackrabbit/DataProviderContext.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -15,6 +15,7 @@ */ package org.hippoecm.repository.jackrabbit; +import javax.jcr.NamespaceException; import org.apache.jackrabbit.core.HierarchyManager; import org.apache.jackrabbit.core.ItemId; import org.apache.jackrabbit.core.NodeId; @@ -25,7 +26,9 @@ import org.apache.jackrabbit.core.state.NodeState; import org.apache.jackrabbit.core.state.PropertyState; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver; +import org.apache.jackrabbit.spi.Path; +import org.apache.jackrabbit.spi.commons.conversion.IllegalNameException; +import org.apache.jackrabbit.spi.commons.conversion.MalformedPathException; import org.hippoecm.repository.FacetedNavigationEngine; import org.hippoecm.repository.FacetedNavigationEngine.Context; @@ -42,10 +45,8 @@ public void registerProviderProperty(Name propName); - public NodeTypeRegistry getNodeTypeRegistry(); + public NodeTypeRegistry getNodeTypeRegistry();; - public NamespaceResolver getNamespaceResolver(); - public HierarchyManager getHierarchyManager(); public FacetedNavigationEngine getFacetedEngine(); @@ -59,4 +60,10 @@ public NodeState createNew(NodeId nodeId, Name nodeTypeName, NodeId parentId); public PropertyState createNew(Name propName, NodeId parentId); + + public Name getQName(String name) throws IllegalNameException, NamespaceException; + + public Path getQPath(String path) throws MalformedPathException, IllegalNameException, NamespaceException; + + public boolean isEnabled(); // FIXME HREPTWO-2125 } Modified: hippo-ecm/trunk/repository/modules/src/main/java/org/hippoecm/repository/jackrabbit/FacetSelectProvider.java =================================================================== --- hippo-ecm/trunk/repository/modules/src/main/java/org/hippoecm/repository/jackrabbit/FacetSelectProvider.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/modules/src/main/java/org/hippoecm/repository/jackrabbit/FacetSelectProvider.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -23,6 +23,7 @@ import javax.jcr.RepositoryException; import org.apache.jackrabbit.core.NodeId; +import org.apache.jackrabbit.core.state.ChildNodeEntry; import org.apache.jackrabbit.core.state.NodeState; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.uuid.UUID; @@ -75,7 +76,7 @@ } catch (IllegalArgumentException e) { log.error("invalid docbase '" + docbase[0] + "' because not a valid UUID "); } - if(dereference != null) { + if(dereference != null && isEnabled()) { boolean singledView = false; LinkedHashMap view = new LinkedHashMap(); LinkedHashMap order = null; @@ -127,7 +128,7 @@ // since the order is not null, we first have to sort all childs according the order. We only order below a handle Vector children = new Vector(); for(Iterator iter = dereference.getChildNodeEntries().iterator(); iter.hasNext(); ){ - NodeState.ChildNodeEntry entry = (NodeState.ChildNodeEntry) iter.next(); + ChildNodeEntry entry = (ChildNodeEntry) iter.next(); ViewNodeId childNodeId = subNodesProvider. new ViewNodeId(state.getNodeId(), entry.getId(), entry.getName(), view, order, singledView); children.add(childNodeId . new Child(entry.getName(), childNodeId)); } @@ -139,7 +140,7 @@ } else { for(Iterator iter = dereference.getChildNodeEntries().iterator(); iter.hasNext(); ) { - NodeState.ChildNodeEntry entry = (NodeState.ChildNodeEntry) iter.next(); + ChildNodeEntry entry = (ChildNodeEntry) iter.next(); if(subNodesProvider.match(view, entry.getId())) { /* * below we check on the entry's nodestate wether the node type is hippo:request, Modified: hippo-ecm/trunk/repository/modules/src/main/java/org/hippoecm/repository/jackrabbit/FacetTypeConstants.java =================================================================== --- hippo-ecm/trunk/repository/modules/src/main/java/org/hippoecm/repository/jackrabbit/FacetTypeConstants.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/modules/src/main/java/org/hippoecm/repository/jackrabbit/FacetTypeConstants.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -22,11 +22,11 @@ public interface FacetTypeConstants { final static String SVN_ID = "$Id$"; - public final static Character STRING_POSTFIX = '\uFFFF'; - public final static Character BOOLEAN_POSTFIX = '\uFFFE'; - public final static Character LONG_POSTFIX = '\uFFFD'; - public final static Character DOUBLE_POSTFIX = '\uFFFC'; - public final static Character DATE_POSTFIX = '\uFFFB'; + public final static Character STRING_POSTFIX = '\uFAFA'; + public final static Character BOOLEAN_POSTFIX = '\uFAFE'; + public final static Character LONG_POSTFIX = '\uFAFD'; + public final static Character DOUBLE_POSTFIX = '\uFAFC'; + public final static Character DATE_POSTFIX = '\uFAFB'; public final static Character[] POSTFIXES = {STRING_POSTFIX,BOOLEAN_POSTFIX,LONG_POSTFIX,DOUBLE_POSTFIX,DATE_POSTFIX}; public final static int STRING = 0; Modified: hippo-ecm/trunk/repository/modules/src/main/java/org/hippoecm/repository/jackrabbit/HippoNodeId.java =================================================================== --- hippo-ecm/trunk/repository/modules/src/main/java/org/hippoecm/repository/jackrabbit/HippoNodeId.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/modules/src/main/java/org/hippoecm/repository/jackrabbit/HippoNodeId.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -27,7 +27,6 @@ public class HippoNodeId extends NodeId { - private static final long serialVersionUID = 1L; @SuppressWarnings("unused") Modified: hippo-ecm/trunk/repository/modules/src/main/java/org/hippoecm/repository/jackrabbit/HippoVirtualProvider.java =================================================================== --- hippo-ecm/trunk/repository/modules/src/main/java/org/hippoecm/repository/jackrabbit/HippoVirtualProvider.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/modules/src/main/java/org/hippoecm/repository/jackrabbit/HippoVirtualProvider.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -27,7 +27,6 @@ import org.apache.jackrabbit.core.ItemId; import org.apache.jackrabbit.core.NodeId; import org.apache.jackrabbit.core.PropertyId; -import org.apache.jackrabbit.core.nodetype.EffectiveNodeType; import org.apache.jackrabbit.core.nodetype.NodeDef; import org.apache.jackrabbit.core.nodetype.NodeTypeConflictException; import org.apache.jackrabbit.core.nodetype.PropDef; @@ -37,18 +36,10 @@ import org.apache.jackrabbit.core.state.PropertyState; import org.apache.jackrabbit.core.value.InternalValue; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.spi.NameFactory; import org.apache.jackrabbit.spi.Path; -import org.apache.jackrabbit.spi.PathFactory; import org.apache.jackrabbit.spi.commons.conversion.IllegalNameException; import org.apache.jackrabbit.spi.commons.conversion.MalformedPathException; -import org.apache.jackrabbit.spi.commons.conversion.NameParser; -import org.apache.jackrabbit.spi.commons.conversion.NameResolver; -import org.apache.jackrabbit.spi.commons.conversion.ParsingNameResolver; -import org.apache.jackrabbit.spi.commons.conversion.PathParser; import org.apache.jackrabbit.spi.commons.name.NameConstants; -import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; -import org.apache.jackrabbit.spi.commons.name.PathFactoryImpl; public abstract class HippoVirtualProvider implements DataProviderModule { @@ -56,9 +47,6 @@ private final static String SVN_ID = "$Id$"; private DataProviderContext stateMgr; - private NameFactory nameFactory; - private PathFactory pathFactory; - private NameResolver nameResolver; private Name externalNodeName; private Name virtualNodeName; @@ -75,12 +63,11 @@ throw new RepositoryException("required property "+propName+" in nodetype "+nodeTypeName+" not or badly defined"); } - protected final NodeDef lookupNodeDef(NodeState parent, Name nodeTypeName, Name nodeName) throws RepositoryException { - EffectiveNodeType effNodeType; + protected final NodeDef lookupNodeDef(NodeState parent, org.apache.jackrabbit.spi.Name nodeTypeName, org.apache.jackrabbit.spi.Name nodeName) throws RepositoryException { + org.apache.jackrabbit.core.nodetype.EffectiveNodeType effNodeType; try { HashSet set = new HashSet(parent.getMixinTypeNames()); - set.add(parent.getNodeTypeName()); - effNodeType = stateMgr.getNodeTypeRegistry().getEffectiveNodeType((Name[]) set.toArray(new Name[set.size()])); + effNodeType = stateMgr.getNodeTypeRegistry().getEffectiveNodeType(parent.getNodeTypeName(), set); try { return effNodeType.getApplicableChildNodeDef(nodeName, nodeTypeName, stateMgr.getNodeTypeRegistry()); } catch (RepositoryException re) { @@ -102,9 +89,6 @@ public void initialize(DataProviderContext stateMgr) throws RepositoryException { this.stateMgr = stateMgr; - nameFactory = NameFactoryImpl.getInstance(); - pathFactory = PathFactoryImpl.getInstance(); - nameResolver = new ParsingNameResolver(nameFactory, stateMgr.getNamespaceResolver()); initialize(); } @@ -122,11 +106,11 @@ } protected final Name resolveName(String name) throws IllegalNameException, NamespaceException { - return name != null ? NameParser.parse(name, stateMgr.getNamespaceResolver(), nameFactory) : null; + return stateMgr.getQName(name); } protected final Path resolvePath(String path) throws IllegalNameException, NamespaceException, MalformedPathException { - return path != null ? PathParser.parse((String)path, nameResolver, (PathFactory)pathFactory) : null; + return stateMgr.getQPath(path); } public NodeState populate(NodeState state) throws RepositoryException { @@ -226,4 +210,8 @@ throw new RepositoryException(ex.getMessage(), ex); } } + + public boolean isEnabled() { + return stateMgr.isEnabled(); // FIXME HREPTWO-2125 + } } Modified: hippo-ecm/trunk/repository/modules/src/main/java/org/hippoecm/repository/jackrabbit/MirrorVirtualProvider.java =================================================================== --- hippo-ecm/trunk/repository/modules/src/main/java/org/hippoecm/repository/jackrabbit/MirrorVirtualProvider.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/modules/src/main/java/org/hippoecm/repository/jackrabbit/MirrorVirtualProvider.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -25,6 +25,7 @@ import org.apache.jackrabbit.core.PropertyId; import org.apache.jackrabbit.core.nodetype.PropDef; import org.apache.jackrabbit.core.nodetype.PropDefId; +import org.apache.jackrabbit.core.state.ChildNodeEntry; import org.apache.jackrabbit.core.state.NodeState; import org.apache.jackrabbit.core.state.PropertyState; import org.apache.jackrabbit.core.value.InternalValue; @@ -90,24 +91,28 @@ @Override public NodeState populate(NodeState state) throws RepositoryException { - NodeId nodeId = state.getNodeId(); - String docbase = getProperty(nodeId, docbaseName)[0]; - NodeState upstream = getNodeState(new NodeId(new UUID(docbase))); - for(Iterator iter = upstream.getChildNodeEntries().iterator(); iter.hasNext(); ) { - NodeState.ChildNodeEntry entry = (NodeState.ChildNodeEntry) iter.next(); - NodeId childNodeId = new MirrorNodeId(nodeId, entry.getId(), entry.getName()); + NodeState dereference = null; + String[] docbase = getProperty(state.getNodeId(), docbaseName); + if(docbase != null) { + dereference = getNodeState(new NodeId(new UUID(docbase[0]))); + } + if(isEnabled()) { + for(Iterator iter = dereference.getChildNodeEntries().iterator(); iter.hasNext(); ) { + ChildNodeEntry entry = (ChildNodeEntry) iter.next(); + NodeId childNodeId = new MirrorNodeId(dereference.getNodeId(), entry.getId(), entry.getName()); state.addChildNodeEntry(entry.getName(), childNodeId); } + } return state; } @Override public NodeState populate(HippoNodeId nodeId, NodeId parentId) throws RepositoryException { - NodeState upstream = getNodeState(((MirrorNodeId)nodeId).upstream); - NodeState state = createNew(nodeId, upstream.getNodeTypeName(), parentId); - state.setNodeTypeName(upstream.getNodeTypeName()); + NodeState dereference = getNodeState(((MirrorNodeId)nodeId).upstream); + NodeState state = createNew(nodeId, dereference.getNodeTypeName(), parentId); + state.setNodeTypeName(dereference.getNodeTypeName()); - Set mixins = new HashSet(((NodeState) upstream).getMixinTypeNames()); + Set mixins = new HashSet(((NodeState) dereference).getMixinTypeNames()); if(mixins.contains(mixinReferenceableName)) { mixins.remove(mixinReferenceableName); } @@ -123,10 +128,11 @@ } state.setMixinTypeNames(mixins); - state.setDefinitionId(upstream.getDefinitionId()); - for(Iterator iter = upstream.getPropertyNames().iterator(); iter.hasNext(); ) { + state.setDefinitionId(dereference.getDefinitionId()); + if(isEnabled()) { + for(Iterator iter = dereference.getPropertyNames().iterator(); iter.hasNext(); ) { Name propName = (Name) iter.next(); - PropertyId upstreamPropId = new PropertyId(upstream.getNodeId(), propName); + PropertyId upstreamPropId = new PropertyId(dereference.getNodeId(), propName); PropertyState upstreamPropState = getPropertyState(upstreamPropId); PropDefId propDefId = upstreamPropState.getDefinitionId(); if(propName.equals(jcrUUIDName)) { @@ -143,17 +149,17 @@ } else { propState.setValues(upstreamPropState.getValues()); } - propState.setMultiValued(upstreamPropState.isMultiValued()); } - populateChildren(nodeId, state, upstream); + populateChildren(nodeId, state, dereference); + } return state; } protected void populateChildren(NodeId nodeId, NodeState state, NodeState upstream) { for(Iterator iter = upstream.getChildNodeEntries().iterator(); iter.hasNext(); ) { - NodeState.ChildNodeEntry entry = (NodeState.ChildNodeEntry) iter.next(); + ChildNodeEntry entry = (ChildNodeEntry) iter.next(); MirrorNodeId childNodeId = new MirrorNodeId(nodeId, entry.getId(), entry.getName()); state.addChildNodeEntry(entry.getName(), childNodeId); } Modified: hippo-ecm/trunk/repository/modules/src/main/java/org/hippoecm/repository/jackrabbit/SubtypedDataProvider.java =================================================================== --- hippo-ecm/trunk/repository/modules/src/main/java/org/hippoecm/repository/jackrabbit/SubtypedDataProvider.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/modules/src/main/java/org/hippoecm/repository/jackrabbit/SubtypedDataProvider.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -29,9 +29,7 @@ import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.spi.NameFactory; import org.apache.jackrabbit.spi.commons.conversion.IllegalNameException; -import org.apache.jackrabbit.spi.commons.conversion.NameParser; import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; -import org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver; import org.hippoecm.repository.api.HippoNodeType; @@ -45,21 +43,19 @@ public void initialize(DataProviderContext context) { NodeTypeRegistry ntReg = context.getNodeTypeRegistry(); - NamespaceResolver nsRes = context.getNamespaceResolver(); NameFactory nameFactory = NameFactoryImpl.getInstance(); Map subtyping = new TreeMap(); try { - subtyping.put(NameParser.parse(HippoNodeType.NT_FACETSELECT, nsRes, nameFactory), - "org.hippoecm.repository.jackrabbit.FacetSelectProvider"); + + subtyping.put(context.getQName(HippoNodeType.NT_FACETSELECT), "org.hippoecm.repository.jackrabbit.FacetSelectProvider"); } catch (IllegalNameException ex) { log.warn("Error registering subnodes: " + ex.getClass().getName() + ": " + ex.getMessage()); } catch (NamespaceException ex) { log.warn("Error registering subnodes: " + ex.getClass().getName() + ": " + ex.getMessage()); } try { - subtyping.put(NameParser.parse(HippoNodeType.NT_FACETSEARCH, nsRes, nameFactory), - "org.hippoecm.repository.jackrabbit.FacetSearchProvider"); + subtyping.put(context.getQName(HippoNodeType.NT_FACETSEARCH), "org.hippoecm.repository.jackrabbit.FacetSearchProvider"); } catch (IllegalNameException ex) { log.warn("Error registering subnodes: " + ex.getClass().getName() + ": " + ex.getMessage()); } catch (NamespaceException ex) { Modified: hippo-ecm/trunk/repository/modules/src/main/java/org/hippoecm/repository/jackrabbit/ViewVirtualProvider.java =================================================================== --- hippo-ecm/trunk/repository/modules/src/main/java/org/hippoecm/repository/jackrabbit/ViewVirtualProvider.java 2009-01-07 11:23:45 UTC (rev 15761) +++ hippo-ecm/trunk/repository/modules/src/main/java/org/hippoecm/repository/jackrabbit/ViewVirtualProvider.java 2009-01-07 11:46:35 UTC (rev 15762) @@ -24,6 +24,7 @@ import javax.jcr.RepositoryException; import org.apache.jackrabbit.core.NodeId; +import org.apache.jackrabbit.core.state.ChildNodeEntry; import org.apache.jackrabbit.core.state.NodeState; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.uuid.UUID; @@ -128,12 +129,15 @@ @Override public NodeState populate(NodeState state) throws RepositoryException { - String docbase = getProperty(state.getNodeId(), docbaseName)[0]; - NodeState dereference = getNodeState(new NodeId(new UUID(docbase))); - LinkedHashMap view = new LinkedHashMap(); - if(dereference != null) { + NodeState dereference = null; + String[] docbase = getProperty(state.getNodeId(), docbaseName); + if(docbase != null) { + dereference = getNodeState(new NodeId(new UUID(docbase[0]))); + } + if(isEnabled() && dereference != null) { + LinkedHashMap view = new LinkedHashMap(); for(Iterator iter = dereference.getChildNodeEntries().iterator(); iter.hasNext(); ) { - NodeState.ChildNodeEntry entry = (NodeState.ChildNodeEntry) iter.next(); + ChildNodeEntry entry = (ChildNodeEntry) iter.next(); if(this.match(view, entry.getId())) { NodeId childNodeId = this . new ViewNodeId(state.getNodeId(),entry.getId(),entry.getName(),view,null,false); state.addChildNodeEntry(entry.getName(), childNodeId); @@ -167,7 +171,7 @@ boolean isHandle = state.getNodeTypeName().equals(handleName); Vector children = new Vector(); for(Iterator iter = upstream.getChildNodeEntries().iterator(); iter.hasNext(); ) { - NodeState.ChildNodeEntry entry = (NodeState.ChildNodeEntry) iter.next(); + ChildNodeEntry entry = (ChildNodeEntry) iter.next(); if (!isHandle || match(viewId.view, entry.getId())) { /* * below we check on the entry's nodestate wether the node type is hippo:request, From svn-logs at hippocms.org Wed Jan 7 12:47:57 2009 From: svn-logs at hippocms.org (SVN (bvanhalderen)) Date: Wed Jan 7 12:46:49 2009 Subject: [HippoRepos-dev] [15763] hippo-ecm: HREPTWO-1966, HREPTWO-2083, HREPTWO-2097, HREPTWO-2084, HREPTWO-1714: Message-ID: <20090107114757.97294C589@svnnew.onehippo.org> Revision: 15763 Author: bvanhalderen Date: 2009-01-07 12:47:57 +0100 (Wed, 07 Jan 2009) Log Message: ----------- HREPTWO-1966, HREPTWO-2083, HREPTWO-2097, HREPTWO-2084, HREPTWO-1714: - upgrade junit in all pom.xml projects where not done already - upgrade to jackrabbit 1.5 (ChildNodeEntry, name resolvers, etcetera) - bad prefix namespace for treepane definition - update to latest spi interface - improve some unit tests (FacetedReferenceTest,CanonicalPathTest,OrderByNodeNameTest???,NodeNameCodecTest???,FacetedAuthorizationTest) - disabled two tests in FacetedAuthorizationTest Modified Paths: -------------- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/impl/SessionDecorator.java hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/WorkspaceImpl.java hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/XAWorkspaceImpl.java hippo-ecm/trunk/repository/engine/src/test/java/org/hippoecm/repository/ConfigurationTest.java Removed Paths: ------------- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/NodeImpl.java Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/impl/SessionDecorator.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/impl/SessionDecorator.java 2009-01-07 11:46:35 UTC (rev 15762) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/impl/SessionDecorator.java 2009-01-07 11:47:57 UTC (rev 15763) @@ -64,6 +64,7 @@ import org.hippoecm.repository.api.HippoSession; import org.hippoecm.repository.decorating.DecoratorFactory; import org.hippoecm.repository.decorating.NodeIteratorDecorator; +import org.hippoecm.repository.jackrabbit.HippoLocalItemStateManager; import org.hippoecm.repository.jackrabbit.SessionImpl; import org.hippoecm.repository.jackrabbit.XASessionImpl; import org.hippoecm.repository.jackrabbit.xml.DereferencedSysViewSAXEventGenerator; @@ -88,6 +89,14 @@ derivedEngine = new DerivedDataEngine(this); } + void postSave(Node node) throws VersionException, LockException, ConstraintViolationException, RepositoryException { + derivedEngine.save(node); + } + + void postMountEnabled(boolean enabled) { + ((HippoLocalItemStateManager)((org.apache.jackrabbit.core.WorkspaceImpl)session.getWorkspace()).getItemStateManager()).setEnabled(enabled); + } + String[] getQPath(String absPath) throws NamespaceException, RepositoryException { NamespaceRegistry nsreg = session.getWorkspace().getNamespaceRegistry(); Path.Element[] elements = (session instanceof XASession ? (XASessionImpl)session : (SessionImpl)session) . Deleted: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/NodeImpl.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/NodeImpl.java 2009-01-07 11:46:35 UTC (rev 15762) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/NodeImpl.java 2009-01-07 11:47:57 UTC (rev 15763) @@ -1,65 +0,0 @@ -/* - * Copyright 2008 Hippo. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.hippoecm.repository.jackrabbit; - -import javax.jcr.RepositoryException; -import javax.jcr.nodetype.ConstraintViolationException; -import javax.jcr.nodetype.NodeDefinition; - -import org.apache.jackrabbit.core.ItemLifeCycleListener; -import org.apache.jackrabbit.core.NodeId; -import org.apache.jackrabbit.core.SessionImpl; -import org.apache.jackrabbit.core.nodetype.NodeDefinitionImpl; -import org.apache.jackrabbit.core.state.ItemState; -import org.apache.jackrabbit.core.state.NodeState; -import org.apache.jackrabbit.spi.Name; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class NodeImpl extends org.apache.jackrabbit.core.NodeImpl { - @SuppressWarnings("unused") - private final static String SVN_ID = "$Id$"; - - private static Logger log = LoggerFactory.getLogger(NodeImpl.class); - - protected NodeImpl(ItemManager itemMgr, SessionImpl session, NodeId id, - NodeState state, NodeDefinition definition, - ItemLifeCycleListener[] listeners) { - super(itemMgr, session, id, state, definition, listeners); - } - - @Override - protected void onRemove() throws RepositoryException { - HippoLocalItemStateManager localISM; - localISM = (HippoLocalItemStateManager)(((HippoSessionItemStateManager)stateMgr).localStateMgr); - if((localISM.isVirtual(state) != HippoLocalItemStateManager.ITEM_TYPE_REGULAR)) { - ((NodeState)state).removeAllChildNodeEntries(); - } - super.onRemove(); - } - - - // FIXME: Only necessary because of current ItemManager implementation - ItemState getItemState() { - return state; - } - - // FIXME: Only necessary because of current ItemManager implementation - protected NodeDefinitionImpl getApplicableChildNodeDefinition(Name nodeName, Name nodeTypeName) - throws ConstraintViolationException, RepositoryException { - return super.getApplicableChildNodeDefinition(nodeName, nodeTypeName); - } -} Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/WorkspaceImpl.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/WorkspaceImpl.java 2009-01-07 11:46:35 UTC (rev 15762) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/WorkspaceImpl.java 2009-01-07 11:47:57 UTC (rev 15763) @@ -33,6 +33,6 @@ } protected LocalItemStateManager createItemStateManager(SharedItemStateManager shared) { - return new HippoLocalItemStateManager(shared, this, rep.getItemStateCacheFactory(), ((RepositoryImpl)rep).getNodeTypeRegistry(), ((RepositoryImpl)rep).isStarted()); + return new HippoLocalItemStateManager(shared, this, rep.getItemStateCacheFactory(), ((RepositoryImpl)rep).getNodeTypeRegistry(), ((RepositoryImpl)rep).isStarted(), ((RepositoryImpl)rep).getRootNodeId()); } } Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/XAWorkspaceImpl.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/XAWorkspaceImpl.java 2009-01-07 11:46:35 UTC (rev 15762) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/XAWorkspaceImpl.java 2009-01-07 11:47:57 UTC (rev 15763) @@ -33,6 +33,6 @@ } protected LocalItemStateManager createItemStateManager(SharedItemStateManager shared) { - return new HippoLocalItemStateManager(shared, this, rep.getItemStateCacheFactory(), ((RepositoryImpl)rep).getNodeTypeRegistry(), ((RepositoryImpl)rep).isStarted()); + return new HippoLocalItemStateManager(shared, this, rep.getItemStateCacheFactory(), ((RepositoryImpl)rep).getNodeTypeRegistry(), ((RepositoryImpl)rep).isStarted(), ((RepositoryImpl)rep).getRootNodeId()); } } Modified: hippo-ecm/trunk/repository/engine/src/test/java/org/hippoecm/repository/ConfigurationTest.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/test/java/org/hippoecm/repository/ConfigurationTest.java 2009-01-07 11:46:35 UTC (rev 15762) +++ hippo-ecm/trunk/repository/engine/src/test/java/org/hippoecm/repository/ConfigurationTest.java 2009-01-07 11:47:57 UTC (rev 15763) @@ -19,12 +19,18 @@ import javax.jcr.Node; +import org.junit.Before; import org.junit.Test; public class ConfigurationTest extends TestCase { @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; + @Before + public void setUp() throws Exception { + super.setUp(); + } + @Test public void testConfiguration() throws Exception { Node root = session.getRootNode(); @@ -33,7 +39,8 @@ node.setProperty("hippo:contentroot", "/test"); session.save(); - Thread.sleep(1000); + Thread.sleep(3000); + session.refresh(false); assertTrue(root.getNode("test").hasNode("testnode")); } From helpdesk at onehippo.com Wed Jan 7 12:51:41 2009 From: helpdesk at onehippo.com (JIRA ((Berry) A.W. van Halderen)) Date: Wed Jan 7 12:50:35 2009 Subject: [HippoRepos-dev] [JIRA] Resolved: (HREPTWO-2097) onRemove recursion In-Reply-To: <6259262.1230735641981.JavaMail.root@hat01> Message-ID: <7233660.1231329101966.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-2097?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] (Berry) A.W. van Halderen resolved HREPTWO-2097. ------------------------------------------------ Resolution: Fixed > onRemove recursion > ------------------ > > Key: HREPTWO-2097 > URL: http://issues.onehippo.org/browse/HREPTWO-2097 > Project: Hippo Repository 2 > Issue Type: Sub-task > Reporter: (Berry) A.W. van Halderen > Assignee: (Berry) A.W. van Halderen > Fix For: r2.03.xx (m10 - scalability) > > Original Estimate: 2 days > Time Spent: 4 hours > Remaining Estimate: 0 minutes > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Jan 7 12:51:41 2009 From: helpdesk at onehippo.com (JIRA ((Berry) A.W. van Halderen)) Date: Wed Jan 7 12:50:36 2009 Subject: [HippoRepos-dev] [JIRA] Work logged: (HREPTWO-2097) onRemove recursion In-Reply-To: <6259262.1230735641981.JavaMail.root@hat01> Message-ID: <20804122.1231329101923.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-2097?page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#action_28488 ] (Berry) A.W. van Halderen logged work on HREPTWO-2097: ------------------------------------------------------ Author: (Berry) A.W. van Halderen Created on: 07/Jan/09 12:50 PM Start Date: 02/Jan/09 12:49 PM Worklog Time Spent: 4 hours Work Description: moved work to more specific issue Issue Time Tracking ------------------- Remaining Estimate: 0 minutes (was: 2 days) Time Spent: 4 hours > onRemove recursion > ------------------ > > Key: HREPTWO-2097 > URL: http://issues.onehippo.org/browse/HREPTWO-2097 > Project: Hippo Repository 2 > Issue Type: Sub-task > Reporter: (Berry) A.W. van Halderen > Assignee: (Berry) A.W. van Halderen > Fix For: r2.03.xx (m10 - scalability) > > Original Estimate: 2 days > Time Spent: 4 hours > Remaining Estimate: 0 minutes > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Jan 7 12:51:41 2009 From: helpdesk at onehippo.com (JIRA ((Berry) A.W. van Halderen)) Date: Wed Jan 7 12:50:38 2009 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-2125) get enabling virtual layer logic out of modules In-Reply-To: <3591721.1231325382160.JavaMail.root@hat01> Message-ID: <31661046.1231329101980.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-2125?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] (Berry) A.W. van Halderen updated HREPTWO-2125: ----------------------------------------------- Original Estimate: 1 day Remaining Estimate: 1 day > get enabling virtual layer logic out of modules > ----------------------------------------------- > > Key: HREPTWO-2125 > URL: http://issues.onehippo.org/browse/HREPTWO-2125 > Project: Hippo Repository 2 > Issue Type: Sub-task > Reporter: (Berry) A.W. van Halderen > Assignee: (Berry) A.W. van Halderen > Fix For: r2.03.xx (m10 - scalability) > > Original Estimate: 1 day > Remaining Estimate: 1 day > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Jan 7 12:51:42 2009 From: helpdesk at onehippo.com (JIRA ((Berry) A.W. van Halderen)) Date: Wed Jan 7 12:50:39 2009 Subject: [HippoRepos-dev] [JIRA] Work logged: (HREPTWO-2084) repairations according to failed unit tests In-Reply-To: <26286958.1230711461796.JavaMail.root@hat01> Message-ID: <11892261.1231329102007.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-2084?page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#action_28489 ] (Berry) A.W. van Halderen logged work on HREPTWO-2084: ------------------------------------------------------ Author: (Berry) A.W. van Halderen Created on: 07/Jan/09 12:50 PM Start Date: 02/Jan/09 12:50 PM Worklog Time Spent: 1 day Issue Time Tracking ------------------- Remaining Estimate: 0 minutes Time Spent: 1 day > repairations according to failed unit tests > ------------------------------------------- > > Key: HREPTWO-2084 > URL: http://issues.onehippo.org/browse/HREPTWO-2084 > Project: Hippo Repository 2 > Issue Type: Sub-task > Reporter: (Berry) A.W. van Halderen > Assignee: (Berry) A.W. van Halderen > Fix For: r2.03.xx (m10 - scalability) > > Time Spent: 1 day > Remaining Estimate: 0 minutes > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Jan 7 12:51:42 2009 From: helpdesk at onehippo.com (JIRA ((Berry) A.W. van Halderen)) Date: Wed Jan 7 12:50:40 2009 Subject: [HippoRepos-dev] [JIRA] Work logged: (HREPTWO-2083) get repository and modules compilable with jr 15 In-Reply-To: <14772674.1230711342044.JavaMail.root@hat01> Message-ID: <25792727.1231329102074.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-2083?page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#action_28490 ] (Berry) A.W. van Halderen logged work on HREPTWO-2083: ------------------------------------------------------ Author: (Berry) A.W. van Halderen Created on: 07/Jan/09 12:51 PM Start Date: 02/Jan/09 12:51 PM Worklog Time Spent: 1 day, 4 hours Issue Time Tracking ------------------- Remaining Estimate: 0 minutes (was: 4 hours) Time Spent: 2 days, 4 hours (was: 1 day) > get repository and modules compilable with jr 15 > ------------------------------------------------ > > Key: HREPTWO-2083 > URL: http://issues.onehippo.org/browse/HREPTWO-2083 > Project: Hippo Repository 2 > Issue Type: Sub-task > Reporter: (Berry) A.W. van Halderen > Assignee: (Berry) A.W. van Halderen > Fix For: r2.03.xx (m10 - scalability) > > Original Estimate: 1 day, 4 hours > Time Spent: 2 days, 4 hours > Remaining Estimate: 0 minutes > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Jan 7 12:51:42 2009 From: helpdesk at onehippo.com (JIRA ((Berry) A.W. van Halderen)) Date: Wed Jan 7 12:50:41 2009 Subject: [HippoRepos-dev] [JIRA] Resolved: (HREPTWO-2083) get repository and modules compilable with jr 15 In-Reply-To: <14772674.1230711342044.JavaMail.root@hat01> Message-ID: <752754.1231329102087.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-2083?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] (Berry) A.W. van Halderen resolved HREPTWO-2083. ------------------------------------------------ Resolution: Fixed > get repository and modules compilable with jr 15 > ------------------------------------------------ > > Key: HREPTWO-2083 > URL: http://issues.onehippo.org/browse/HREPTWO-2083 > Project: Hippo Repository 2 > Issue Type: Sub-task > Reporter: (Berry) A.W. van Halderen > Assignee: (Berry) A.W. van Halderen > Fix For: r2.03.xx (m10 - scalability) > > Original Estimate: 1 day, 4 hours > Time Spent: 2 days, 4 hours > Remaining Estimate: 0 minutes > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Jan 7 12:53:41 2009 From: helpdesk at onehippo.com (JIRA ((Berry) A.W. van Halderen)) Date: Wed Jan 7 12:52:34 2009 Subject: [HippoRepos-dev] [JIRA] Resolved: (HREPTWO-2084) repairations according to failed unit tests In-Reply-To: <26286958.1230711461796.JavaMail.root@hat01> Message-ID: <33147098.1231329221823.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-2084?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] (Berry) A.W. van Halderen resolved HREPTWO-2084. ------------------------------------------------ Resolution: Fixed > repairations according to failed unit tests > ------------------------------------------- > > Key: HREPTWO-2084 > URL: http://issues.onehippo.org/browse/HREPTWO-2084 > Project: Hippo Repository 2 > Issue Type: Sub-task > Reporter: (Berry) A.W. van Halderen > Assignee: (Berry) A.W. van Halderen > Fix For: r2.03.xx (m10 - scalability) > > Time Spent: 1 day > Remaining Estimate: 0 minutes > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Jan 7 12:53:41 2009 From: helpdesk at onehippo.com (JIRA ((Berry) A.W. van Halderen)) Date: Wed Jan 7 12:52:35 2009 Subject: [HippoRepos-dev] [JIRA] Work started: (HREPTWO-2085) test upgrade with cms In-Reply-To: <17294589.1230711461929.JavaMail.root@hat01> Message-ID: <8700905.1231329221851.JavaMail.root@hat01> [ http://issues.onehippo.org/browse/HREPTWO-2085?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Work on HREPTWO-2085 started by (Berry) A.W. van Halderen. > test upgrade with cms > --------------------- > > Key: HREPTWO-2085 > URL: http://issues.onehippo.org/browse/HREPTWO-2085 > Project: Hippo Repository 2 > Issue Type: Sub-task > Reporter: (Berry) A.W. van Halderen > Assignee: (Berry) A.W. van Halderen > Fix For: r2.03.xx (m10 - scalability) > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Wed Jan 7 13:32:43 2009 From: svn-logs at hippocms.org (SVN (bvanhalderen)) Date: Wed Jan 7 13:31:34 2009 Subject: [HippoRepos-dev] [15764] hippo-ecm: HREPTWO-2128: disable test Message-ID: <20090107123243.8973BC589@svnnew.onehippo.org> Revision: 15764 Author: bvanhalderen Date: 2009-01-07 13:32:42 +0100 (Wed, 07 Jan 2009) Log Message: ----------- HREPTWO-2128: disable test Modified Paths: -------------- hippo-ecm/trunk/repository/test/src/test/java/org/hippoecm/repository/test/RemoteTest.java Modified: hippo-ecm/trunk/repository/test/src/test/java/org/hippoecm/repository/test/RemoteTest.java =================================================================== --- hippo-ecm/trunk/repository/test/src/test/java/org/hippoecm/repository/test/RemoteTest.java 2009-01-07 11:47:57 UTC (rev 15763) +++ hippo-ecm/trunk/repository/test/src/test/java/org/hippoecm/repository/test/RemoteTest.java 2009-01-07 12:32:42 UTC (rev 15764) @@ -34,7 +34,7 @@ org.hippoecm.repository.TrivialServerTest.class, org.hippoecm.repository.FacetedAuthorizationTest.class, org.hippoecm.repository.RepositoryLoginTest.class, - org.hippoecm.repository.ConfigurationTest.class, + //org.hippoecm.repository.ConfigurationTest.class, org.hippoecm.repository.CopyNodeTest.class, org.hippoecm.repository.DerivedDataTest.class, org.hippoecm.repository.FacetedNavigationChildNameTest.class, From helpdesk at onehippo.com Wed Jan 7 13:33:41 2009 From: helpdesk at onehippo.com (JIRA ((Berry) A.W. van Halderen)) Date: Wed Jan 7 13:32:33 2009 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-2128) fix remote based configuration test Message-ID: <11651230.1231331621767.JavaMail.root@hat01> fix remote based configuration test ----------------------------------- Key: HREPTWO-2128 URL: http://issues.onehippo.org/browse/HREPTWO-2128 Project: Hippo Repository 2 Issue Type: Sub-task Reporter: (Berry) A.W. van Halderen Assignee: (Berry) A.W. van Halderen -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Wed Jan 7 14:13:47 2009 From: svn-logs at hippocms.org (SVN (bvdschans)) Date: Wed Jan 7 14:12:38 2009 Subject: [HippoRepos-dev] [15765] hippo-ecm: HREPTWO-16: Set log level to warn Message-ID: <20090107131347.BEC7AC589@svnnew.onehippo.org> Revision: 15765 Author: bvdschans Date: 2009-01-07 14:13:47 +0100 (Wed, 07 Jan 2009) Log Message: ----------- HREPTWO-16: Set log level to warn Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/repository/modules/src/main/java/org/hippoecm/repository/jackrabbit/FacetSelectProvider.java Modified: hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/repository/modules/src/main/java/org/hippoecm/repository/jackrabbit/FacetSelectProvider.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/repository/modules/src/main/java/org/hippoecm/repository/jackrabbit/FacetSelectProvider.java 2009-01-07 12:32:42 UTC (rev 15764) +++ hippo-ecm/branches/Branch-HREPTWO-v2_02_xx/repository/modules/src/main/java/org/hippoecm/repository/jackrabbit/FacetSelectProvider.java 2009-01-07 13:13:47 UTC (rev 15765) @@ -73,7 +73,7 @@ try { dereference = getNodeState(new NodeId(new UUID(docbase[0]))); } catch (IllegalArgumentException e) { - log.error("invalid docbase '" + docbase[0] + "' because not a valid UUID "); + log.warn("invalid docbase '" + docbase[0] + "' because not a valid UUID "); } if(dereference != null) { boolean singledView = false; From svn-logs at hippocms.org Wed Jan 7 14:14:29 2009 From: svn-logs at hippocms.org (SVN (bvdschans)) Date: Wed Jan 7 14:13:19 2009 Subject: [HippoRepos-dev] [15766] hippo-ecm: HREPTWO-16: Set log level to warn Message-ID: <20090107131429.07BA1C589@svnnew.onehippo.org> Revision: 15766 Author: bvdschans Date: 2009-01-07 14:14:28 +0100 (Wed, 07 Jan 2009) Log Message: ----------- HREPTWO-16: Set log level to warn Modified Paths: -------------- hippo-ecm/trunk/repository/modules/src/main/java/org/hippoecm/repository/jackrabbit/FacetSelectProvider.java Modified: hippo-ecm/trunk/repository/modules/src/main/java/org/hippoecm/repository/jackrabbit/FacetSelectProvider.java =================================================================== --- hippo-ecm/trunk/repository/modules/src/main/java/org/hippoecm/repository/jackrabbit/FacetSelectProvider.java 2009-01-07 13:13:47 UTC (rev 15765) +++ hippo-ecm/trunk/repository/modules/src/main/java/org/hippoecm/repository/jackrabbit/FacetSelectProvider.java 2009-01-07 13:14:28 UTC (rev 15766) @@ -74,7 +74,7 @@ try { dereference = getNodeState(new NodeId(new UUID(docbase[0]))); } catch (IllegalArgumentException e) { - log.error("invalid docbase '" + docbase[0] + "' because not a valid UUID "); + log.warn("invalid docbase '" + docbase[0] + "' because not a valid UUID "); } if(dereference != null && isEnabled()) { boolean singledView = false; From helpdesk at onehippo.com Wed Jan 7 17:11:41 2009 From: helpdesk at onehippo.com (JIRA (Ard Schrijvers)) Date: Wed Jan 7 17:10:33 2009 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-2129) Improve performance of searches Message-ID: <2452960.1231344701824.JavaMail.root@hat01> Improve performance of searches -------------------------------- Key: HREPTWO-2129 URL: http://issues.onehippo.org/browse/HREPTWO-2129 Project: Hippo Repository 2 Issue Type: Improvement Components: repository-core Affects Versions: r2.02.00 (m09) Reporter: Ard Schrijvers Assignee: Ard Schrijvers Fix For: r2.03.xx (m10 - scalability) Improve searching speed and memory consumption by trying to avoid searching within the jcr:system tree. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Wed Jan 7 18:35:38 2009 From: svn-logs at hippocms.org (SVN (rbijlsma)) Date: Wed Jan 7 18:34:30 2009 Subject: [HippoRepos-dev] [15767] hippo-ecm: HREPTWODOCS-75 Message-ID: <20090107173538.3037EC58C@svnnew.onehippo.org> Revision: 15767 Author: rbijlsma Date: 2009-01-07 18:35:36 +0100 (Wed, 07 Jan 2009) Log Message: ----------- HREPTWODOCS-75 Modified Paths: -------------- hippo-ecm/trunk/src/site/xdoc/delve_into/sysadmin/requirements.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/cms_admins/howto/login.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/cms_admins/howto/logout.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/contributors/howto/create_document.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/contributors/howto/fill_boolean_field_in_document.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/contributors/howto/fill_date_field_in_document.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/contributors/howto/fill_markuped_text_in_document.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/contributors/howto/fill_string_field_in_document.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/contributors/howto/goto_folder.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/contributors/howto/login.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/contributors/howto/logout.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/contributors/howto/request_publication.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/contributors/howto/save_document.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/contributors/tour.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/editors/howto/check_for_requests.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/editors/howto/create_folder.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/editors/howto/goto_content_browse_tab.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/editors/howto/handle_request.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/editors/howto/login.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/editors/howto/logout.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/index.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/information_architects/howto/add_boolean_to_documenttype.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/information_architects/howto/add_date_to_documenttype.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/information_architects/howto/add_markuped_text_to_documenttype.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/information_architects/howto/add_string_to_documenttype.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/information_architects/howto/change_field_in_documenttype.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/information_architects/howto/create_documenttype.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/information_architects/howto/create_namespace.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/information_architects/howto/fieldcaption.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/information_architects/howto/fieldsize.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/information_architects/howto/goto_documenttype_tab.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/information_architects/howto/goto_documenttypes_tab.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/information_architects/howto/goto_namespace.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/information_architects/howto/login.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/information_architects/howto/logout.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/information_architects/howto/mandatory_or_optional.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/information_architects/howto/naming_a_field.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/information_architects/howto/remove_field_from_documenttype.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/information_architects/howto/save_documenttype.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/information_architects/howto/update_content.xml Added Paths: ----------- hippo-ecm/trunk/src/site/resources/images/screenshots/ hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/ hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/contribs/fill_markuped_text.png hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/contribs/goto_content_workspace.png hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/contribs/goto_folder_tab.png hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/contribs/goto_request_schedule_publication.png hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/contribs/logout.png hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/contribs/request_schedule_publication.png hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/contribs/save_document.png hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/contribs/test.png hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/contribs/testinkscape.png hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/contribs/testinkscape.svg hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/contribs/workspace_navigation_panel.png hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/editors/check_for_requests.png hippo-ecm/trunk/src/site/xdoc/delve_into/user/contributors/concepts/workspace_navigation_panel.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/contributors/howto/goto_content_workspace.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/contributors/howto/open_request_publication.xml hippo-ecm/trunk/src/site/xdoc/delve_into/user/contributors/howto/todo/ hippo-ecm/trunk/src/site/xdoc/delve_into/user/contributors/howto/todo/goto_document_tab.xml Removed Paths: ------------- hippo-ecm/trunk/src/site/resources/images/cms_screenshots_xx/ Property changes on: hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9 ___________________________________________________________________ Added: svn:mergeinfo + Added: hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/contribs/fill_markuped_text.png =================================================================== (Binary files differ) Property changes on: hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/contribs/fill_markuped_text.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/contribs/goto_content_workspace.png =================================================================== (Binary files differ) Property changes on: hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/contribs/goto_content_workspace.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/contribs/goto_folder_tab.png =================================================================== (Binary files differ) Property changes on: hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/contribs/goto_folder_tab.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/contribs/goto_request_schedule_publication.png =================================================================== (Binary files differ) Property changes on: hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/contribs/goto_request_schedule_publication.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/contribs/logout.png =================================================================== (Binary files differ) Property changes on: hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/contribs/logout.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/contribs/request_schedule_publication.png =================================================================== (Binary files differ) Property changes on: hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/contribs/request_schedule_publication.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/contribs/save_document.png =================================================================== (Binary files differ) Property changes on: hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/contribs/save_document.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/contribs/test.png =================================================================== (Binary files differ) Property changes on: hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/contribs/test.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/contribs/testinkscape.png =================================================================== (Binary files differ) Property changes on: hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/contribs/testinkscape.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/contribs/testinkscape.svg =================================================================== --- hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/contribs/testinkscape.svg (rev 0) +++ hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/contribs/testinkscape.svg 2009-01-07 17:35:36 UTC (rev 15767) @@ -0,0 +1,76 @@ + + + + + + + image/svg+xml + + + + + + + + + + + Added: hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/contribs/workspace_navigation_panel.png =================================================================== (Binary files differ) Property changes on: hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/contribs/workspace_navigation_panel.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/editors/check_for_requests.png =================================================================== (Binary files differ) Property changes on: hippo-ecm/trunk/src/site/resources/images/screenshots/cms_M9/editors/check_for_requests.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: hippo-ecm/trunk/src/site/xdoc/delve_into/sysadmin/requirements.xml =================================================================== --- hippo-ecm/trunk/src/site/xdoc/delve_into/sysadmin/requirements.xml 2009-01-07 13:14:28 UTC (rev 15766) +++ hippo-ecm/trunk/src/site/xdoc/delve_into/sysadmin/requirements.xml 2009-01-07 17:35:36 UTC (rev 15767) @@ -69,13 +69,16 @@
    -
  • +
  • Intel Pentium 4
  • 512 MB Memory
  • + 1024x768 screen resolution +
    • +
  • 200 MB of available hard-disk space (not to be used by Hippo CMS, but to prevent the system from becoming too slow for Hippo CMS).
Modified: hippo-ecm/trunk/src/site/xdoc/delve_into/user/cms_admins/howto/login.xml =================================================================== --- hippo-ecm/trunk/src/site/xdoc/delve_into/user/cms_admins/howto/login.xml 2009-01-07 13:14:28 UTC (rev 15766) +++ hippo-ecm/trunk/src/site/xdoc/delve_into/user/cms_admins/howto/login.xml 2009-01-07 17:35:36 UTC (rev 15767) @@ -30,7 +30,7 @@ How to login to Hippo CMS as administrator.
- Hippo login screenshot + Hippo login screenshot

The Hippo CMS login dialog.

Modified: hippo-ecm/trunk/src/site/xdoc/delve_into/user/cms_admins/howto/logout.xml =================================================================== --- hippo-ecm/trunk/src/site/xdoc/delve_into/user/cms_admins/howto/logout.xml 2009-01-07 13:14:28 UTC (rev 15766) +++ hippo-ecm/trunk/src/site/xdoc/delve_into/user/cms_admins/howto/logout.xml 2009-01-07 17:35:36 UTC (rev 15767) @@ -30,7 +30,7 @@ How to logout
- logout screenshot + logout screenshot

Click the logout button to logout. The login dialog will reapear.

Added: hippo-ecm/trunk/src/site/xdoc/delve_into/user/contributors/concepts/workspace_navigation_panel.xml =================================================================== --- hippo-ecm/trunk/src/site/xdoc/delve_into/user/contributors/concepts/workspace_navigation_panel.xml (rev 0) +++ hippo-ecm/trunk/src/site/xdoc/delve_into/user/contributors/concepts/workspace_navigation_panel.xml 2009-01-07 17:35:36 UTC (rev 15767) @@ -0,0 +1,50 @@ + + + + + + Content Navigation Panel + + + +
+ What and where is the workspace navigation panel? + +
+ workspace navigation panel screenshot +
+ +

+ The workspace navigation panel is a panel + containing buttons to go to different workspaces. + It is a thin, high panel at the left of the CMS window. +

+ + + + + +
+ + Modified: hippo-ecm/trunk/src/site/xdoc/delve_into/user/contributors/howto/create_document.xml =================================================================== --- hippo-ecm/trunk/src/site/xdoc/delve_into/user/contributors/howto/create_document.xml 2009-01-07 13:14:28 UTC (rev 15766) +++ hippo-ecm/trunk/src/site/xdoc/delve_into/user/contributors/howto/create_document.xml 2009-01-07 17:35:36 UTC (rev 15767) @@ -30,36 +30,52 @@ How to create a document to write in.
- Create document screenshot + Create document screenshot

- Creation of document with name `multibazar2008', - the name of an newspaper article about an upcoming multicultural Bazar. - This document has document type 'upcoming', which is the document type used by + Creating a document with name `multibazar2009'. + The document type of this document + will be 'upcoming', + which is the document type used by the organization Saraswatia for all newspaper articles about upcoming happenings. + After clicking OK, + the name of the new document will appear in the + content listing panel, in which + there now is already one documentname listed: 'artificial intelligence'. + The unfilled document itself will appear on its own + card in the + documents panel, + in edit mode, meaning that you may start + filling the new document immediately.

- While a folder is opened, - click on the selection menu at the top of the middle-right lane and select 'create document' - by clicking on it. A dialog window appears. + While a folder is listed, + select 'create document' in the folder action menu. + A dialog window appears.

- Type a descriptive name for the document. + Type a descriptive name for the new document.

- Select from the list of document types, available in your organization, which type your + Select from the menu of document types that + are available in your organization, which type your document will have, in other words, to what class of similar documents your document - will belong. + will belong. Depending on your choice, the new document will contain a + particular predefined set of unfilled inputfields, guiding you in filling the document with + relevant information.

-